Changeset 196442 in webkit
- Timestamp:
- Feb 11, 2016 2:34:36 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r196439 r196442 1 2016-02-11 Jer Noble <jer.noble@apple.com> 2 3 Make MediaResourceLoader behave more like a CachedResourceLoader. 4 https://bugs.webkit.org/show_bug.cgi?id=154117 5 6 Reviewed by Alex Christensen. 7 8 MediaResourceLoader currently can only handle a single request at a time. Split the class 9 into two, MediaResourceLoader and MediaResource, effectively wrapping CachedResourceLoader 10 and CachedRawResource respectively. With this devision, the same loader can be used to issue 11 multiple simultaneous resource requests. 12 13 This necessecitates splitting PlatformMediaResource into two classes as well. To simplify 14 the HTMLMediaElement, MediaPlayer, and MediaPlayerClient APIs, do not require a client 15 object when creating the loader; instead, the client is required to create the resource. 16 This also matches the CachedRawResource API. 17 18 * html/HTMLMediaElement.cpp: 19 (WebCore::HTMLMediaElement::mediaPlayerCreateResourceLoader): Remove the client parameter. 20 * html/HTMLMediaElement.h: 21 * loader/MediaResourceLoader.cpp: 22 (WebCore::MediaResourceLoader::MediaResourceLoader): 23 (WebCore::MediaResourceLoader::~MediaResourceLoader): 24 (WebCore::MediaResourceLoader::requestResource): Renamed from start(). 25 (WebCore::MediaResourceLoader::removeResource): Remove resource from live resource list. 26 (WebCore::MediaResource::create): Utility factory. 27 (WebCore::MediaResource::MediaResource): 28 (WebCore::MediaResource::~MediaResource): 29 (WebCore::MediaResource::stop): Moved from MediaResourceLoader. 30 (WebCore::MediaResource::setDefersLoading): Ditto. 31 (WebCore::MediaResource::responseReceived): Ditto. 32 (WebCore::MediaResource::redirectReceived): Ditto. 33 (WebCore::MediaResource::dataSent): Ditto. 34 (WebCore::MediaResource::dataReceived): Ditto. 35 (WebCore::MediaResource::notifyFinished): Ditto. 36 (WebCore::MediaResource::getOrCreateReadBuffer): Ditto. 37 * loader/MediaResourceLoader.h: 38 * platform/graphics/MediaPlayer.cpp: 39 (WebCore::MediaPlayer::createResourceLoader): 40 * platform/graphics/MediaPlayer.h: 41 (WebCore::MediaPlayerClient::mediaPlayerCreateResourceLoader): 42 * platform/graphics/PlatformMediaResourceLoader.h: 43 (WebCore::PlatformMediaResourceClient::~PlatformMediaResourceClient): Renamed from PlatformMediaResourceLoaderClient. 44 (WebCore::PlatformMediaResourceClient::responseReceived): Client methods now take a reference to the resource. 45 (WebCore::PlatformMediaResourceClient::redirectReceived): Ditto. 46 (WebCore::PlatformMediaResourceClient::dataSent): Ditto. 47 (WebCore::PlatformMediaResourceClient::dataReceived): Ditto. 48 (WebCore::PlatformMediaResourceClient::accessControlCheckFailed): Ditto. 49 (WebCore::PlatformMediaResourceClient::loadFailed): Ditto. 50 (WebCore::PlatformMediaResourceClient::loadFinished): Ditto. 51 (WebCore::PlatformMediaResourceClient::getOrCreateReadBuffer): Ditto. 52 (WebCore::PlatformMediaResourceLoader::PlatformMediaResourceLoader): Ditto. 53 (WebCore::PlatformMediaResource::PlatformMediaResource): 54 (WebCore::PlatformMediaResource::~PlatformMediaResource): 55 (WebCore::PlatformMediaResource::setClient): 56 * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: 57 (webKitWebSrcStart): 58 (webKitWebSrcNeedData): 59 (webKitWebSrcEnoughData): 60 (CachedResourceStreamingClient::getOrCreateReadBuffer): 61 (CachedResourceStreamingClient::responseReceived): 62 (CachedResourceStreamingClient::dataReceived): 63 (CachedResourceStreamingClient::accessControlCheckFailed): 64 (CachedResourceStreamingClient::loadFailed): 65 (CachedResourceStreamingClient::loadFinished): 66 1 67 2016-02-11 Zalan Bujtas <zalan@apple.com> 2 68 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r196401 r196442 6093 6093 } 6094 6094 6095 RefPtr<PlatformMediaResourceLoader> HTMLMediaElement::mediaPlayerCreateResourceLoader( std::unique_ptr<PlatformMediaResourceLoaderClient> client)6096 { 6097 return adoptRef(*new MediaResourceLoader(document(), fastGetAttribute(HTMLNames::crossoriginAttr) , WTFMove(client)));6095 RefPtr<PlatformMediaResourceLoader> HTMLMediaElement::mediaPlayerCreateResourceLoader() 6096 { 6097 return adoptRef(*new MediaResourceLoader(document(), fastGetAttribute(HTMLNames::crossoriginAttr))); 6098 6098 } 6099 6099 -
trunk/Source/WebCore/html/HTMLMediaElement.h
r195953 r196442 596 596 virtual bool mediaPlayerIsLooping() const override; 597 597 virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() override; 598 virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader( std::unique_ptr<PlatformMediaResourceLoaderClient>) override;598 virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() override; 599 599 600 600 #if PLATFORM(WIN) && USE(AVFOUNDATION) -
trunk/Source/WebCore/loader/MediaResourceLoader.cpp
r195770 r196442 39 39 namespace WebCore { 40 40 41 MediaResourceLoader::MediaResourceLoader(Document& document, const String& crossOriginMode, std::unique_ptr<PlatformMediaResourceLoaderClient> client) 42 : PlatformMediaResourceLoader(WTFMove(client)) 43 , m_document(document) 41 MediaResourceLoader::MediaResourceLoader(Document& document, const String& crossOriginMode) 42 : m_document(document) 44 43 , m_crossOriginMode(crossOriginMode) 45 , m_didPassAccessControlCheck(false)46 44 { 47 45 } … … 49 47 MediaResourceLoader::~MediaResourceLoader() 50 48 { 51 stop();49 ASSERT(m_resources.isEmpty()); 52 50 } 53 51 54 bool MediaResourceLoader::start(const ResourceRequest& request, LoadOptions options)52 RefPtr<PlatformMediaResource> MediaResourceLoader::requestResource(const ResourceRequest& request, LoadOptions options) 55 53 { 56 if (m_resource)57 return false;58 59 54 DataBufferingPolicy bufferingPolicy = options & LoadOption::BufferData ? WebCore::BufferData : WebCore::DoNotBufferData; 60 55 RequestOriginPolicy corsPolicy = !m_crossOriginMode.isNull() ? PotentiallyCrossOriginEnabled : UseDefaultOriginRestrictionsForType; … … 67 62 updateRequestForAccessControl(cacheRequest.mutableResourceRequest(), m_document.securityOrigin(), allowCredentials); 68 63 69 m_didPassAccessControlCheck = false; 64 CachedResourceHandle<CachedRawResource> resource = m_document.cachedResourceLoader().requestRawResource(cacheRequest); 65 if (!resource) 66 return nullptr; 70 67 71 m_resource = m_document.cachedResourceLoader().requestRawResource(cacheRequest); 72 if (!m_resource) 73 return false; 68 Ref<MediaResource> mediaResource = MediaResource::create(*this, resource); 69 m_resources.add(mediaResource.ptr()); 74 70 75 m_resource->addClient(this); 76 return true; 71 return WTFMove(mediaResource); 77 72 } 78 73 79 void MediaResourceLoader::stop() 74 void MediaResourceLoader::removeResource(MediaResource& mediaResource) 75 { 76 ASSERT(m_resources.contains(&mediaResource)); 77 m_resources.remove(&mediaResource); 78 } 79 80 Ref<MediaResource> MediaResource::create(MediaResourceLoader& loader, CachedResourceHandle<CachedRawResource> resource) 81 { 82 return adoptRef(*new MediaResource(loader, resource)); 83 } 84 85 MediaResource::MediaResource(MediaResourceLoader& loader, CachedResourceHandle<CachedRawResource> resource) 86 : m_loader(loader) 87 , m_resource(resource) 88 { 89 ASSERT(resource); 90 resource->addClient(this); 91 } 92 93 MediaResource::~MediaResource() 94 { 95 stop(); 96 m_loader->removeResource(*this); 97 } 98 99 void MediaResource::stop() 80 100 { 81 101 if (!m_resource) … … 86 106 } 87 107 88 void MediaResource Loader::setDefersLoading(bool defersLoading)108 void MediaResource::setDefersLoading(bool defersLoading) 89 109 { 90 110 if (m_resource) … … 92 112 } 93 113 94 void MediaResource Loader::responseReceived(CachedResource* resource, const ResourceResponse& response)114 void MediaResource::responseReceived(CachedResource* resource, const ResourceResponse& response) 95 115 { 96 116 ASSERT_UNUSED(resource, resource == m_resource); 97 117 98 RefPtr<MediaResource Loader> protect(this);99 if (!m_ crossOriginMode.isNull() && !resource->passesSameOriginPolicyCheck(*m_document.securityOrigin())) {118 RefPtr<MediaResource> protect(this); 119 if (!m_loader->crossOriginMode().isNull() && !resource->passesSameOriginPolicyCheck(*m_loader->document().securityOrigin())) { 100 120 static NeverDestroyed<const String> consoleMessage("Cross-origin media resource load denied by Cross-Origin Resource Sharing policy."); 101 m_ document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get());121 m_loader->document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get()); 102 122 m_didPassAccessControlCheck = false; 103 m_client->accessControlCheckFailed(ResourceError(errorDomainWebKitInternal, 0, response.url(), consoleMessage.get())); 123 if (m_client) 124 m_client->accessControlCheckFailed(*this, ResourceError(errorDomainWebKitInternal, 0, response.url(), consoleMessage.get())); 104 125 stop(); 105 126 return; 106 127 } 107 128 108 m_didPassAccessControlCheck = !m_crossOriginMode.isNull(); 109 m_client->responseReceived(response); 129 m_didPassAccessControlCheck = !m_loader->crossOriginMode().isNull(); 130 if (m_client) 131 m_client->responseReceived(*this, response); 110 132 } 111 133 112 void MediaResource Loader::dataReceived(CachedResource* resource, const char* data, int dataLength)134 void MediaResource::redirectReceived(CachedResource* resource, ResourceRequest& request, const ResourceResponse& response) 113 135 { 114 136 ASSERT_UNUSED(resource, resource == m_resource); 115 137 116 RefPtr<MediaResourceLoader> protect(this); 117 m_client->dataReceived(data, dataLength); 138 RefPtr<MediaResource> protect(this); 139 if (m_client) 140 m_client->redirectReceived(*this, request, response); 118 141 } 119 142 120 void MediaResourceLoader::notifyFinished(CachedResource* resource) 143 void MediaResource::dataSent(CachedResource* resource, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) 144 { 145 ASSERT_UNUSED(resource, resource == m_resource); 146 147 RefPtr<MediaResource> protect(this); 148 if (m_client) 149 m_client->dataSent(*this, bytesSent, totalBytesToBeSent); 150 } 151 152 void MediaResource::dataReceived(CachedResource* resource, const char* data, int dataLength) 153 { 154 ASSERT_UNUSED(resource, resource == m_resource); 155 156 RefPtr<MediaResource> protect(this); 157 if (m_client) 158 m_client->dataReceived(*this, data, dataLength); 159 } 160 161 void MediaResource::notifyFinished(CachedResource* resource) 121 162 { 122 163 ASSERT(resource == m_resource); 123 164 124 RefPtr<MediaResourceLoader> protect(this); 125 if (resource->loadFailedOrCanceled()) 126 m_client->loadFailed(resource->resourceError()); 127 else 128 m_client->loadFinished(); 165 RefPtr<MediaResource> protect(this); 166 if (m_client) { 167 if (resource->loadFailedOrCanceled()) 168 m_client->loadFailed(*this, resource->resourceError()); 169 else 170 m_client->loadFinished(*this); 171 } 129 172 stop(); 130 173 } 131 174 132 175 #if USE(SOUP) 133 char* MediaResource Loader::getOrCreateReadBuffer(CachedResource* resource, size_t requestedSize, size_t& actualSize)176 char* MediaResource::getOrCreateReadBuffer(CachedResource* resource, size_t requestedSize, size_t& actualSize) 134 177 { 135 178 ASSERT_UNUSED(resource, resource == m_resource); 136 return m_client ->getOrCreateReadBuffer(requestedSize, actualSize);179 return m_client ? m_client->getOrCreateReadBuffer(*this, requestedSize, actualSize) : nullptr; 137 180 } 138 181 #endif -
trunk/Source/WebCore/loader/MediaResourceLoader.h
r175050 r196442 31 31 #include "CachedResourceHandle.h" 32 32 #include "PlatformMediaResourceLoader.h" 33 #include <wtf/HashSet.h> 34 #include <wtf/Ref.h> 33 35 #include <wtf/text/WTFString.h> 34 36 … … 37 39 class CachedRawResource; 38 40 class Document; 41 class MediaResource; 39 42 40 class MediaResourceLoader final : public PlatformMediaResourceLoader , CachedRawResourceClient{43 class MediaResourceLoader final : public PlatformMediaResourceLoader { 41 44 public: 42 MediaResourceLoader(Document&, const String& crossOriginMode, std::unique_ptr<PlatformMediaResourceLoaderClient>);43 virtual ~MediaResourceLoader();45 WEBCORE_EXPORT MediaResourceLoader(Document&, const String& crossOriginMode); 46 WEBCORE_EXPORT virtual ~MediaResourceLoader(); 44 47 45 virtual bool start(const ResourceRequest&, LoadOptions) override; 46 virtual void stop() override; 47 virtual void setDefersLoading(bool) override; 48 virtual bool didPassAccessControlCheck() const override { return m_didPassAccessControlCheck; } 48 RefPtr<PlatformMediaResource> requestResource(const ResourceRequest&, LoadOptions) override; 49 void removeResource(MediaResource&); 49 50 50 // CachedResourceClient 51 virtual void responseReceived(CachedResource*, const ResourceResponse&) override; 52 virtual void dataReceived(CachedResource*, const char*, int) override; 53 virtual void notifyFinished(CachedResource*) override; 54 #if USE(SOUP) 55 virtual char* getOrCreateReadBuffer(CachedResource*, size_t /*requestedSize*/, size_t& /*actualSize*/) override; 56 #endif 51 Document& document() { return m_document; } 52 const String& crossOriginMode() const { return m_crossOriginMode; } 57 53 58 54 private: 59 55 Document& m_document; 60 56 String m_crossOriginMode; 61 bool m_didPassAccessControlCheck; 57 HashSet<MediaResource*> m_resources; 58 }; 59 60 class MediaResource : public PlatformMediaResource, CachedRawResourceClient { 61 public: 62 static Ref<MediaResource> create(MediaResourceLoader&, CachedResourceHandle<CachedRawResource>); 63 virtual ~MediaResource(); 64 65 // PlatformMediaResource 66 void stop() override; 67 void setDefersLoading(bool) override; 68 bool didPassAccessControlCheck() const override { return m_didPassAccessControlCheck; } 69 70 // CachedResourceClient 71 void responseReceived(CachedResource*, const ResourceResponse&) override; 72 void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) override; 73 void dataSent(CachedResource*, unsigned long long, unsigned long long) override; 74 void dataReceived(CachedResource*, const char*, int) override; 75 void notifyFinished(CachedResource*) override; 76 #if USE(SOUP) 77 char* getOrCreateReadBuffer(CachedResource*, size_t /*requestedSize*/, size_t& /*actualSize*/) override; 78 #endif 79 80 private: 81 MediaResource(MediaResourceLoader&, CachedResourceHandle<CachedRawResource>); 82 Ref<MediaResourceLoader> m_loader; 83 bool m_didPassAccessControlCheck { false }; 62 84 CachedResourceHandle<CachedRawResource> m_resource; 63 85 }; -
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
r196117 r196442 1238 1238 } 1239 1239 1240 PassRefPtr<PlatformMediaResourceLoader> MediaPlayer::createResourceLoader( std::unique_ptr<PlatformMediaResourceLoaderClient> client)1241 { 1242 return m_client.mediaPlayerCreateResourceLoader( WTFMove(client));1240 PassRefPtr<PlatformMediaResourceLoader> MediaPlayer::createResourceLoader() 1241 { 1242 return m_client.mediaPlayerCreateResourceLoader(); 1243 1243 } 1244 1244 -
trunk/Source/WebCore/platform/graphics/MediaPlayer.h
r195951 r196442 239 239 virtual bool mediaPlayerIsLooping() const { return false; } 240 240 virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() { return 0; } 241 virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader( std::unique_ptr<PlatformMediaResourceLoaderClient>) { return nullptr; }241 virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() { return nullptr; } 242 242 virtual bool doesHaveAttribute(const AtomicString&, AtomicString* = 0) const { return false; } 243 243 … … 547 547 548 548 CachedResourceLoader* cachedResourceLoader(); 549 PassRefPtr<PlatformMediaResourceLoader> createResourceLoader( std::unique_ptr<PlatformMediaResourceLoaderClient>);549 PassRefPtr<PlatformMediaResourceLoader> createResourceLoader(); 550 550 551 551 #if ENABLE(VIDEO_TRACK) -
trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h
r194496 r196442 34 34 namespace WebCore { 35 35 36 class PlatformMediaResource; 36 37 class ResourceError; 37 38 class ResourceRequest; 38 39 class ResourceResponse; 39 40 40 class PlatformMediaResource LoaderClient {41 class PlatformMediaResourceClient { 41 42 public: 42 virtual ~PlatformMediaResource LoaderClient() { }43 virtual ~PlatformMediaResourceClient() { } 43 44 44 virtual void responseReceived(const ResourceResponse&) { } 45 virtual void dataReceived(const char*, int) { } 46 virtual void accessControlCheckFailed(const ResourceError&) { } 47 virtual void loadFailed(const ResourceError&) { } 48 virtual void loadFinished() { } 45 virtual void responseReceived(PlatformMediaResource&, const ResourceResponse&) { } 46 virtual void redirectReceived(PlatformMediaResource&, ResourceRequest&, const ResourceResponse&) { } 47 virtual void dataSent(PlatformMediaResource&, unsigned long long, unsigned long long) { } 48 virtual void dataReceived(PlatformMediaResource&, const char*, int) { } 49 virtual void accessControlCheckFailed(PlatformMediaResource&, const ResourceError&) { } 50 virtual void loadFailed(PlatformMediaResource&, const ResourceError&) { } 51 virtual void loadFinished(PlatformMediaResource&) { } 49 52 #if USE(SOUP) 50 virtual char* getOrCreateReadBuffer( size_t /*requestedSize*/, size_t& /*actualSize*/) { return nullptr; };53 virtual char* getOrCreateReadBuffer(PlatformMediaResource&, size_t /*requestedSize*/, size_t& /*actualSize*/) { return nullptr; }; 51 54 #endif 52 55 }; … … 62 65 virtual ~PlatformMediaResourceLoader() { } 63 66 64 virtual bool start(const ResourceRequest&, LoadOptions) = 0; 67 virtual RefPtr<PlatformMediaResource> requestResource(const ResourceRequest&, LoadOptions) = 0; 68 69 protected: 70 PlatformMediaResourceLoader() { } 71 }; 72 73 class PlatformMediaResource : public RefCounted<PlatformMediaResource> { 74 WTF_MAKE_NONCOPYABLE(PlatformMediaResource); WTF_MAKE_FAST_ALLOCATED; 75 public: 76 PlatformMediaResource() { } 77 virtual ~PlatformMediaResource() { } 65 78 virtual void stop() { } 66 79 virtual void setDefersLoading(bool) { } 67 80 virtual bool didPassAccessControlCheck() const { return false; } 68 81 82 void setClient(std::unique_ptr<PlatformMediaResourceClient>&& client) { m_client = WTFMove(client); } 83 69 84 protected: 70 explicit PlatformMediaResourceLoader(std::unique_ptr<PlatformMediaResourceLoaderClient> client) 71 : m_client(WTFMove(client)) 72 { 73 } 74 75 std::unique_ptr<PlatformMediaResourceLoaderClient> m_client; 85 std::unique_ptr<PlatformMediaResourceClient> m_client; 76 86 }; 77 87 -
trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
r192102 r196442 63 63 }; 64 64 65 class CachedResourceStreamingClient final : public PlatformMediaResource LoaderClient, public StreamingClient {65 class CachedResourceStreamingClient final : public PlatformMediaResourceClient, public StreamingClient { 66 66 WTF_MAKE_NONCOPYABLE(CachedResourceStreamingClient); 67 67 public: … … 70 70 71 71 private: 72 // PlatformMediaResource LoaderClient virtual methods.72 // PlatformMediaResourceClient virtual methods. 73 73 #if USE(SOUP) 74 virtual char* getOrCreateReadBuffer( size_t requestedSize, size_t& actualSize) override;74 virtual char* getOrCreateReadBuffer(PlatformMediaResource&, size_t requestedSize, size_t& actualSize) override; 75 75 #endif 76 virtual void responseReceived( const ResourceResponse&) override;77 virtual void dataReceived( const char*, int) override;78 virtual void accessControlCheckFailed( const ResourceError&) override;79 virtual void loadFailed( const ResourceError&) override;80 virtual void loadFinished( ) override;76 virtual void responseReceived(PlatformMediaResource&, const ResourceResponse&) override; 77 virtual void dataReceived(PlatformMediaResource&, const char*, int) override; 78 virtual void accessControlCheckFailed(PlatformMediaResource&, const ResourceError&) override; 79 virtual void loadFailed(PlatformMediaResource&, const ResourceError&) override; 80 virtual void loadFinished(PlatformMediaResource&) override; 81 81 }; 82 82 … … 127 127 128 128 RefPtr<PlatformMediaResourceLoader> loader; 129 RefPtr<PlatformMediaResource> resource; 129 130 ResourceHandleStreamingClient* client; 130 131 … … 578 579 bool loadFailed = true; 579 580 if (priv->player && !priv->loader) 580 priv->loader = priv->player->createResourceLoader( std::make_unique<CachedResourceStreamingClient>(src));581 priv->loader = priv->player->createResourceLoader(); 581 582 582 583 if (priv->loader) { … … 584 585 if (request.url().protocolIs("blob")) 585 586 loadOptions |= PlatformMediaResourceLoader::LoadOption::BufferData; 586 loadFailed = !priv->loader->start(request, loadOptions); 587 priv->resource = priv->loader->requestResource(request, loadOptions); 588 loadFailed = !priv->resource; 589 590 if (priv->resource) 591 priv->resource->setClient(std::make_unique<CachedResourceStreamingClient>(src)); 587 592 } else { 588 593 priv->client = new ResourceHandleStreamingClient(src, request); … … 597 602 } 598 603 priv->loader = nullptr; 604 priv->resource = nullptr; 599 605 locker.unlock(); 600 606 webKitWebSrcStop(src); … … 784 790 if (priv->client) 785 791 priv->client->setDefersLoading(false); 786 if (priv-> loader)787 priv-> loader->setDefersLoading(false);792 if (priv->resource) 793 priv->resource->setDefersLoading(false); 788 794 } 789 795 … … 803 809 if (priv->client) 804 810 priv->client->setDefersLoading(true); 805 if (priv-> loader)806 priv-> loader->setDefersLoading(true);811 if (priv->resource) 812 priv->resource->setDefersLoading(true); 807 813 } 808 814 … … 1003 1009 1004 1010 #if USE(SOUP) 1005 char* CachedResourceStreamingClient::getOrCreateReadBuffer( size_t requestedSize, size_t& actualSize)1011 char* CachedResourceStreamingClient::getOrCreateReadBuffer(PlatformMediaResource&, size_t requestedSize, size_t& actualSize) 1006 1012 { 1007 1013 return createReadBuffer(requestedSize, actualSize); … … 1009 1015 #endif 1010 1016 1011 void CachedResourceStreamingClient::responseReceived( const ResourceResponse& response)1017 void CachedResourceStreamingClient::responseReceived(PlatformMediaResource&, const ResourceResponse& response) 1012 1018 { 1013 1019 WebKitWebSrcPrivate* priv = WEBKIT_WEB_SRC(m_src)->priv; 1014 priv->didPassAccessControlCheck = priv-> loader->didPassAccessControlCheck();1020 priv->didPassAccessControlCheck = priv->resource->didPassAccessControlCheck(); 1015 1021 handleResponseReceived(response); 1016 1022 } 1017 1023 1018 void CachedResourceStreamingClient::dataReceived( const char* data, int length)1024 void CachedResourceStreamingClient::dataReceived(PlatformMediaResource&, const char* data, int length) 1019 1025 { 1020 1026 handleDataReceived(data, length); 1021 1027 } 1022 1028 1023 void CachedResourceStreamingClient::accessControlCheckFailed( const ResourceError& error)1029 void CachedResourceStreamingClient::accessControlCheckFailed(PlatformMediaResource&, const ResourceError& error) 1024 1030 { 1025 1031 WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src); … … 1029 1035 } 1030 1036 1031 void CachedResourceStreamingClient::loadFailed( const ResourceError& error)1037 void CachedResourceStreamingClient::loadFailed(PlatformMediaResource&, const ResourceError& error) 1032 1038 { 1033 1039 WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src); … … 1041 1047 } 1042 1048 1043 void CachedResourceStreamingClient::loadFinished( )1049 void CachedResourceStreamingClient::loadFinished(PlatformMediaResource&) 1044 1050 { 1045 1051 handleNotifyFinished();
Note: See TracChangeset
for help on using the changeset viewer.