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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/dom/Document.cpp

Issue 12287016: Merge 142492 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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 | « LayoutTests/fast/parser/document-write-during-load-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/Document.cpp
===================================================================
--- Source/WebCore/dom/Document.cpp (revision 143055)
+++ Source/WebCore/dom/Document.cpp (working copy)
@@ -5771,15 +5771,12 @@
bool Document::hasActiveParser()
{
- return m_activeParserCount || (m_parser && m_parser->processingData());
+ return m_parser && m_parser->processingData();
}
void Document::decrementActiveParserCount()
{
--m_activeParserCount;
- if (!frame())
- return;
- frame()->loader()->checkLoadComplete();
}
void Document::setContextFeatures(PassRefPtr<ContextFeatures> features)
« no previous file with comments | « LayoutTests/fast/parser/document-write-during-load-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698