Chrome side of webkit merge from r41860 to 41906.

The encoding parameter got dropped from Workers (r41871) so
drop it through the whole stack.

The upstream WorkerContextExecutionProxy has trackEvent with a lower
case t, but we pull in the wrong header in some places so make
both headers match.

Review URL: http://codereview.chromium.org/42538

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12326 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 2 deletions

diff --git a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
index b06ddb0..e0d3462 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -351,7 +351,7 @@ void WorkerContextExecutionProxy::RemoveEventListener(V8EventListener* listener)
     }
 }
 
-void WorkerContextExecutionProxy::TrackEvent(Event* event)
+void WorkerContextExecutionProxy::trackEvent(Event* event)
 {
     m_events.add(event);
 }
diff --git a/webkit/port/bindings/v8/WorkerContextExecutionProxy.h b/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
index 3297067..0da12ad 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
@@ -66,7 +66,7 @@ namespace WebCore {
         // Track the event so that we can detach it from the JS wrapper when a worker
         // terminates. This is needed because we need to be able to dispose these
         // events and releases references to their event targets: WorkerContext.
-        void TrackEvent(Event*);
+        void trackEvent(Event*);
 
         // Evaluate a script file in the current execution environment.
         v8::Local<v8::Value> evaluate(const String& str, const String& fileName, int baseLine);