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

[levin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 945c8d9f90f416c6e397634f14a6bbd4f74510eb
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 9 23:28:04 2009 +0000

    [v8] Need change to V8WorkerContextEventListener::reportError signature to match the base class.
    https://bugs.webkit.org/show_bug.cgi?id=30264
    
    Patch by David Levin <levin at chromium.org> on 2009-10-09
    Reviewed by Eric Seidel.
    
    The base class method changed in r48884.
    
    Test: fast/worker/worker-script-error.html
    
    * bindings/v8/V8WorkerContextEventListener.cpp:
    (WebCore::V8WorkerContextEventListener::reportError):
    * bindings/v8/V8WorkerContextEventListener.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6c2e7d6..5a9b186 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-09  David Levin  <levin at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [v8] Need change to V8WorkerContextEventListener::reportError signature to match the base class.
+        https://bugs.webkit.org/show_bug.cgi?id=30264
+
+        The base class method changed in r48884.
+
+        Test: fast/worker/worker-script-error.html
+
+        * bindings/v8/V8WorkerContextEventListener.cpp:
+        (WebCore::V8WorkerContextEventListener::reportError):
+        * bindings/v8/V8WorkerContextEventListener.h:
+
 2009-10-09  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Brady Eidson.
diff --git a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
index 70df885..8563c58 100644
--- a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
+++ b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
@@ -71,7 +71,7 @@ void V8WorkerContextEventListener::handleEvent(ScriptExecutionContext*, Event* e
     invokeEventHandler(context, event, jsEvent);
 }
 
-bool V8WorkerContextEventListener::reportError(const String& message, const String& url, int lineNumber)
+bool V8WorkerContextEventListener::reportError(ScriptExecutionContext*, const String& message, const String& url, int lineNumber)
 {
     // Is the EventListener disconnected?
     if (disconnected())
diff --git a/WebCore/bindings/v8/V8WorkerContextEventListener.h b/WebCore/bindings/v8/V8WorkerContextEventListener.h
index 3752533..a6555a0 100644
--- a/WebCore/bindings/v8/V8WorkerContextEventListener.h
+++ b/WebCore/bindings/v8/V8WorkerContextEventListener.h
@@ -50,7 +50,7 @@ namespace WebCore {
         }
 
         virtual void handleEvent(ScriptExecutionContext*, Event*);
-        virtual bool reportError(const String& message, const String& url, int lineNumber);
+        virtual bool reportError(ScriptExecutionContext*, const String& message, const String& url, int lineNumber);
 
         WorkerContextExecutionProxy* proxy() const { return m_proxy; }
 

-- 
WebKit Debian packaging