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

Unified Diff: Source/core/page/DOMWindow.cpp

Issue 24773003: Rename Node::attached() to confusingAndOftenMisusedAttached() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/loader/ImageLoader.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/DOMWindow.cpp
diff --git a/Source/core/page/DOMWindow.cpp b/Source/core/page/DOMWindow.cpp
index 0dec954f0355468eb02f035a9bbac5c80804ec3b..68abf1db5d66dc78fda176558259fb69c34e8cd5 100644
--- a/Source/core/page/DOMWindow.cpp
+++ b/Source/core/page/DOMWindow.cpp
@@ -327,7 +327,7 @@ void DOMWindow::setDocument(PassRefPtr<Document> document)
{
ASSERT(!document || document->frame() == m_frame);
if (m_document) {
- if (m_document->attached()) {
+ if (m_document->confusingAndOftenMisusedAttached()) {
// FIXME: We don't call willRemove here. Why is that OK?
// This detach() call is also mostly redundant. Most of the calls to
// this function come via DocumentLoader::createWriterFor, which
@@ -345,7 +345,7 @@ void DOMWindow::setDocument(PassRefPtr<Document> document)
return;
m_document->setDOMWindow(this);
- if (!m_document->attached())
+ if (!m_document->confusingAndOftenMisusedAttached())
m_document->attach();
if (!m_frame)
@@ -394,7 +394,7 @@ DOMWindow::~DOMWindow()
removeAllEventListeners();
- ASSERT(!m_document->attached());
+ ASSERT(!m_document->confusingAndOftenMisusedAttached());
setDocument(0);
}
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698