Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1180)

Unified Diff: Source/core/html/imports/HTMLImportsController.h

Issue 301803002: Extract tree root responsibility out of HTMLImportsController. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compile. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/imports/HTMLImportTreeRoot.cpp ('k') | Source/core/html/imports/HTMLImportsController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/imports/HTMLImportsController.h
diff --git a/Source/core/html/imports/HTMLImportsController.h b/Source/core/html/imports/HTMLImportsController.h
index 5988a9e3d860c0525e99f9390f625d1b865bc837..2886001e002130f7d319d13e23da9a35b727d038 100644
--- a/Source/core/html/imports/HTMLImportsController.h
+++ b/Source/core/html/imports/HTMLImportsController.h
@@ -48,8 +48,9 @@ class ResourceFetcher;
class HTMLImportChild;
class HTMLImportChildClient;
class HTMLImportLoader;
+class HTMLImportTreeRoot;
-class HTMLImportsController FINAL : public NoBaseWillBeGarbageCollectedFinalized<HTMLImportsController>, public HTMLImport, public DocumentSupplement {
+class HTMLImportsController FINAL : public NoBaseWillBeGarbageCollectedFinalized<HTMLImportsController>, public DocumentSupplement {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLImportsController);
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public:
@@ -58,16 +59,12 @@ public:
explicit HTMLImportsController(Document&);
virtual ~HTMLImportsController();
+ HTMLImportTreeRoot* root() const { return m_root.get(); }
+
bool isMaster(const Document& document) const { return m_master == &document; }
bool shouldBlockScriptExecution(const Document&) const;
void wasDetachedFrom(const Document&);
- // HTMLImport
- virtual Document* document() const OVERRIDE;
- virtual bool isDone() const OVERRIDE;
- virtual void stateWillChange() OVERRIDE;
- virtual void stateDidChange() OVERRIDE;
-
HTMLImportChild* load(HTMLImport* parent, HTMLImportChildClient*, FetchRequest);
void showSecurityErrorMessage(const String&);
@@ -76,7 +73,6 @@ public:
LocalFrame* frame() const;
Document* master() const { return m_master; }
- void recalcTimerFired(Timer<HTMLImportsController>*);
HTMLImportLoader* createLoader();
@@ -84,7 +80,6 @@ public:
HTMLImportLoader* loaderAt(size_t i) const { return m_loaders[i].get(); }
HTMLImportLoader* loaderFor(const Document&) const;
- void scheduleRecalcState();
HTMLImportChild* findLinkFor(const KURL&) const;
private:
@@ -92,7 +87,8 @@ private:
void clear();
Document* m_master;
- Timer<HTMLImportsController> m_recalcTimer;
+
+ OwnPtr<HTMLImportTreeRoot> m_root;
// List of import which has been loaded or being loaded.
typedef Vector<OwnPtr<HTMLImportChild> > ImportList;
@@ -102,8 +98,6 @@ private:
LoaderList m_loaders;
};
-DEFINE_TYPE_CASTS(HTMLImportsController, HTMLImport, import, import->isRoot(), import.isRoot());
-
} // namespace WebCore
#endif // HTMLImportsController_h
« no previous file with comments | « Source/core/html/imports/HTMLImportTreeRoot.cpp ('k') | Source/core/html/imports/HTMLImportsController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698