Modified: trunk/Source/WebKit2/ChangeLog (93948 => 93949)
--- trunk/Source/WebKit2/ChangeLog 2011-08-27 22:01:33 UTC (rev 93948)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-28 19:14:17 UTC (rev 93949)
@@ -1,3 +1,15 @@
+2011-08-28 Balazs Kelemen <[email protected]>
+
+ [Qt][WK2] Unreviewed build fix.
+
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::init): Initialize the WKPageUIClient with memset
+ to avoid missing initializer warning. The missing initializer is the
+ result of using a version 0 WKPageUIClient while it has newer version (1).
+ We have nothing to do with the callbacks in the new version so I voted
+ for memset.
+ * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp: Include ResourceError.h.
+
2011-08-26 Sam Weinig <[email protected]>
Stop using custom NSErrors for WebKit2 WebErrors
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (93948 => 93949)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-08-27 22:01:33 UTC (rev 93948)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-08-28 19:14:17 UTC (rev 93949)
@@ -149,49 +149,11 @@
};
WKPageSetPageLoaderClient(pageRef(), &loadClient);
- WKPageUIClient uiClient = {
- 0, /* version */
- m_viewInterface, /* clientInfo */
- 0, /* createNewPage */
- 0, /* showPage */
- 0, /* close */
- 0, /* takeFocus */
- 0, /* focus */
- 0, /* unfocus */
- 0, /* runJavaScriptAlert */
- 0, /* runJavaScriptConfirm */
- 0, /* runJavaScriptPrompt */
- qt_wk_setStatusText,
- 0, /* mouseDidMoveOverElement */
- 0, /* missingPluginButtonClicked */
- 0, /* didNotHandleKeyEvent */
- 0, /* didNotHandleWheelEvent */
- 0, /* toolbarsAreVisible */
- 0, /* setToolbarsAreVisible */
- 0, /* menuBarIsVisible */
- 0, /* setMenuBarIsVisible */
- 0, /* statusBarIsVisible */
- 0, /* setStatusBarIsVisible */
- 0, /* isResizable */
- 0, /* setIsResizable */
- 0, /* getWindowFrame */
- 0, /* setWindowFrame */
- 0, /* runBeforeUnloadConfirmPanel */
- 0, /* didDraw */
- 0, /* pageDidScroll */
- 0, /* exceededDatabaseQuota */
- 0, /* runOpenPanel */
- 0, /* decidePolicyForGeolocationPermissionRequest */
- 0, /* headerHeight */
- 0, /* footerHeight */
- 0, /* drawHeader */
- 0, /* drawFooter */
- 0, /* printFrame */
- 0, /* runModal */
- 0, /* didCompleteRubberBandForMainFrame */
- 0, /* saveDataToFileInDownloadsFolder */
- 0, /* shouldInterruptJavaScript */
- };
+ WKPageUIClient uiClient;
+ memset(&uiClient, 0, sizeof(WKPageUIClient));
+ uiClient.version = 0;
+ uiClient.clientInfo = m_viewInterface;
+ uiClient.setStatusText = qt_wk_setStatusText;
WKPageSetPageUIClient(toAPI(m_webPageProxy.get()), &uiClient);
if (m_policyInterface) {
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp (93948 => 93949)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp 2011-08-27 22:01:33 UTC (rev 93948)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp 2011-08-28 19:14:17 UTC (rev 93949)
@@ -27,6 +27,7 @@
#include "config.h"
#include "WebErrors.h"
+#include <WebCore/ResourceError.h>
#include <WebCore/ResourceRequest.h>
#include <WebCore/ResourceResponse.h>
@@ -42,7 +43,7 @@
WebKitErrorCannotShowMIMEType = 100,
WebKitErrorCannotShowURL = 101,
WebKitErrorFrameLoadInterruptedByPolicyChange = 102,
- WebKitErrorCannotUseRestrictedPort = 103,
+ WebKitErrorCannotUseRestrictedPort = 103,
WebKitErrorCannotFindPlugIn = 200,
WebKitErrorCannotLoadPlugIn = 201,
WebKitErrorJavaUnavailable = 202,
