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

Side by Side Diff: Source/core/html/imports/HTMLImportChild.h

Issue 302433016: Remove virtualized isRoot/isChild from HTMLImport. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/imports/HTMLImport.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 HTMLLinkElement* link() const; 58 HTMLLinkElement* link() const;
59 Document* importedDocument() const; 59 Document* importedDocument() const;
60 const KURL& url() const { return m_url; } 60 const KURL& url() const { return m_url; }
61 61
62 void didShareLoader(); 62 void didShareLoader();
63 void didStartLoading(); 63 void didStartLoading();
64 void importDestroyed(); 64 void importDestroyed();
65 WeakPtr<HTMLImportChild> weakPtr() { return m_weakFactory.createWeakPtr(); } 65 WeakPtr<HTMLImportChild> weakPtr() { return m_weakFactory.createWeakPtr(); }
66 66
67 // HTMLImport 67 // HTMLImport
68 virtual bool isChild() const OVERRIDE { return true; }
69 virtual Document* document() const OVERRIDE; 68 virtual Document* document() const OVERRIDE;
70 virtual bool isDone() const OVERRIDE; 69 virtual bool isDone() const OVERRIDE;
71 virtual HTMLImportLoader* loader() const OVERRIDE { return m_loader; } 70 virtual HTMLImportLoader* loader() const OVERRIDE { return m_loader; }
72 virtual void stateWillChange() OVERRIDE; 71 virtual void stateWillChange() OVERRIDE;
73 virtual void stateDidChange() OVERRIDE; 72 virtual void stateDidChange() OVERRIDE;
74 73
75 #if !defined(NDEBUG) 74 #if !defined(NDEBUG)
76 virtual void showThis() OVERRIDE; 75 virtual void showThis() OVERRIDE;
77 #endif 76 #endif
78 77
(...skipping 14 matching lines...) Expand all
93 92
94 KURL m_url; 93 KURL m_url;
95 WeakPtrFactory<HTMLImportChild> m_weakFactory; 94 WeakPtrFactory<HTMLImportChild> m_weakFactory;
96 WeakPtr<CustomElementMicrotaskImportStep> m_customElementMicrotaskStep; 95 WeakPtr<CustomElementMicrotaskImportStep> m_customElementMicrotaskStep;
97 HTMLImportLoader* m_loader; 96 HTMLImportLoader* m_loader;
98 HTMLImportChildClient* m_client; 97 HTMLImportChildClient* m_client;
99 }; 98 };
100 99
101 inline HTMLImportChild* toHTMLImportChild(HTMLImport* import) 100 inline HTMLImportChild* toHTMLImportChild(HTMLImport* import)
102 { 101 {
103 ASSERT(!import || import->isChild()); 102 ASSERT(!import || !import->isRoot());
104 return static_cast<HTMLImportChild*>(import); 103 return static_cast<HTMLImportChild*>(import);
105 } 104 }
106 105
107 } // namespace WebCore 106 } // namespace WebCore
108 107
109 #endif // HTMLImportChild_h 108 #endif // HTMLImportChild_h
OLDNEW
« no previous file with comments | « Source/core/html/imports/HTMLImport.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698