HTMLImportsController does not need to hold Document ptr.

HTMLImportsController does not need to hold Document ptr.

Since it owns the HTMLImportTreeRoot, it can just ask it for the
master document. Additionally, remove indirection plumbing that's
just straightforward queries of master document.

No changes in behavior, refactoring.

R=morrita
BUG=

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=175214

[dglazkov, 2014-05-28 18:11:37]

Depends on https://codereview.chromium.org/305723004/.

[Hajime Morrita, 2014-05-28 20:32:16]

lgtm.

[dglazkov, 2014-05-31 02:44:53]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-05-31 02:45:47]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dglazkov@chromium.org/305743003/1

[commit-bot: I haz the power, 2014-05-31 02:46:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-31 02:46:06]

Failed to apply patch for Source/core/html/imports/HTMLImportsController.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/html/imports/HTMLImportsController.cpp
  Hunk #1 FAILED at 50.
  Hunk #2 succeeded at 108 (offset 2 lines).
  Hunk #3 succeeded at 128 (offset 2 lines).
  Hunk #4 succeeded at 147 (offset 2 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
Source/core/html/imports/HTMLImportsController.cpp.rej

Patch:       Source/core/html/imports/HTMLImportsController.cpp
Index: Source/core/html/imports/HTMLImportsController.cpp
diff --git a/Source/core/html/imports/HTMLImportsController.cpp
b/Source/core/html/imports/HTMLImportsController.cpp
index
ac6af0957dd54886b5af036d084b310d57ba2417..1a345c33548438f2bc891740f4051cb9e5d61576
100644
--- a/Source/core/html/imports/HTMLImportsController.cpp
+++ b/Source/core/html/imports/HTMLImportsController.cpp
@@ -50,27 +50,27 @@ void HTMLImportsController::provideTo(Document& master)
 }
 
 HTMLImportsController::HTMLImportsController(Document& master)
-    : m_master(&master)
-    , m_root(HTMLImportTreeRoot::create(&master))
+    : m_root(HTMLImportTreeRoot::create(&master))
 {
 }
 
 HTMLImportsController::~HTMLImportsController()
 {
-    ASSERT(!m_master);
+    ASSERT(!m_root);
 }
 
 void HTMLImportsController::clear()
 {
+    Document* master = root()->document();
     m_root = 0;
 
     for (size_t i = 0; i < m_loaders.size(); ++i)
         m_loaders[i]->importDestroyed();
     m_loaders.clear();
 
-    if (m_master)
-        m_master->setImportsController(0);
-    m_master = 0;
+    if (master)
+        master->setImportsController(0);
+    master = 0;
 }
 
 static bool makesCycle(HTMLImport* parent, const KURL& url)
@@ -106,9 +106,9 @@ HTMLImportChild* HTMLImportsController::load(HTMLImport*
parent, HTMLImportChild
         return child;
     }
 
-    bool sameOriginRequest = securityOrigin()->canRequest(request.url());
+    bool sameOriginRequest =
master()->securityOrigin()->canRequest(request.url());
     request.setCrossOriginAccessControl(
-        securityOrigin(), sameOriginRequest ? AllowStoredCredentials :
DoNotAllowStoredCredentials,
+        master()->securityOrigin(), sameOriginRequest ? AllowStoredCredentials
: DoNotAllowStoredCredentials,
         ClientDidNotRequestCredentials);
     ResourcePtr<RawResource> resource =
parent->document()->fetcher()->fetchImport(request);
     if (!resource)
@@ -126,22 +126,12 @@ HTMLImportChild* HTMLImportsController::load(HTMLImport*
parent, HTMLImportChild
 
 void HTMLImportsController::showSecurityErrorMessage(const String& message)
 {
-    m_master->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
+    master()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
 }
 
-SecurityOrigin* HTMLImportsController::securityOrigin() const
+Document* HTMLImportsController::master() const
 {
-    return m_master->securityOrigin();
-}
-
-ResourceFetcher* HTMLImportsController::fetcher() const
-{
-    return m_master->fetcher();
-}
-
-LocalFrame* HTMLImportsController::frame() const
-{
-    return m_master->frame();
+    return root()->document();
 }
 
 bool HTMLImportsController::shouldBlockScriptExecution(const Document&
document) const
@@ -155,7 +145,7 @@ bool HTMLImportsController::shouldBlockScriptExecution(const
Document& document)
 void HTMLImportsController::wasDetachedFrom(const Document& document)
 {
     ASSERT(document.importsController() == this);
-    if (m_master == &document)
+    if (master() == &document)
         clear();
 }

[dglazkov, 2014-06-01 03:43:51]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-06-01 03:43:58]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dglazkov@chromium.org/305743003/20001

[commit-bot: I haz the power, 2014-06-01 05:16:34]

Change committed as 175214