Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

6 files changed, 14 insertions, 8 deletions

diff --git a/Tools/MiniBrowser/mac/BrowserWindowController.m b/Tools/MiniBrowser/mac/BrowserWindowController.m
index fd6f2e0..5c4efef 100644
--- a/Tools/MiniBrowser/mac/BrowserWindowController.m
+++ b/Tools/MiniBrowser/mac/BrowserWindowController.m
@@ -370,7 +370,7 @@ static void decidePolicyForNewWindowAction(WKPageRef page, WKFrameRef frame, WKF
     WKFramePolicyListenerUse(listener);
 }
 
-static void decidePolicyForMIMEType(WKPageRef page, WKFrameRef frame, WKStringRef MIMEType, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
+static void decidePolicyForResponse(WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
 {
     WKFramePolicyListenerUse(listener);
 }
@@ -597,7 +597,8 @@ static void runOpenPanel(WKPageRef page, WKFrameRef frame, WKOpenPanelParameters
         didBecomeUnresponsive,
         didBecomeResponsive,
         processDidExit,
-        didChangeBackForwardList
+        didChangeBackForwardList,
+        0 // shouldGoToBackForwardItem
     };
     WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
     
@@ -606,7 +607,8 @@ static void runOpenPanel(WKPageRef page, WKFrameRef frame, WKOpenPanelParameters
         self,       /* clientInfo */
         decidePolicyForNavigationAction,
         decidePolicyForNewWindowAction,
-        decidePolicyForMIMEType
+        decidePolicyForResponse,
+        0           /* unableToImplementPolicy */
     };
     WKPageSetPagePolicyClient(_webView.pageRef, &policyClient);
 
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp
index 0405e9e..67d5696 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/Tools/MiniBrowser/qt/BrowserWindow.cpp
@@ -197,6 +197,8 @@ void BrowserWindow::loadProgress(int progress)
 void BrowserWindow::urlChanged(const QUrl& url)
 {
     m_addressBar->setText(url.toString());
+    m_browser->setFocus();
+    m_browser->view()->setFocus();
 }
 
 void BrowserWindow::openFile()
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index cefa678..0038823 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -47,7 +47,7 @@ linux-* {
 }
 
 symbian {
-    TARGET.UID3 = 0xA000E543
+    TARGET.UID3 = 0xA000E545
     TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
 }
 
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
index 4ed7895..d68d299 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
@@ -58,7 +58,7 @@ void MiniBrowserApplication::handleUserOptions()
              << "[-r list]"
              << "[-robot-timeout seconds]"
              << "[-robot-extra-time seconds]"
-             << "[-tiled-backing-store]"
+             << "[-chunked-drawing-area]"
              <<  "[-separate-web-process-per-window]"
              << "URLs";
         appQuit(0);
@@ -87,8 +87,8 @@ void MiniBrowserApplication::handleUserOptions()
     if (robotExtraTimeIndex != -1)
         m_robotExtraTimeSeconds = takeOptionValue(&args, robotExtraTimeIndex).toInt();
 
-    if (args.contains("-tiled-backing-store"))
-        m_windowOptions.useTiledBackingStore = true;
+    if (args.contains("-chunked-drawing-area"))
+        m_windowOptions.useTiledBackingStore = false;
 
     if (args.contains("-separate-web-process-per-window"))
         m_windowOptions.useSeparateWebProcessPerWindow = true;
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.h b/Tools/MiniBrowser/qt/MiniBrowserApplication.h
index 2039764..45dbde9 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.h
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.h
@@ -34,7 +34,7 @@
 
 struct WindowOptions {
     WindowOptions()
-        : useTiledBackingStore(false)
+        : useTiledBackingStore(true)
         , useSeparateWebProcessPerWindow(false)
     {
     }
diff --git a/Tools/MiniBrowser/win/BrowserView.cpp b/Tools/MiniBrowser/win/BrowserView.cpp
index b9aaadc..f9ccfe7 100644
--- a/Tools/MiniBrowser/win/BrowserView.cpp
+++ b/Tools/MiniBrowser/win/BrowserView.cpp
@@ -123,6 +123,8 @@ void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow)
     };
 
     WKPageSetPageUIClient(WKViewGetPage(m_webView), &uiClient);
+
+    WKViewSetIsInWindow(m_webView, true);
 }
 
 void BrowserView::setFrame(RECT rect)