Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #include "core/fetch/ResourceOwner.h" | 31 #include "core/fetch/ResourceOwner.h" |
| 32 #include "core/fetch/ScriptResource.h" | 32 #include "core/fetch/ScriptResource.h" |
| 33 #include "platform/heap/Handle.h" | 33 #include "platform/heap/Handle.h" |
| 34 #include "wtf/PassRefPtr.h" | 34 #include "wtf/PassRefPtr.h" |
| 35 #include "wtf/RefPtr.h" | 35 #include "wtf/RefPtr.h" |
| 36 #include "wtf/text/TextPosition.h" | 36 #include "wtf/text/TextPosition.h" |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 class ScriptResource; | 40 class ScriptResource; |
| 41 class V8ScriptStreamer; | |
| 41 | 42 |
| 42 // A container for an external script which may be loaded and executed. | 43 // A container for an external script which may be loaded and executed. |
| 43 // | 44 // |
| 44 // A ResourcePtr alone does not prevent the underlying Resource | 45 // A ResourcePtr alone does not prevent the underlying Resource |
| 45 // from purging its data buffer. This class holds a dummy client open for its | 46 // from purging its data buffer. This class holds a dummy client open for its |
| 46 // lifetime in order to guarantee that the data buffer will not be purged. | 47 // lifetime in order to guarantee that the data buffer will not be purged. |
| 47 class PendingScript FINAL : public ResourceOwner<ScriptResource> { | 48 class PendingScript FINAL : public ResourceOwner<ScriptResource> { |
| 48 ALLOW_ONLY_INLINE_ALLOCATION(); | 49 ALLOW_ONLY_INLINE_ALLOCATION(); |
| 49 public: | 50 public: |
| 50 PendingScript() | 51 PendingScript() |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 72 ~PendingScript(); | 73 ~PendingScript(); |
| 73 | 74 |
| 74 PendingScript& operator=(const PendingScript& other) | 75 PendingScript& operator=(const PendingScript& other) |
| 75 { | 76 { |
| 76 if (this == &other) | 77 if (this == &other) |
| 77 return *this; | 78 return *this; |
| 78 | 79 |
| 79 m_watchingForLoad = other.m_watchingForLoad; | 80 m_watchingForLoad = other.m_watchingForLoad; |
| 80 m_element = other.m_element; | 81 m_element = other.m_element; |
| 81 m_startingPosition = other.m_startingPosition; | 82 m_startingPosition = other.m_startingPosition; |
| 82 this->ResourceOwner<ScriptResource, ResourceClient>::operator=(other); | 83 m_streamer = other.m_streamer; |
| 83 | 84 this->ResourceOwner<ScriptResource, ScriptResourceClient>::operator=(oth er); |
| 84 return *this; | 85 return *this; |
| 85 } | 86 } |
| 86 | 87 |
| 87 TextPosition startingPosition() const { return m_startingPosition; } | 88 TextPosition startingPosition() const { return m_startingPosition; } |
| 88 void setStartingPosition(const TextPosition& position) { m_startingPosition = position; } | 89 void setStartingPosition(const TextPosition& position) { m_startingPosition = position; } |
| 89 | 90 |
| 90 bool watchingForLoad() const { return m_watchingForLoad; } | 91 bool watchingForLoad() const { return m_watchingForLoad; } |
| 91 void setWatchingForLoad(bool b) { m_watchingForLoad = b; } | 92 void setWatchingForLoad(bool b) { m_watchingForLoad = b; } |
| 92 | 93 |
| 93 Element* element() const { return m_element.get(); } | 94 Element* element() const { return m_element.get(); } |
| 94 void setElement(Element* element) { m_element = element; } | 95 void setElement(Element* element) { m_element = element; } |
| 95 PassRefPtrWillBeRawPtr<Element> releaseElementAndClear(); | 96 PassRefPtrWillBeRawPtr<Element> releaseElementAndClear(); |
| 96 | 97 |
| 97 void setScriptResource(ScriptResource*); | 98 void setScriptResource(ScriptResource*); |
| 98 | 99 |
| 99 virtual void notifyFinished(Resource*); | 100 virtual void notifyFinished(Resource*); |
| 101 virtual void notifyAppendData(ScriptResource*); | |
| 100 | 102 |
| 101 void trace(Visitor*); | 103 void trace(Visitor*); |
| 102 | 104 |
| 105 void setStreamer(PassRefPtr<V8ScriptStreamer> streamer) | |
| 106 { | |
| 107 ASSERT(!m_streamer); | |
| 108 m_streamer = RefPtr<V8ScriptStreamer>(streamer); | |
|
haraken
2014/08/17 16:05:28
RefPtr<V8ScriptStreamer> wouldn't be needed.
marja
2014/08/20 11:45:56
Done.
| |
| 109 } | |
| 110 V8ScriptStreamer* streamer() { return m_streamer.get(); } | |
| 111 PassRefPtr<V8ScriptStreamer> releaseStreamer() { return m_streamer.release() ; } | |
|
haraken
2014/08/17 16:05:28
Is it possible that releaseStreamer() is called be
marja
2014/08/20 11:45:56
I removed releaseStreamer, since the ownership dan
| |
| 112 | |
| 113 bool isStreaming() const; | |
| 114 | |
| 103 private: | 115 private: |
| 104 bool m_watchingForLoad; | 116 bool m_watchingForLoad; |
| 105 RefPtrWillBeMember<Element> m_element; | 117 RefPtrWillBeMember<Element> m_element; |
| 106 TextPosition m_startingPosition; // Only used for inline script tags. | 118 TextPosition m_startingPosition; // Only used for inline script tags. |
| 119 | |
| 120 RefPtr<V8ScriptStreamer> m_streamer; | |
| 107 }; | 121 }; |
| 108 | 122 |
| 109 } | 123 } |
| 110 | 124 |
| 111 #endif | 125 #endif |
| OLD | NEW |