[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

weinig at apple.com weinig at apple.com
Sun Feb 20 22:45:39 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 9f995fba8d5983a6a9eccc2ce898c6ea745085fc
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 02:48:04 2011 +0000

    Fix build.
    
    * MiniBrowser/mac/BrowserWindowController.m:
    (-[BrowserWindowController awakeFromNib]):
    * MiniBrowser/win/BrowserView.cpp:
    (BrowserView::create):
    * WebKitTestRunner/TestController.cpp:
    (WTR::createOtherPage):
    (WTR::TestController::initialize):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75464 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 46170bb..538368c 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-10  Sam Weinig  <sam at webkit.org>
+
+        Fix build.
+
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (-[BrowserWindowController awakeFromNib]):
+        * MiniBrowser/win/BrowserView.cpp:
+        (BrowserView::create):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::createOtherPage):
+        (WTR::TestController::initialize):
+
 2011-01-10  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Ojan Vafai.
diff --git a/Tools/MiniBrowser/mac/BrowserWindowController.m b/Tools/MiniBrowser/mac/BrowserWindowController.m
index ad3fcab..e761624 100644
--- a/Tools/MiniBrowser/mac/BrowserWindowController.m
+++ b/Tools/MiniBrowser/mac/BrowserWindowController.m
@@ -637,7 +637,8 @@ static void runOpenPanel(WKPageRef page, WKFrameRef frame, WKOpenPanelParameters
         0,          /* didDraw */
         0,          /* pageDidScroll */
         0,          /* exceededDatabaseQuota */
-        runOpenPanel
+        runOpenPanel,
+        0,          /* decidePolicyForGeolocationPermissionRequest */
     };
     WKPageSetPageUIClient(_webView.pageRef, &uiClient);
 }
diff --git a/Tools/MiniBrowser/win/BrowserView.cpp b/Tools/MiniBrowser/win/BrowserView.cpp
index a93ca96..b9aaadc 100644
--- a/Tools/MiniBrowser/win/BrowserView.cpp
+++ b/Tools/MiniBrowser/win/BrowserView.cpp
@@ -118,7 +118,8 @@ void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow)
         0,          /* didDraw */
         0,          /* pageDidScroll */
         0,          /* exceededDatabaseQuota */
-        0           /* runOpenPanel */
+        0,          /* runOpenPanel */
+        0,          /* decidePolicyForGeolocationPermissionRequest */
     };
 
     WKPageSetPageUIClient(WKViewGetPage(m_webView), &uiClient);
diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index 3ea46ee..764bd50 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -138,7 +138,8 @@ static WKPageRef createOtherPage(WKPageRef oldPage, WKDictionaryRef, WKEventModi
         0, // didDraw
         0, // pageDidScroll
         0, // exceededDatabaseQuota
-        0  // runOpenPanel
+        0, // runOpenPanel
+        0, // decidePolicyForGeolocationPermissionRequest
     };
     WKPageSetPageUIClient(newPage, &otherPageUIClient);
 
@@ -242,7 +243,8 @@ void TestController::initialize(int argc, const char* argv[])
         0, // didDraw
         0, // pageDidScroll
         0, // exceededDatabaseQuota
-        0  // runOpenPanel
+        0, // runOpenPanel
+        0, // decidePolicyForGeolocationPermissionRequest
     };
     WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list