Title: [99151] trunk/Source/WebKit2
- Revision
- 99151
- Author
- [email protected]
- Date
- 2011-11-03 02:07:33 -0700 (Thu, 03 Nov 2011)
Log Message
Unreviewed Qt build fix(es).
* UIProcess/qt/QtDesktopWebPageProxy.cpp:
(QtDesktopWebPageProxy::handleDragMoveEvent): Adapt to dragSession API change.
(QtDesktopWebPageProxy::handleDropEvent): Ditto.
* WebProcess/Plugins/Netscape/NetscapePluginNone.cpp:
(WebKit::NetscapePlugin::wantsWindowRelativeNPWindowCoordinates): Implement here
also, for plugin-disabled builds.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (99150 => 99151)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 09:07:21 UTC (rev 99150)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 09:07:33 UTC (rev 99151)
@@ -1,3 +1,14 @@
+2011-11-03 Simon Hausmann <[email protected]>
+
+ Unreviewed Qt build fix(es).
+
+ * UIProcess/qt/QtDesktopWebPageProxy.cpp:
+ (QtDesktopWebPageProxy::handleDragMoveEvent): Adapt to dragSession API change.
+ (QtDesktopWebPageProxy::handleDropEvent): Ditto.
+ * WebProcess/Plugins/Netscape/NetscapePluginNone.cpp:
+ (WebKit::NetscapePlugin::wantsWindowRelativeNPWindowCoordinates): Implement here
+ also, for plugin-disabled builds.
+
2011-11-03 ChangSeok Oh <[email protected]>
[GTK] Fix build-break on r99143
Modified: trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.cpp (99150 => 99151)
--- trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.cpp 2011-11-03 09:07:21 UTC (rev 99150)
+++ trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.cpp 2011-11-03 09:07:33 UTC (rev 99151)
@@ -222,8 +222,8 @@
// FIXME: Should not use QCursor::pos()
DragData dragData(ev->mimeData(), ev->pos(), QCursor::pos(), dropActionToDragOperation(ev->possibleActions()));
m_webPageProxy->dragUpdated(&dragData);
- ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragOperation()));
- if (m_webPageProxy->dragOperation() != DragOperationNone)
+ ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragSession().operation));
+ if (m_webPageProxy->dragSession().operation != DragOperationNone)
ev->accept();
ev->setAccepted(accepted);
@@ -238,7 +238,7 @@
DragData dragData(ev->mimeData(), ev->pos(), QCursor::pos(), dropActionToDragOperation(ev->possibleActions()));
SandboxExtension::Handle handle;
m_webPageProxy->performDrag(&dragData, String(), handle);
- ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragOperation()));
+ ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragSession().operation));
ev->accept();
ev->setAccepted(accepted);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp (99150 => 99151)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp 2011-11-03 09:07:21 UTC (rev 99150)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp 2011-11-03 09:07:33 UTC (rev 99151)
@@ -88,6 +88,11 @@
return false;
}
+bool NetscapePlugin::wantsWindowRelativeNPWindowCoordinates()
+{
+ return false;
+}
+
} // namespace WebKit
#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
