Title: [182775] trunk/Source/WebKit2
- Revision
- 182775
- Author
- [email protected]
- Date
- 2015-04-13 18:36:03 -0700 (Mon, 13 Apr 2015)
Log Message
Build fix.
* UIProcess/mac/PageClientImpl.mm: (WebKit::PageClientImpl::setDragImage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182774 => 182775)
--- trunk/Source/WebKit2/ChangeLog 2015-04-14 01:33:50 UTC (rev 182774)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-14 01:36:03 UTC (rev 182775)
@@ -1,3 +1,9 @@
+2015-04-13 Alexey Proskuryakov <[email protected]>
+
+ Build fix.
+
+ * UIProcess/mac/PageClientImpl.mm: (WebKit::PageClientImpl::setDragImage):
+
2015-04-13 Anders Carlsson <[email protected]>
Keep track of each shared memory object's protection when deciding whether to return our existing port
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (182774 => 182775)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-04-14 01:33:50 UTC (rev 182774)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-04-14 01:36:03 UTC (rev 182775)
@@ -407,7 +407,10 @@
size.scale(1.0 / toImpl([m_wkView pageRef])->deviceScaleFactor());
[dragNSImage setSize:size];
- [m_wkView _dragImageForView: (m_webView) ? : m_wkView withImage:dragNSImage.get() at:clientPosition linkDrag:isLinkDrag];
+ if (m_webView)
+ [m_wkView _dragImageForView:m_webView withImage:dragNSImage.get() at:clientPosition linkDrag:isLinkDrag];
+ else
+ [m_wkView _dragImageForView:m_wkView withImage:dragNSImage.get() at:clientPosition linkDrag:isLinkDrag];
}
void PageClientImpl::setPromisedDataForImage(const String& pasteboardName, PassRefPtr<SharedBuffer> imageBuffer, const String& filename, const String& extension, const String& title, const String& url, const String& visibleUrl, PassRefPtr<SharedBuffer> archiveBuffer)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
