[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

simon.fraser at apple.com simon.fraser at apple.com
Wed Dec 22 14:41:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 44920e0135308d369c31e0ecd9669c7667317657
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 22:52:54 2010 +0000

    2010-10-15  Simon Fraser  <simon.fraser at apple.com>
    
            Fix the build; need to add new slot to PageUIClient callbacks.
    
            * MiniBrowser/mac/BrowserWindowController.m:
            (-[BrowserWindowController awakeFromNib]):
            * WebKitTestRunner/TestController.cpp:
            (WTR::createOtherPage):
            (WTR::TestController::initialize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69894 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 958f9e6..6a4c3a3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-10-15  Simon Fraser  <simon.fraser at apple.com>
 
+        Fix the build; need to add new slot to PageUIClient callbacks.
+
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (-[BrowserWindowController awakeFromNib]):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::createOtherPage):
+        (WTR::TestController::initialize):
+
+2010-10-15  Simon Fraser  <simon.fraser at apple.com>
+
         Add Matt Delaney to committers.py.
 
         * Scripts/webkitpy/common/config/committers.py:
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 4e5f1d2..557f5f0 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -581,7 +581,8 @@ static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKF
         0,          /* didNotHandleKeyEvent */
         getWindowFrame,
         setWindowFrame,
-        runBeforeUnloadConfirmPanel
+        runBeforeUnloadConfirmPanel,
+        0          /* didDraw */
     };
     WKPageSetPageUIClient(_webView.pageRef, &uiClient);
 }
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index eef5eff..aff8798 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -109,18 +109,19 @@ static WKPageRef createOtherPage(WKPageRef oldPage, const void*)
         0,
         view,
         createOtherPage,
-        0,
+        0, // showPage
         closeOtherPage,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
+        0, // runJavaScriptAlert        
+        0, // runJavaScriptConfirm
+        0, // runJavaScriptPrompt
+        0, // setStatusText
+        0, // mouseDidMoveOverElement
+        0, // contentsSizeChanged
+        0, // didNotHandleKeyEvent
         getWindowFrameOtherPage,
         setWindowFrameOtherPage,
-        0
+        0, // runBeforeUnloadConfirmPanel
+        0 // didDraw
     };
     WKPageSetPageUIClient(newPage, &otherPageUIClient);
 
@@ -193,42 +194,43 @@ void TestController::initialize(int argc, const char* argv[])
         0,
         this,
         createOtherPage,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
+        0, // showPage
+        0, // close
+        0, // runJavaScriptAlert        
+        0, // runJavaScriptConfirm
+        0, // runJavaScriptPrompt
+        0, // setStatusText
+        0, // mouseDidMoveOverElement
+        0, // contentsSizeChanged
+        0, // didNotHandleKeyEvent
         getWindowFrameMainPage,
         setWindowFrameMainPage,
-        0,
+        0, // runBeforeUnloadConfirmPanel
+        0 // didDraw
     };
     WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
 
     WKPageLoaderClient pageLoaderClient = {
         0,
         this,
-        0,
-        0,
-        0,
-        0,
-        0,
+        0, // didStartProvisionalLoadForFrame
+        0, // didReceiveServerRedirectForProvisionalLoadForFrame
+        0, // didFailProvisionalLoadWithErrorForFrame
+        0, // didCommitLoadForFrame
+        0, // didFinishDocumentLoadForFrame
         didFinishLoadForFrame,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
+        0, // didFailLoadWithErrorForFrame
+        0, // didReceiveTitleForFrame
+        0, // didFirstLayoutForFrame
+        0, // didFirstVisuallyNonEmptyLayoutForFrame
+        0, // didRemoveFrameFromHierarchy
+        0, // didStartProgress
+        0, // didChangeProgress
+        0, // didFinishProgress
+        0, // didBecomeUnresponsive
+        0, // didBecomeResponsive
+        0, // processDidExit
+        0 // didChangeBackForwardList
     };
     WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list