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

Side by Side Diff: Source/core/html/HTMLScriptElement.cpp

Issue 288033006: Revert a series of wrong fixes for crbug.com/361011 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLScriptElement.h ('k') | Source/core/svg/SVGScriptElement.h » ('j') | 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 { 83 {
84 HTMLElement::insertedInto(insertionPoint); 84 HTMLElement::insertedInto(insertionPoint);
85 return InsertionShouldCallDidNotifySubtreeInsertions; 85 return InsertionShouldCallDidNotifySubtreeInsertions;
86 } 86 }
87 87
88 void HTMLScriptElement::didNotifySubtreeInsertionsToDocument() 88 void HTMLScriptElement::didNotifySubtreeInsertionsToDocument()
89 { 89 {
90 m_loader->didNotifySubtreeInsertionsToDocument(); 90 m_loader->didNotifySubtreeInsertionsToDocument();
91 } 91 }
92 92
93 void HTMLScriptElement::didMoveToNewDocument(Document& oldDocument)
94 {
95 HTMLElement::didMoveToNewDocument(oldDocument);
96 m_loader->cancel(&oldDocument);
97 }
98
99 void HTMLScriptElement::setText(const String &value) 93 void HTMLScriptElement::setText(const String &value)
100 { 94 {
101 RefPtr<Node> protectFromMutationEvents(this); 95 RefPtr<Node> protectFromMutationEvents(this);
102 96
103 if (hasOneTextChild()) { 97 if (hasOneTextChild()) {
104 toText(firstChild())->setData(value); 98 toText(firstChild())->setData(value);
105 return; 99 return;
106 } 100 }
107 101
108 removeChildren(); 102 removeChildren();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 ASSERT(!m_loader->haveFiredLoadEvent()); 169 ASSERT(!m_loader->haveFiredLoadEvent());
176 dispatchEvent(Event::create(EventTypeNames::load)); 170 dispatchEvent(Event::create(EventTypeNames::load));
177 } 171 }
178 172
179 PassRefPtrWillBeRawPtr<Element> HTMLScriptElement::cloneElementWithoutAttributes AndChildren() 173 PassRefPtrWillBeRawPtr<Element> HTMLScriptElement::cloneElementWithoutAttributes AndChildren()
180 { 174 {
181 return adoptRefWillBeRefCountedGarbageCollected(new HTMLScriptElement(docume nt(), false, m_loader->alreadyStarted())); 175 return adoptRefWillBeRefCountedGarbageCollected(new HTMLScriptElement(docume nt(), false, m_loader->alreadyStarted()));
182 } 176 }
183 177
184 } 178 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLScriptElement.h ('k') | Source/core/svg/SVGScriptElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698