Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e

2 files changed, 38 insertions, 15 deletions

diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 6fad41a..4f2b63f 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -305,6 +305,16 @@ static void didRemoveFrameFromHierarchy(WKPageRef page, WKFrameRef frame, WKType
     LOG(@"didRemoveFrameFromHierarchy");
 }
 
+static void didDisplayInsecureContentForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
+{
+    LOG(@"didDisplayInsecureContentForFrame");
+}
+
+static void didRunInsecureContentForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
+{
+    LOG(@"didRunInsecureContentForFrame");
+}
+
 static void didStartProgress(WKPageRef page, const void *clientInfo)
 {
     [(BrowserWindowController *)clientInfo didStartProgress];
@@ -361,7 +371,7 @@ static void decidePolicyForMIMEType(WKPageRef page, WKStringRef MIMEType, WKURLR
 
 #pragma mark UI Client Callbacks
 
-static WKPageRef createNewPage(WKPageRef page, const void* clientInfo)
+static WKPageRef createNewPage(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton button, const void* clientInfo)
 {
     LOG(@"createNewPage");
     BrowserWindowController *controller = [[BrowserWindowController alloc] initWithPageNamespace:WKPageGetPageNamespace(page)];
@@ -479,11 +489,6 @@ static void mouseDidMoveOverElement(WKPageRef page, WKEventModifiers modifiers,
     LOG(@"mouseDidMoveOverElement");
 }
 
-static void contentsSizeChanged(WKPageRef page, int width, int height, WKFrameRef frame, const void *clientInfo)
-{
-    LOG(@"contentsSizeChanged");
-}
-
 static WKRect getWindowFrame(WKPageRef page, const void* clientInfo)
 {
     NSRect rect = [[(BrowserWindowController *)clientInfo window] frame];
@@ -547,6 +552,8 @@ static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKF
         didFirstLayoutForFrame,
         didFirstVisuallyNonEmptyLayoutForFrame,
         didRemoveFrameFromHierarchy,
+        didDisplayInsecureContentForFrame,
+        didRunInsecureContentForFrame,
         didStartProgress,
         didChangeProgress,
         didFinishProgress,
@@ -577,12 +584,20 @@ static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKF
         runJavaScriptPrompt,
         setStatusText,
         mouseDidMoveOverElement,
-        contentsSizeChanged,
         0,          /* didNotHandleKeyEvent */
+        0,          /* toolbarsAreVisible */
+        0,          /* setToolbarsAreVisible */
+        0,          /* menuBarIsVisible */
+        0,          /* setMenuBarIsVisible */
+        0,          /* statusBarIsVisible */
+        0,          /* setStatusBarIsVisible */
+        0,          /* isResizable */
+        0,          /* setIsResizable */
         getWindowFrame,
         setWindowFrame,
         runBeforeUnloadConfirmPanel,
-        0          /* didDraw */
+        0,          /* didDraw */
+        0           /* pageDidScroll */
     };
     WKPageSetPageUIClient(_webView.pageRef, &uiClient);
 }
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);