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

mjs at apple.com mjs at apple.com
Wed Dec 22 13:20:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit d667528a1aa3ce62a86acfe82016506c5bf9ce06
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 04:58:08 2010 +0000

    2010-09-11  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Anders Carlsson.
    
            Attempt to fix Windows MiniBrowser build (untested)
            https://bugs.webkit.org/show_bug.cgi?id=45609
    
            * MiniBrowser/win/BrowserView.cpp:
            (runJavaScriptConfirm):
            (runJavaScriptPrompt):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67317 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ccd6868..4854bd3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Attempt to fix Windows MiniBrowser build (untested)
+        https://bugs.webkit.org/show_bug.cgi?id=45609
+
+        * MiniBrowser/win/BrowserView.cpp:
+        (runJavaScriptConfirm):
+        (runJavaScriptPrompt):
+
 2010-09-11  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebKitTools/MiniBrowser/win/BrowserView.cpp b/WebKitTools/MiniBrowser/win/BrowserView.cpp
index 919451d..5e90fe2 100644
--- a/WebKitTools/MiniBrowser/win/BrowserView.cpp
+++ b/WebKitTools/MiniBrowser/win/BrowserView.cpp
@@ -62,10 +62,12 @@ static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef
 
 static bool runJavaScriptConfirm(WKPageRef page, WKStringRef message, WKFrameRef frame, const void* clientInfo)
 {
+    return false;
 }
 
 static WKStringRef runJavaScriptPrompt(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, const void* clientInfo)
 {
+    return 0;
 }
 
 static void setStatusText(WKPageRef page, WKStringRef text, const void* clientInfo)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list