Fixing wrong extension ID in Activity Log entries.

Source/bindings/v8/ScriptState.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ScriptState_h
 #define ScriptState_h
 
 #include "bindings/v8/ScopedPersistent.h"
 #include "bindings/v8/V8PerContextData.h"
 #include "wtf/RefCounted.h"
 #include <v8.h>
 
 namespace WebCore {
 
 class DOMWindow;
 class DOMWrapperWorld;
 class ExecutionContext;
 class LocalFrame;
+class V8DOMActivityLogger;
 
 // ScriptState is created when v8::Context is created.
 // ScriptState is destroyed when v8::Context is garbage-collected and
 // all V8 proxy objects that have references to the ScriptState are destructed.
 class ScriptState : public RefCounted<ScriptState> {
     WTF_MAKE_NONCOPYABLE(ScriptState);
 public:
     class Scope {
     public:
         // You need to make sure that scriptState->context() is not empty before creating a Scope.
@@ skipping 45 matching lines @@
     v8::Handle<v8::Context> context() const { return m_context.newLocal(m_isolate); }
     bool contextIsEmpty() const { return m_context.isEmpty(); }
     void clearContext() { return m_context.clear(); }
 
     V8PerContextData* perContextData() const { return m_perContextData.get(); }
     void disposePerContextData() { m_perContextData = nullptr; }
 
     bool evalEnabled() const;
     void setEvalEnabled(bool);
 
+    V8DOMActivityLogger* activityLogger() const { return m_activityLogger; }
+    void setActivityLogger(V8DOMActivityLogger* activityLogger) { m_activityLogger = activityLogger; }
+
 private:
     ScriptState(v8::Handle<v8::Context>, PassRefPtr<DOMWrapperWorld>);
 
     v8::Isolate* m_isolate;
     // This persistent handle is weak.
     ScopedPersistent<v8::Context> m_context;
 
     // This RefPtr doesn't cause a cycle because all persistent handles that DOMWrapperWorld holds are weak.
     RefPtr<DOMWrapperWorld> m_world;
 
     // This OwnPtr causes a cycle:
     // V8PerContextData --(Persistent)--> v8::Context --(RefPtr)--> ScriptState --(OwnPtr)--> V8PerContextData
     // So you must explicitly clear the OwnPtr by calling disposePerContextData()
     // once you no longer need V8PerContextData. Otherwise, the v8::Context will leak.
     OwnPtr<V8PerContextData> m_perContextData;
+    // This is owned by a static hash map in V8DOMActivityLogger.
+    V8DOMActivityLogger* m_activityLogger;
 };
 
 // ScriptStateProtectingContext keeps the context associated with the ScriptState alive.
 // You need to call clear() once you no longer need the context. Otherwise, the context will leak.
 class ScriptStateProtectingContext {
     WTF_MAKE_NONCOPYABLE(ScriptStateProtectingContext);
 public:
     ScriptStateProtectingContext(ScriptState* scriptState)
         : m_scriptState(scriptState)
     {
@@ skipping 10 matching lines @@
     }
 
 private:
     RefPtr<ScriptState> m_scriptState;
     ScopedPersistent<v8::Context> m_context;
 };
 
 }
 
 #endif // ScriptState_h