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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 110183005: DevTools: added console warning when call to document.write() from async script is ignored (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed tests Created 6 years, 12 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 | « LayoutTests/inspector/resources/external-script-with-document-write.js ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 2539 matching lines...) Expand 10 before | Expand all | Expand 10 after
2550 { 2550 {
2551 NestingLevelIncrementer nestingLevelIncrementer(m_writeRecursionDepth); 2551 NestingLevelIncrementer nestingLevelIncrementer(m_writeRecursionDepth);
2552 2552
2553 m_writeRecursionIsTooDeep = (m_writeRecursionDepth > 1) && m_writeRecursionI sTooDeep; 2553 m_writeRecursionIsTooDeep = (m_writeRecursionDepth > 1) && m_writeRecursionI sTooDeep;
2554 m_writeRecursionIsTooDeep = (m_writeRecursionDepth > cMaxWriteRecursionDepth ) || m_writeRecursionIsTooDeep; 2554 m_writeRecursionIsTooDeep = (m_writeRecursionDepth > cMaxWriteRecursionDepth ) || m_writeRecursionIsTooDeep;
2555 2555
2556 if (m_writeRecursionIsTooDeep) 2556 if (m_writeRecursionIsTooDeep)
2557 return; 2557 return;
2558 2558
2559 bool hasInsertionPoint = m_parser && m_parser->hasInsertionPoint(); 2559 bool hasInsertionPoint = m_parser && m_parser->hasInsertionPoint();
2560 if (!hasInsertionPoint && m_ignoreDestructiveWriteCount) 2560
2561 if (!hasInsertionPoint && m_ignoreDestructiveWriteCount) {
2562 addConsoleMessage(JSMessageSource, WarningMessageLevel, ExceptionMessage s::failedToExecute("write", "Document", "It isn't possible to write into a docum ent from an asynchronously-loaded external script unless it is explicitly opened ."));
2561 return; 2563 return;
2564 }
2562 2565
2563 if (!hasInsertionPoint) 2566 if (!hasInsertionPoint)
2564 open(ownerDocument); 2567 open(ownerDocument);
2565 2568
2566 ASSERT(m_parser); 2569 ASSERT(m_parser);
2567 m_parser->insert(text); 2570 m_parser->insert(text);
2568 } 2571 }
2569 2572
2570 void Document::write(const String& text, Document* ownerDocument) 2573 void Document::write(const String& text, Document* ownerDocument)
2571 { 2574 {
(...skipping 2686 matching lines...) Expand 10 before | Expand all | Expand 10 after
5258 } 5261 }
5259 5262
5260 FastTextAutosizer* Document::fastTextAutosizer() 5263 FastTextAutosizer* Document::fastTextAutosizer()
5261 { 5264 {
5262 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d()) 5265 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d())
5263 m_fastTextAutosizer = FastTextAutosizer::create(this); 5266 m_fastTextAutosizer = FastTextAutosizer::create(this);
5264 return m_fastTextAutosizer.get(); 5267 return m_fastTextAutosizer.get();
5265 } 5268 }
5266 5269
5267 } // namespace WebCore 5270 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/inspector/resources/external-script-with-document-write.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698