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

[yurys at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2c4fc67184dad188f1591d71fabe14c1801d2fb3
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 09:42:09 2010 +0000

    emikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Add stub implementation of dispatchOnInjectedScript method so that
            Chromium source can compile against it and the main fix for the bug
            28622 can be landed without breaking Chromium build.
    
            https://bugs.webkit.org/show_bug.cgi?id=28622
    
            * inspector/InspectorBackend.h:
            (WebCore::InspectorBackend::dispatchOnInjectedScript):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1411c36..8510d7f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-22  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Add stub implementation of dispatchOnInjectedScript method so that
+        Chromium source can compile against it and the main fix for the bug
+        28622 can be landed without breaking Chromium build.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28622
+
+        * inspector/InspectorBackend.h:
+        (WebCore::InspectorBackend::dispatchOnInjectedScript):
+
 2010-01-22  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index 05b5799..be01f24 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -105,6 +105,9 @@ public:
 #endif
 
     void dispatchOnInjectedScript(long callId, const String& methodName, const String& arguments, bool async);
+    // FIXME(32554): Temporarily we have two similar methods so that clients can compile against both signatures.
+    // The method above will be removed soon.
+    void dispatchOnInjectedScript(long, long, const String&, const String&, bool) { }
     void getChildNodes(long callId, long nodeId);
     void setAttribute(long callId, long elementId, const String& name, const String& value);
     void removeAttribute(long callId, long elementId, const String& name);

-- 
WebKit Debian packaging