Title: [99149] trunk/Source/WebKit2
- Revision
- 99149
- Author
- [email protected]
- Date
- 2011-11-03 01:54:30 -0700 (Thu, 03 Nov 2011)
Log Message
[GTK] Fix build-break on r99143
https://bugs.webkit.org/show_bug.cgi?id=71440
Patch by ChangSeok Oh <[email protected]> on 2011-11-03
Reviewed by Philippe Normand.
dragOperation() should be replaced with dragSession().operation since it was removed.
And didDetectXSSForFrame of WKPageLoaderClient should be relocated.
* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
(webkitWebLoaderClientAttachLoaderClientToPage):
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseDragDataReceived):
(webkitWebViewBaseDragMotion):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (99148 => 99149)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 08:06:42 UTC (rev 99148)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 08:54:30 UTC (rev 99149)
@@ -1,3 +1,19 @@
+2011-11-03 ChangSeok Oh <[email protected]>
+
+ [GTK] Fix build-break on r99143
+ https://bugs.webkit.org/show_bug.cgi?id=71440
+
+ Reviewed by Philippe Normand.
+
+ dragOperation() should be replaced with dragSession().operation since it was removed.
+ And didDetectXSSForFrame of WKPageLoaderClient should be relocated.
+
+ * UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
+ (webkitWebLoaderClientAttachLoaderClientToPage):
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseDragDataReceived):
+ (webkitWebViewBaseDragMotion):
+
2011-11-03 Mahesh Kulkarni <[email protected]>
[Qt] Flagging usage of X11 headers under PLAT_ARCH(X11)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp (99148 => 99149)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-11-03 08:06:42 UTC (rev 99148)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-11-03 08:54:30 UTC (rev 99149)
@@ -162,7 +162,6 @@
0, // didRemoveFrameFromHierarchy
0, // didDisplayInsecureContentForFrame
0, // didRunInsecureContentForFrame
- 0, // didDetectXSSForFrame
0, // canAuthenticateAgainstProtectionSpaceInFrame
0, // didReceiveAuthenticationChallengeInFrame
didChangeProgress, // didStartProgress
@@ -173,7 +172,8 @@
0, // processDidCrash
didChangeBackForwardList,
0, // shouldGoToBackForwardListItem
- 0 // didFailToInitializePlugin
+ 0, // didFailToInitializePlugin
+ 0 // didDetectXSSForFrame
};
WKPageSetPageLoaderClient(wkPage, &wkLoaderClient);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (99148 => 99149)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2011-11-03 08:06:42 UTC (rev 99148)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2011-11-03 08:54:30 UTC (rev 99149)
@@ -340,7 +340,7 @@
webViewBase->priv->pageProxy->resetDragOperation();
webViewBase->priv->pageProxy->dragEntered(dragData.get());
- DragOperation operation = webViewBase->priv->pageProxy->dragOperation();
+ DragOperation operation = webViewBase->priv->pageProxy->dragSession().operation;
gdk_drag_status(context, dragOperationToSingleGdkDragAction(operation), time);
}
@@ -352,7 +352,7 @@
return TRUE;
webViewBase->priv->pageProxy->dragUpdated(dragData.get());
- DragOperation operation = webViewBase->priv->pageProxy->dragOperation();
+ DragOperation operation = webViewBase->priv->pageProxy->dragSession().operation;
gdk_drag_status(context, dragOperationToSingleGdkDragAction(operation), time);
return TRUE;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
