Changeset 99151 in webkit

Timestamp:

Nov 3, 2011, 2:07:33 AM (14 years ago)

Author:

Simon Hausmann

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtDesktopWebPageProxy.cpp (modified) (2 diffs)
• WebProcess/Plugins/Netscape/NetscapePluginNone.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        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  <shivamidow@gmail.com>
 

trunk/Source/WebKit2/UIProcess/qt/QtDesktopWebPageProxy.cpp

@@ -223 +223 @@
     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();
 
@@ -239 +239 @@
     SandboxExtension::Handle handle;
     m_webPageProxy->performDrag(&dragData, String(), handle);
-    ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragOperation()));
+    ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragSession().operation));
     ev->accept();
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp

@@ -89 +89 @@
 }
 
+bool NetscapePlugin::wantsWindowRelativeNPWindowCoordinates()
+{
+    return false;
+}
+
 } // namespace WebKit