bindings: Simplifies WindowProxyManager and its relation to Frame.

third_party/WebKit/Source/bindings/core/v8/ScriptController.h

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ScriptController_h
 #define ScriptController_h
 
 #include "bindings/core/v8/SharedPersistent.h"
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/CoreExport.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/frame/LocalFrame.h"
 #include "platform/heap/Handle.h"
 #include "platform/loader/fetch/AccessControlStatus.h"
 #include "platform/loader/fetch/CrossOriginAccessControl.h"
 #include "v8/include/v8.h"
 #include "wtf/HashMap.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/Vector.h"
 #include "wtf/text/TextPosition.h"
 
 namespace blink {
 
 class DOMWrapperWorld;
 class Element;
 class FrameViewBase;
 class KURL;
+class LocalFrame;
 class ScriptSourceCode;
 class SecurityOrigin;
 
 typedef WTF::Vector<v8::Extension*> V8Extensions;
 
 
 class CORE_EXPORT ScriptController final
     : public GarbageCollected<ScriptController> {
   WTF_MAKE_NONCOPYABLE(ScriptController);
 
  public:
   enum ExecuteScriptPolicy {
     ExecuteScriptWhenScriptsDisabled,
     DoNotExecuteScriptWhenScriptsDisabled
   };
 
-  static ScriptController* create(LocalFrame* frame) {
-    return new ScriptController(frame);
+  static ScriptController* create(LocalFrame* frame,

[dcheng, 2017/03/10 09:52:12]

Nit: pass the arguments by reference

[Yuki, 2017/03/10 15:21:50]

Done.

+                                  LocalWindowProxyManager* windowProxyManager) {
+    return new ScriptController(frame, windowProxyManager);
   }
 
   DECLARE_TRACE();
 
   // This returns an initialized window proxy. (If the window proxy is not
   // yet initialized, it's implicitly initialized at the first access.)
-  LocalWindowProxy* windowProxy(DOMWrapperWorld&);
+  LocalWindowProxy* windowProxy(DOMWrapperWorld& world) {
+    return m_windowProxyManager->windowProxy(world);
+  }
 
   // Evaluate JavaScript in the main world.
   void executeScriptInMainWorld(
       const String&,
       ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled);
   void executeScriptInMainWorld(const ScriptSourceCode&,
                                 AccessControlStatus = NotSharableCrossOrigin);
   v8::Local<v8::Value> executeScriptInMainWorldAndReturnValue(
       const ScriptSourceCode&,
       ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled);
@@ skipping 35 matching lines @@
   void updateSecurityOrigin(SecurityOrigin*);
 
   void clearForClose();
 
   // Registers a v8 extension to be available on webpages. Will only
   // affect v8 contexts initialized after this call. Takes ownership of
   // the v8::Extension object passed.
   static void registerExtensionIfNeeded(v8::Extension*);
   static V8Extensions& registeredExtensions();
 
+ private:
+  ScriptController(LocalFrame* frame,
+                   LocalWindowProxyManager* windowProxyManager)
+      : m_frame(frame), m_windowProxyManager(windowProxyManager) {}
+
+  LocalFrame* frame() const { return m_frame; }
   v8::Isolate* isolate() const { return m_windowProxyManager->isolate(); }
 
-  LocalWindowProxyManager* getWindowProxyManager() const {
-    return m_windowProxyManager.get();
-  }
-
- private:
-  explicit ScriptController(LocalFrame*);
-
-  LocalFrame* frame() const { return m_windowProxyManager->frame(); }
-
   v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&,
                                                  AccessControlStatus,
                                                  ExecuteScriptPolicy);
 
-  Member<LocalWindowProxyManager> m_windowProxyManager;
+  const Member<LocalFrame> m_frame;
+  const Member<LocalWindowProxyManager> m_windowProxyManager;
 };
 
 }  // namespace blink
 
 #endif  // ScriptController_h