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

[senorblanco at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6ad942ac5bc64ad1ff6a7a0f1c43ca6e87bd7bea
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 21:43:57 2009 +0000

    Unreviewed, build fix.
    
    Fixing Chromium build, following r48884.
    
    [https://bugs.webkit.org/show_bug.cgi?id=29894]
    
    * bindings/v8/V8AbstractEventListener.cpp:
    (WebCore::V8AbstractEventListener::handleEvent):
    * bindings/v8/V8AbstractEventListener.h:
    * bindings/v8/V8WorkerContextEventListener.cpp:
    (WebCore::V8WorkerContextEventListener::handleEvent):
    * bindings/v8/V8WorkerContextEventListener.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 84336a6..f5e08e5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-09-29  Stephen White  <senorblanco at chromium.org>
+
+        Unreviewed, build fix.
+
+        Fixing Chromium build, following r48884.
+
+        [https://bugs.webkit.org/show_bug.cgi?id=29894]
+
+        * bindings/v8/V8AbstractEventListener.cpp:
+        (WebCore::V8AbstractEventListener::handleEvent):
+        * bindings/v8/V8AbstractEventListener.h:
+        * bindings/v8/V8WorkerContextEventListener.cpp:
+        (WebCore::V8WorkerContextEventListener::handleEvent):
+        * bindings/v8/V8WorkerContextEventListener.h:
+
 2009-09-29  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bindings/v8/V8AbstractEventListener.cpp b/WebCore/bindings/v8/V8AbstractEventListener.cpp
index 1829e29..d1ee730 100644
--- a/WebCore/bindings/v8/V8AbstractEventListener.cpp
+++ b/WebCore/bindings/v8/V8AbstractEventListener.cpp
@@ -124,7 +124,7 @@ void V8AbstractEventListener::invokeEventHandler(v8::Handle<v8::Context> v8Conte
         event->preventDefault();
 }
 
-void V8AbstractEventListener::handleEvent(Event* event)
+void V8AbstractEventListener::handleEvent(ScriptExecutionContext* scriptExecutionContext, Event* event)
 {
     // EventListener could be disconnected from the frame.
     if (disconnected())
diff --git a/WebCore/bindings/v8/V8AbstractEventListener.h b/WebCore/bindings/v8/V8AbstractEventListener.h
index 789cf04..8f1061b 100644
--- a/WebCore/bindings/v8/V8AbstractEventListener.h
+++ b/WebCore/bindings/v8/V8AbstractEventListener.h
@@ -58,7 +58,7 @@ namespace WebCore {
         // Returns the owner frame of the listener.
         Frame* frame() { return m_frame; }
 
-        virtual void handleEvent(Event*);
+        virtual void handleEvent(ScriptExecutionContext*, Event*);
         void invokeEventHandler(v8::Handle<v8::Context>, Event*, v8::Handle<v8::Value> jsEvent);
 
         // Returns the listener object, either a function or an object.
diff --git a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
index bde60a1..2437458 100644
--- a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
+++ b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
@@ -53,7 +53,7 @@ V8WorkerContextEventListener::~V8WorkerContextEventListener()
     disposeListenerObject();
 }
 
-void V8WorkerContextEventListener::handleEvent(Event* event)
+void V8WorkerContextEventListener::handleEvent(ScriptExecutionContext*, Event* event)
 {
     // Is the EventListener disconnected?
     if (disconnected())
diff --git a/WebCore/bindings/v8/V8WorkerContextEventListener.h b/WebCore/bindings/v8/V8WorkerContextEventListener.h
index 943ae76..4609533 100644
--- a/WebCore/bindings/v8/V8WorkerContextEventListener.h
+++ b/WebCore/bindings/v8/V8WorkerContextEventListener.h
@@ -51,7 +51,7 @@ namespace WebCore {
         V8WorkerContextEventListener(WorkerContextExecutionProxy*, v8::Local<v8::Object> listener, bool isInline);
 
         virtual ~V8WorkerContextEventListener();
-        virtual void handleEvent(Event*);
+        virtual void handleEvent(ScriptExecutionContext*, Event*);
         virtual bool reportError(const String& message, const String& url, int lineNumber);
         virtual bool disconnected() const { return !m_proxy; }
 

-- 
WebKit Debian packaging