Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 namespace blink { | 32 namespace blink { |
| 33 | 33 |
| 34 class Element; | 34 class Element; |
| 35 class ScriptLoaderClient; | 35 class ScriptLoaderClient; |
| 36 class ScriptSourceCode; | 36 class ScriptSourceCode; |
| 37 class LocalFrame; | 37 class LocalFrame; |
| 38 | 38 |
| 39 class CORE_EXPORT ScriptLoader : public NoBaseWillBeGarbageCollectedFinalized<Sc riptLoader>, public ScriptResourceClient { | 39 class CORE_EXPORT ScriptLoader : public NoBaseWillBeGarbageCollectedFinalized<Sc riptLoader>, public ScriptResourceClient { |
| 40 USING_FAST_MALLOC_WILL_BE_REMOVED(ScriptLoader); | 40 USING_FAST_MALLOC_WILL_BE_REMOVED(ScriptLoader); |
| 41 public: | 41 public: |
| 42 static PassOwnPtrWillBeRawPtr<ScriptLoader> create(Element* element, bool cr eatedByParser, bool isEvaluated) | 42 static PassOwnPtrWillBeRawPtr<ScriptLoader> create(Element* element, bool cr eatedByParser, bool isEvaluated, bool createdDuringDocumentWrite = false) |
| 43 { | 43 { |
| 44 return adoptPtrWillBeNoop(new ScriptLoader(element, createdByParser, isE valuated)); | 44 return adoptPtrWillBeNoop(new ScriptLoader(element, createdByParser, isE valuated, createdDuringDocumentWrite)); |
| 45 } | 45 } |
| 46 | 46 |
| 47 ~ScriptLoader() override; | 47 ~ScriptLoader() override; |
| 48 DECLARE_VIRTUAL_TRACE(); | 48 DECLARE_VIRTUAL_TRACE(); |
| 49 | 49 |
| 50 Element* element() const { return m_element; } | 50 Element* element() const { return m_element; } |
| 51 | 51 |
| 52 enum LegacyTypeSupport { DisallowLegacyTypeInTypeAttribute, AllowLegacyTypeI nTypeAttribute }; | 52 enum LegacyTypeSupport { DisallowLegacyTypeInTypeAttribute, AllowLegacyTypeI nTypeAttribute }; |
| 53 bool prepareScript(const TextPosition& scriptStartPosition = TextPosition::m inimumPosition(), LegacyTypeSupport = DisallowLegacyTypeInTypeAttribute); | 53 bool prepareScript(const TextPosition& scriptStartPosition = TextPosition::m inimumPosition(), LegacyTypeSupport = DisallowLegacyTypeInTypeAttribute); |
| 54 | 54 |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 79 void childrenChanged(); | 79 void childrenChanged(); |
| 80 void handleSourceAttribute(const String& sourceUrl); | 80 void handleSourceAttribute(const String& sourceUrl); |
| 81 void handleAsyncAttribute(); | 81 void handleAsyncAttribute(); |
| 82 | 82 |
| 83 virtual bool isReady() const { return m_pendingScript && m_pendingScript->is Ready(); } | 83 virtual bool isReady() const { return m_pendingScript && m_pendingScript->is Ready(); } |
| 84 bool errorOccurred() const { return m_pendingScript && m_pendingScript->erro rOccurred(); } | 84 bool errorOccurred() const { return m_pendingScript && m_pendingScript->erro rOccurred(); } |
| 85 | 85 |
| 86 // Clears the connection to the PendingScript (and Element and Resource). | 86 // Clears the connection to the PendingScript (and Element and Resource). |
| 87 void detach(); | 87 void detach(); |
| 88 | 88 |
| 89 bool createdDuringDocumentWrite() { return m_createdDuringDocumentWrite; } | |
|
kouhei (in TOK)
2016/03/18 02:24:26
Optional Nit: wasCreatedDuringDocumentWrite()? Bli
Charlie Harrison
2016/03/18 14:10:46
Done.
| |
| 90 | |
| 89 protected: | 91 protected: |
| 90 ScriptLoader(Element*, bool createdByParser, bool isEvaluated); | 92 ScriptLoader(Element*, bool createdByParser, bool isEvaluated, bool createdD uringDocumentWrite); |
| 91 | 93 |
| 92 private: | 94 private: |
| 93 bool ignoresLoadRequest() const; | 95 bool ignoresLoadRequest() const; |
| 94 bool isScriptForEventSupported() const; | 96 bool isScriptForEventSupported() const; |
| 95 void logScriptMimetype(ScriptResource*, LocalFrame*, String); | 97 void logScriptMimetype(ScriptResource*, LocalFrame*, String); |
| 96 | 98 |
| 97 bool fetchScript(const String& sourceUrl, FetchRequest::DeferOption); | 99 bool fetchScript(const String& sourceUrl, FetchRequest::DeferOption); |
| 98 | 100 |
| 99 ScriptLoaderClient* client() const; | 101 ScriptLoaderClient* client() const; |
| 100 | 102 |
| 101 // ResourceClient | 103 // ResourceClient |
| 102 void notifyFinished(Resource*) override; | 104 void notifyFinished(Resource*) override; |
| 103 String debugName() const override { return "ScriptLoader"; } | 105 String debugName() const override { return "ScriptLoader"; } |
| 104 | 106 |
| 105 RawPtrWillBeMember<Element> m_element; | 107 RawPtrWillBeMember<Element> m_element; |
| 106 RefPtrWillBeMember<ScriptResource> m_resource; | 108 RefPtrWillBeMember<ScriptResource> m_resource; |
| 107 WTF::OrdinalNumber m_startLineNumber; | 109 WTF::OrdinalNumber m_startLineNumber; |
| 108 String m_characterEncoding; | 110 String m_characterEncoding; |
| 109 String m_fallbackCharacterEncoding; | 111 String m_fallbackCharacterEncoding; |
| 110 | 112 |
| 111 bool m_parserInserted : 1; | 113 bool m_parserInserted : 1; |
| 112 bool m_isExternalScript : 1; | 114 bool m_isExternalScript : 1; |
| 113 bool m_alreadyStarted : 1; | 115 bool m_alreadyStarted : 1; |
| 114 bool m_haveFiredLoad : 1; | 116 bool m_haveFiredLoad : 1; |
| 115 bool m_willBeParserExecuted : 1; // Same as "The parser will handle executin g the script." | 117 bool m_willBeParserExecuted : 1; // Same as "The parser will handle executin g the script." |
| 116 bool m_readyToBeParserExecuted : 1; | 118 bool m_readyToBeParserExecuted : 1; |
| 117 bool m_willExecuteInOrder : 1; | 119 bool m_willExecuteInOrder : 1; |
| 118 bool m_willExecuteWhenDocumentFinishedParsing : 1; | 120 bool m_willExecuteWhenDocumentFinishedParsing : 1; |
| 119 bool m_forceAsync : 1; | 121 bool m_forceAsync : 1; |
| 122 const bool m_createdDuringDocumentWrite : 1; | |
| 120 | 123 |
| 121 OwnPtrWillBeMember<PendingScript> m_pendingScript; | 124 OwnPtrWillBeMember<PendingScript> m_pendingScript; |
| 122 }; | 125 }; |
| 123 | 126 |
| 124 ScriptLoader* toScriptLoaderIfPossible(Element*); | 127 ScriptLoader* toScriptLoaderIfPossible(Element*); |
| 125 | 128 |
| 126 } // namespace blink | 129 } // namespace blink |
| 127 | 130 |
| 128 #endif // ScriptLoader_h | 131 #endif // ScriptLoader_h |
| OLD | NEW |