Skip to content

Commit 0e6abb8

Browse files
beidsonbeidson
committed
Switch over CachedResource::data() from taking a SharedBuffer to taking a ResourceBuffer.
https://bugs.webkit.org/show_bug.cgi?id=98952 Reviewed by Anders Carlsson. No new tests (No behavior change). * html/ImageDocument.cpp: (WebCore::ImageDocumentParser::appendBytes): (WebCore::ImageDocumentParser::finish): * loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::sendDataToResource): (WebCore::SubresourceLoader::didFinishLoading): * loader/cache/CachedCSSStyleSheet.cpp: (WebCore::CachedCSSStyleSheet::data): * loader/cache/CachedCSSStyleSheet.h: (WebCore): (CachedCSSStyleSheet): * loader/cache/CachedFont.cpp: (WebCore::CachedFont::data): * loader/cache/CachedFont.h: (WebCore): (CachedFont): * loader/cache/CachedImage.cpp: (WebCore::CachedImage::data): * loader/cache/CachedImage.h: (CachedImage): * loader/cache/CachedRawResource.cpp: (WebCore::CachedRawResource::data): * loader/cache/CachedRawResource.h: (CachedRawResource): * loader/cache/CachedResource.cpp: (WebCore::CachedResource::data): * loader/cache/CachedResource.h: (CachedResource): * loader/cache/CachedSVGDocument.cpp: (WebCore::CachedSVGDocument::data): * loader/cache/CachedSVGDocument.h: (CachedSVGDocument): * loader/cache/CachedScript.cpp: (WebCore::CachedScript::data): * loader/cache/CachedScript.h: (CachedScript): * loader/cache/CachedShader.cpp: (WebCore::CachedShader::data): * loader/cache/CachedShader.h: (CachedShader): * loader/cache/CachedTextTrack.cpp: (WebCore::CachedTextTrack::data): * loader/cache/CachedTextTrack.h: (CachedTextTrack): * loader/cache/CachedXSLStyleSheet.cpp: (WebCore::CachedXSLStyleSheet::data): * loader/cache/CachedXSLStyleSheet.h: (CachedXSLStyleSheet): Canonical link: https://commits.webkit.org/116955@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@130983 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent d49b95c commit 0e6abb8

23 files changed

Lines changed: 95 additions & 41 deletions

‎Source/WebCore/ChangeLog‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,61 @@
1+
2012-10-10 Brady Eidson <beidson@apple.com>
2+
3+
Switch over CachedResource::data() from taking a SharedBuffer to taking a ResourceBuffer.
4+
https://bugs.webkit.org/show_bug.cgi?id=98952
5+
6+
Reviewed by Anders Carlsson.
7+
8+
No new tests (No behavior change).
9+
10+
* html/ImageDocument.cpp:
11+
(WebCore::ImageDocumentParser::appendBytes):
12+
(WebCore::ImageDocumentParser::finish):
13+
* loader/SubresourceLoader.cpp:
14+
(WebCore::SubresourceLoader::sendDataToResource):
15+
(WebCore::SubresourceLoader::didFinishLoading):
16+
* loader/cache/CachedCSSStyleSheet.cpp:
17+
(WebCore::CachedCSSStyleSheet::data):
18+
* loader/cache/CachedCSSStyleSheet.h:
19+
(WebCore):
20+
(CachedCSSStyleSheet):
21+
* loader/cache/CachedFont.cpp:
22+
(WebCore::CachedFont::data):
23+
* loader/cache/CachedFont.h:
24+
(WebCore):
25+
(CachedFont):
26+
* loader/cache/CachedImage.cpp:
27+
(WebCore::CachedImage::data):
28+
* loader/cache/CachedImage.h:
29+
(CachedImage):
30+
* loader/cache/CachedRawResource.cpp:
31+
(WebCore::CachedRawResource::data):
32+
* loader/cache/CachedRawResource.h:
33+
(CachedRawResource):
34+
* loader/cache/CachedResource.cpp:
35+
(WebCore::CachedResource::data):
36+
* loader/cache/CachedResource.h:
37+
(CachedResource):
38+
* loader/cache/CachedSVGDocument.cpp:
39+
(WebCore::CachedSVGDocument::data):
40+
* loader/cache/CachedSVGDocument.h:
41+
(CachedSVGDocument):
42+
* loader/cache/CachedScript.cpp:
43+
(WebCore::CachedScript::data):
44+
* loader/cache/CachedScript.h:
45+
(CachedScript):
46+
* loader/cache/CachedShader.cpp:
47+
(WebCore::CachedShader::data):
48+
* loader/cache/CachedShader.h:
49+
(CachedShader):
50+
* loader/cache/CachedTextTrack.cpp:
51+
(WebCore::CachedTextTrack::data):
52+
* loader/cache/CachedTextTrack.h:
53+
(CachedTextTrack):
54+
* loader/cache/CachedXSLStyleSheet.cpp:
55+
(WebCore::CachedXSLStyleSheet::data):
56+
* loader/cache/CachedXSLStyleSheet.h:
57+
(CachedXSLStyleSheet):
58+
159
2012-10-10 Jon Lee <jonlee@apple.com>
260

361
[WK2] Activate plugins when user clicks on snapshot

‎Source/WebCore/html/ImageDocument.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include "NotImplemented.h"
4141
#include "Page.h"
4242
#include "RawDataDocumentParser.h"
43+
#include "ResourceBuffer.h"
4344
#include "Settings.h"
4445

4546
using std::min;
@@ -132,7 +133,7 @@ void ImageDocumentParser::appendBytes(DocumentWriter*, const char*, size_t)
132133
return;
133134

134135
CachedImage* cachedImage = document()->cachedImage();
135-
cachedImage->data(frame->loader()->documentLoader()->mainResourceData(), false);
136+
cachedImage->data(ResourceBuffer::adoptSharedBuffer(frame->loader()->documentLoader()->mainResourceData()), false);
136137

137138
document()->imageUpdated();
138139
}
@@ -148,7 +149,7 @@ void ImageDocumentParser::finish()
148149
if (document()->frame()->loader()->documentLoader()->isLoadingMultipartContent())
149150
data = data->copy();
150151

151-
cachedImage->data(data.release(), true);
152+
cachedImage->data(ResourceBuffer::adoptSharedBuffer(data.release()), true);
152153
cachedImage->finish();
153154

154155
cachedImage->setResponse(document()->frame()->loader()->documentLoader()->response());

‎Source/WebCore/loader/SubresourceLoader.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "FrameLoader.h"
3737
#include "Logging.h"
3838
#include "MemoryCache.h"
39+
#include "ResourceBuffer.h"
3940
#include "SecurityOrigin.h"
4041
#include "SecurityPolicy.h"
4142
#include "WebCoreMemoryInstrumentation.h"
@@ -270,9 +271,9 @@ void SubresourceLoader::sendDataToResource(const char* data, int length)
270271
// that all data has been received yet.
271272
if (m_loadingMultipartContent || !resourceData()) {
272273
RefPtr<SharedBuffer> copiedData = SharedBuffer::create(data, length);
273-
m_resource->data(copiedData.release(), m_loadingMultipartContent);
274+
m_resource->data(ResourceBuffer::adoptSharedBuffer(copiedData.release()), m_loadingMultipartContent);
274275
} else
275-
m_resource->data(resourceData(), false);
276+
m_resource->data(ResourceBuffer::adoptSharedBuffer(resourceData()), false);
276277
}
277278

278279
void SubresourceLoader::didReceiveCachedMetadata(const char* data, int length)
@@ -295,7 +296,7 @@ void SubresourceLoader::didFinishLoading(double finishTime)
295296
CachedResourceHandle<CachedResource> protectResource(m_resource);
296297
m_state = Finishing;
297298
m_resource->setLoadFinishTime(finishTime);
298-
m_resource->data(resourceData(), true);
299+
m_resource->data(ResourceBuffer::adoptSharedBuffer(resourceData()), true);
299300
m_resource->finish();
300301
ResourceLoader::didFinishLoading(finishTime);
301302
}

‎Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ const String CachedCSSStyleSheet::sheetText(bool enforceMIMEType, bool* hasValid
9494
return sheetText;
9595
}
9696

97-
void CachedCSSStyleSheet::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
97+
void CachedCSSStyleSheet::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
9898
{
9999
if (!allDataReceived)
100100
return;
101101

102-
m_data = ResourceBuffer::adoptSharedBuffer(data);
102+
m_data = data;
103103
setEncodedSize(m_data.get() ? m_data->size() : 0);
104104
// Decode the data to find out the encoding and keep the sheet text around during checkNotify()
105105
if (m_data) {

‎Source/WebCore/loader/cache/CachedCSSStyleSheet.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
namespace WebCore {
3333

3434
class CachedResourceClient;
35-
class SharedBuffer;
3635
class StyleSheetContents;
3736
class TextResourceDecoder;
3837
struct CSSParserContext;
@@ -48,7 +47,7 @@ namespace WebCore {
4847

4948
virtual void setEncoding(const String&);
5049
virtual String encoding() const;
51-
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
50+
virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
5251
virtual void destroyDecodedData() OVERRIDE;
5352

5453
PassRefPtr<StyleSheetContents> restoreParsedStyleSheet(const CSSParserContext&);

‎Source/WebCore/loader/cache/CachedFont.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ void CachedFont::didAddClient(CachedResourceClient* c)
8484
static_cast<CachedFontClient*>(c)->fontLoaded(this);
8585
}
8686

87-
void CachedFont::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
87+
void CachedFont::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
8888
{
8989
if (!allDataReceived)
9090
return;
9191

92-
m_data = ResourceBuffer::adoptSharedBuffer(data);
92+
m_data = data;
9393
setEncodedSize(m_data.get() ? m_data->size() : 0);
9494
setLoading(false);
9595
checkNotify();

‎Source/WebCore/loader/cache/CachedFont.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ class CachedResourceLoader;
3939
class FontPlatformData;
4040
class SVGDocument;
4141
class SVGFontElement;
42-
class SharedBuffer;
43-
struct FontCustomPlatformData;
44-
4542
struct FontCustomPlatformData;
4643

4744
class CachedFont : public CachedResource {
@@ -52,7 +49,7 @@ class CachedFont : public CachedResource {
5249
virtual void load(CachedResourceLoader*, const ResourceLoaderOptions&);
5350

5451
virtual void didAddClient(CachedResourceClient*);
55-
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
52+
virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
5653

5754
virtual void allClientsRemoved();
5855
void beginLoadIfNeeded(CachedResourceLoader* dl);

‎Source/WebCore/loader/cache/CachedImage.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,9 @@ size_t CachedImage::maximumDecodedImageSize()
343343
return settings ? settings->maximumDecodedImageSize() : 0;
344344
}
345345

346-
void CachedImage::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
346+
void CachedImage::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
347347
{
348-
m_data = ResourceBuffer::adoptSharedBuffer(data);
348+
m_data = data;
349349

350350
createImage();
351351

‎Source/WebCore/loader/cache/CachedImage.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class CachedImage : public CachedResource, public ImageObserver {
7272
virtual void allClientsRemoved();
7373
virtual void destroyDecodedData();
7474

75-
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
75+
virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
7676
virtual void error(CachedResource::Status);
7777
virtual void setResponse(const ResourceResponse&);
7878

‎Source/WebCore/loader/cache/CachedRawResource.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CachedRawResource::CachedRawResource(ResourceRequest& resourceRequest)
4242
{
4343
}
4444

45-
void CachedRawResource::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
45+
void CachedRawResource::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
4646
{
4747
CachedResourceHandle<CachedRawResource> protect(this);
4848
if (data) {
@@ -64,9 +64,9 @@ void CachedRawResource::data(PassRefPtr<SharedBuffer> data, bool allDataReceived
6464
if (m_options.shouldBufferData == BufferData) {
6565
if (data)
6666
setEncodedSize(data->size());
67-
m_data = ResourceBuffer::adoptSharedBuffer(data);
67+
m_data = data;
6868
}
69-
CachedResource::data(m_data ? m_data->sharedBuffer() : 0, allDataReceived);
69+
CachedResource::data(m_data, allDataReceived);
7070
}
7171

7272
void CachedRawResource::didAddClient(CachedResourceClient* c)

0 commit comments

Comments
 (0)