diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-14 16:29:47 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-14 16:29:47 +0200 |
commit | d0424a769059c84ae20beb3c217812792ea6726b (patch) | |
tree | 6f94a5c3db8c52c6694ee56498542a6c35417350 /Tools/MiniBrowser | |
parent | 88a04ac016f57c2d78e714682445dff2e7db4ade (diff) | |
download | qtwebkit-d0424a769059c84ae20beb3c217812792ea6726b.tar.gz |
Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 (http://svn.webkit.org/repository/webkit/trunk@128608)
New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make
Diffstat (limited to 'Tools/MiniBrowser')
-rw-r--r-- | Tools/MiniBrowser/mac/BrowserWindowController.m | 2 | ||||
-rw-r--r-- | Tools/MiniBrowser/win/BrowserView.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Tools/MiniBrowser/mac/BrowserWindowController.m b/Tools/MiniBrowser/mac/BrowserWindowController.m index e6b6f542d..d9cb286e8 100644 --- a/Tools/MiniBrowser/mac/BrowserWindowController.m +++ b/Tools/MiniBrowser/mac/BrowserWindowController.m @@ -694,6 +694,8 @@ static void runOpenPanel(WKPageRef page, WKFrameRef frame, WKOpenPanelParameters mouseDidMoveOverElement, 0, // decidePolicyForNotificationPermissionRequest 0, // unavailablePluginButtonClicked + 0, // showColorPicker + 0, // hideColorPicker }; WKPageSetPageUIClient(_webView.pageRef, &uiClient); } diff --git a/Tools/MiniBrowser/win/BrowserView.cpp b/Tools/MiniBrowser/win/BrowserView.cpp index 03a46cb19..0a6858e35 100644 --- a/Tools/MiniBrowser/win/BrowserView.cpp +++ b/Tools/MiniBrowser/win/BrowserView.cpp @@ -130,6 +130,10 @@ void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow) 0, /* shouldInterruptJavaScript */ createNewPage, mouseDidMoveOverElement, + 0, /* decidePolicyForNotificationPermissionRequest */ + 0, /* unavailablePluginButtonClicked */ + 0, /* showColorPicker */ + 0, /* hideColorPicker */ }; WKPageSetPageUIClient(WKViewGetPage(m_webView), &uiClient); |