diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebKitTools/MiniBrowser/win/BrowserView.cpp | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebKitTools/MiniBrowser/win/BrowserView.cpp')
| -rw-r--r-- | WebKitTools/MiniBrowser/win/BrowserView.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/WebKitTools/MiniBrowser/win/BrowserView.cpp b/WebKitTools/MiniBrowser/win/BrowserView.cpp index 76848fa..b182740 100644 --- a/WebKitTools/MiniBrowser/win/BrowserView.cpp +++ b/WebKitTools/MiniBrowser/win/BrowserView.cpp @@ -39,7 +39,7 @@ BrowserView::BrowserView() // UI Client Callbacks -static WKPageRef createNewPage(WKPageRef page, const void* clientInfo) +static WKPageRef createNewPage(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void* clientInfo) { BrowserWindow* browserWindow = BrowserWindow::create(); browserWindow->createWindow(0, 0, 800, 600); @@ -78,10 +78,6 @@ static void mouseDidMoveOverElement(WKPageRef page, WKEventModifiers modifiers, { } -static void contentsSizeChanged(WKPageRef page, int width, int height, WKFrameRef frame, const void *clientInfo) -{ -} - void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow) { assert(!m_webView); @@ -109,8 +105,20 @@ void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow) runJavaScriptPrompt, setStatusText, mouseDidMoveOverElement, - contentsSizeChanged, - 0 /* didNotHandleKeyEvent */ + 0, /* didNotHandleKeyEvent */ + 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 */ }; WKPageSetPageUIClient(WKViewGetPage(m_webView), &uiClient); |