[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

kevino at webkit.org kevino at webkit.org
Thu Feb 4 21:28:26 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 722cef49c21da91dc403700f5dfc2b3c0acc3754
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 00:09:13 2010 +0000

    [wx] Build fix, make sure stub function returns a value.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c71bd85..1dc3681 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-26  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix, make sure stub function returns a value.
+
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        (LayoutTestController::counterValueForElementById):
+
 2010-01-26  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
index 282a80f..4b811ec 100644
--- a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+++ b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
@@ -357,5 +357,5 @@ void LayoutTestController::whiteListAccessFromOrigin(JSStringRef sourceOrigin, J
 
 JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id)
 {
-
+    return 0;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list