Make HTMLImportTreeNode own the whole import tree.

Make HTMLImportTreeNode own the whole import tree.

Since the lifetimes of HTMLImportTreeNode and all of its
descendants are inextricably linked, it makes sense for
all ownership responsibilities to be transfered from
HTMLImportsController to HTMLImportTreeNode.

No functional changes, refactoring.

R=morrita
BUG=

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

[dglazkov, 2014-05-28 18:08:02]

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

[Hajime Morrita, 2014-05-28 20:42:34]

lgtm.

https://codereview.chromium.org/305723004/diff/1/Source/core/html/imports/HTM...
File Source/core/html/imports/HTMLImportTreeRoot.h (right):

https://codereview.chromium.org/305723004/diff/1/Source/core/html/imports/HTM...
Source/core/html/imports/HTMLImportTreeRoot.h:30: HTMLImportChild*
keep(PassOwnPtr<HTMLImportChild>);
Let's just append() or add() instead of keep()-ing it. It seems to smart for me.

[dglazkov, 2014-05-28 23:41:17]

On 2014/05/28 20:42:34, morrita wrote:
> lgtm.
> 
>
https://codereview.chromium.org/305723004/diff/1/Source/core/html/imports/HTM...
> File Source/core/html/imports/HTMLImportTreeRoot.h (right):
> 
>
https://codereview.chromium.org/305723004/diff/1/Source/core/html/imports/HTM...
> Source/core/html/imports/HTMLImportTreeRoot.h:30: HTMLImportChild*
> keep(PassOwnPtr<HTMLImportChild>);
> Let's just append() or add() instead of keep()-ing it. It seems to smart for
me.

Ok. Let me land this, will fix afterwards.

[dglazkov, 2014-05-28 23:41:22]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-05-28 23:42:22]

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

[commit-bot: I haz the power, 2014-05-28 23:43:06]

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

[commit-bot: I haz the power, 2014-05-28 23:43:07]

Failed to apply patch for Source/core/html/imports/HTMLImport.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/html/imports/HTMLImport.h
  Hunk #1 FAILED at 56.
  Hunk #2 succeeded at 64 with fuzz 2 (offset -2 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
Source/core/html/imports/HTMLImport.h.rej

Patch:       Source/core/html/imports/HTMLImport.h
Index: Source/core/html/imports/HTMLImport.h
diff --git a/Source/core/html/imports/HTMLImport.h
b/Source/core/html/imports/HTMLImport.h
index
239b5ee289f79943d7ea03c841b74bb3ded49597..488940f8ff0e986a75059397eaa9552dadee485c
100644
--- a/Source/core/html/imports/HTMLImport.h
+++ b/Source/core/html/imports/HTMLImport.h
@@ -56,7 +56,7 @@ class KURL;
 // * The HTMLImportTreeRoot is owned HTMLImportsController, which is owned by
the master
 //   document as a DocumentSupplement.
 //
-// * The non-root nodes are HTMLImportChild. They are also owned by
HTMLImportsController.
+// * The non-root nodes are HTMLImportChild. They are all owned by
HTMLImporTreeRoot.
 //   LinkStyle is wired into HTMLImportChild by implementing
HTMLImportChildClient interface
 //
 // * Both HTMLImportTreeRoot and HTMLImportChild are derived from HTMLImport
superclass
@@ -66,6 +66,8 @@ class KURL;
 // HTMLImportsController also owns all loaders in the tree and manages their
lifetime through it.
 // One assumption is that the tree is append-only and nodes are never inserted
in the middle of the tree nor removed.
 //
+// Full diagram is here:
+//
https://docs.google.com/drawings/d/1jFQrO0IupWrlykTNzQ3Nv2SdiBiSz4UE9-V3-vDgBb0/
 //
 // # Import Sharing and HTMLImportLoader
 //

[commit-bot: I haz the power, 2014-05-28 23:43:35]

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

[commit-bot: I haz the power, 2014-05-28 23:43:36]

Failed to apply patch for Source/core/html/imports/HTMLImport.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/html/imports/HTMLImport.h
  Hunk #1 FAILED at 56.
  Hunk #2 succeeded at 64 with fuzz 2 (offset -2 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
Source/core/html/imports/HTMLImport.h.rej

Patch:       Source/core/html/imports/HTMLImport.h
Index: Source/core/html/imports/HTMLImport.h
diff --git a/Source/core/html/imports/HTMLImport.h
b/Source/core/html/imports/HTMLImport.h
index
239b5ee289f79943d7ea03c841b74bb3ded49597..488940f8ff0e986a75059397eaa9552dadee485c
100644
--- a/Source/core/html/imports/HTMLImport.h
+++ b/Source/core/html/imports/HTMLImport.h
@@ -56,7 +56,7 @@ class KURL;
 // * The HTMLImportTreeRoot is owned HTMLImportsController, which is owned by
the master
 //   document as a DocumentSupplement.
 //
-// * The non-root nodes are HTMLImportChild. They are also owned by
HTMLImportsController.
+// * The non-root nodes are HTMLImportChild. They are all owned by
HTMLImporTreeRoot.
 //   LinkStyle is wired into HTMLImportChild by implementing
HTMLImportChildClient interface
 //
 // * Both HTMLImportTreeRoot and HTMLImportChild are derived from HTMLImport
superclass
@@ -66,6 +66,8 @@ class KURL;
 // HTMLImportsController also owns all loaders in the tree and manages their
lifetime through it.
 // One assumption is that the tree is append-only and nodes are never inserted
in the middle of the tree nor removed.
 //
+// Full diagram is here:
+//
https://docs.google.com/drawings/d/1jFQrO0IupWrlykTNzQ3Nv2SdiBiSz4UE9-V3-vDgBb0/
 //
 // # Import Sharing and HTMLImportLoader
 //

[dglazkov, 2014-05-30 16:32:50]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-05-30 16:34:04]

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

[commit-bot: I haz the power, 2014-05-30 16:34:18]

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

[commit-bot: I haz the power, 2014-05-30 16:34:20]

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 #2 FAILED at 71.
  1 out of 5 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
43eacf5175b9af7d91705fbc5a0477631ff94eef..ac6af0957dd54886b5af036d084b310d57ba2417
100644
--- a/Source/core/html/imports/HTMLImportsController.cpp
+++ b/Source/core/html/imports/HTMLImportsController.cpp
@@ -62,9 +62,7 @@ HTMLImportsController::~HTMLImportsController()
 
 void HTMLImportsController::clear()
 {
-    for (size_t i = 0; i < m_imports.size(); ++i)
-        m_imports[i]->importDestroyed();
-    m_imports.clear();
+    m_root = 0;
 
     for (size_t i = 0; i < m_loaders.size(); ++i)
         m_loaders[i]->importDestroyed();
@@ -73,8 +71,6 @@ void HTMLImportsController::clear()
     if (m_master)
         m_master->setImportsController(0);
     m_master = 0;
-
-    m_root = 0;
 }
 
 static bool makesCycle(HTMLImport* parent, const KURL& url)
@@ -94,8 +90,7 @@ HTMLImportChild* HTMLImportsController::createChild(const
KURL& url, HTMLImportL
     child->setClient(client);
     parent->appendImport(child.get());
     loader->addImport(child.get());
-    m_imports.append(child.release());
-    return m_imports.last().get();
+    return root()->keep(child.release());
 }
 
 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent,
HTMLImportChildClient* client, FetchRequest request)
@@ -103,7 +98,7 @@ HTMLImportChild* HTMLImportsController::load(HTMLImport*
parent, HTMLImportChild
     ASSERT(!request.url().isEmpty() && request.url().isValid());
     ASSERT(parent == root() ||
toHTMLImportChild(parent)->loader()->isFirstImport(toHTMLImportChild(parent)));
 
-    if (HTMLImportChild* childToShareWith = findLinkFor(request.url())) {
+    if (HTMLImportChild* childToShareWith = root()->find(request.url())) {
         HTMLImportLoader* loader = childToShareWith->loader();
         ASSERT(loader);
         HTMLImportChild* child = createChild(request.url(), loader, parent,
client);
@@ -134,17 +129,6 @@ void HTMLImportsController::showSecurityErrorMessage(const
String& message)
     m_master->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
 }
 
-HTMLImportChild* HTMLImportsController::findLinkFor(const KURL& url) const
-{
-    for (size_t i = 0; i < m_imports.size(); ++i) {
-        HTMLImportChild* candidate = m_imports[i].get();
-        if (equalIgnoringFragmentIdentifier(candidate->url(), url) &&
candidate->loader())
-            return candidate;
-    }
-
-    return 0;
-}
-
 SecurityOrigin* HTMLImportsController::securityOrigin() const
 {
     return m_master->securityOrigin();

[dglazkov, 2014-05-30 16:50:41]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-05-30 16:52:10]

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

[commit-bot: I haz the power, 2014-05-30 18:24:33]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  blink_presubmit on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/blink_presubmit/builds/6533)
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)
  linux_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/1...)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)

[commit-bot: I haz the power, 2014-05-30 19:08:56]

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

[commit-bot: I haz the power, 2014-05-30 19:08:56]

Try jobs failed on following builders:
  blink_presubmit on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/blink_presubmit/builds/6543)

[dglazkov, 2014-05-30 19:09:55]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-05-30 19:10:49]

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

[commit-bot: I haz the power, 2014-05-30 19:48:37]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  blink_presubmit on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/blink_presubmit/builds/6553)
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)

[commit-bot: I haz the power, 2014-05-30 22:44:17]

Change committed as 175162