[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[barraclough at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 3e8f2d79d31cf6dbd93a3f5389beeb1b8e8e66ee
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 05:27:54 2009 +0000

    Build fix following bug #30696.
    
    Patch by Gavin Barraclough <barraclough at apple.com> on 2009-10-22
    Reviewed by NOBODY (build fix).
    
    * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
    (LayoutTestController::evaluateScriptInIsolatedWorld):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b181976..af0706b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
 2009-10-22  Gavin Barraclough  <barraclough at apple.com>
 
+        Reviewed by NOBODY (build fix).
+        Build fix following bug #30696.
+
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::evaluateScriptInIsolatedWorld):
+
+2009-10-22  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Sam Weinig & Geoff Garen.
 
         https://bugs.webkit.org/show_bug.cgi?id=30696
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 1df92c4..b01dcf4 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -487,6 +487,11 @@ void LayoutTestController::evaluateInWebInspector(long callId, JSStringRef scrip
     // FIXME: Implement this.
 }
 
+void LayoutTestController::evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script)
+{
+    // FIXME: Implement this.
+}
+
 void LayoutTestController::removeAllVisitedLinks()
 {
     // FIXME: Implement this.

-- 
WebKit Debian packaging