Diff
Modified: trunk/Source/WebCore/ChangeLog (130982 => 130983)
--- trunk/Source/WebCore/ChangeLog 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/ChangeLog 2012-10-11 00:26:39 UTC (rev 130983)
@@ -1,3 +1,61 @@
+2012-10-10 Brady Eidson <beid...@apple.com>
+
+ 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):
+
2012-10-10 Jon Lee <jon...@apple.com>
[WK2] Activate plugins when user clicks on snapshot
Modified: trunk/Source/WebCore/html/ImageDocument.cpp (130982 => 130983)
--- trunk/Source/WebCore/html/ImageDocument.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/html/ImageDocument.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -40,6 +40,7 @@
#include "NotImplemented.h"
#include "Page.h"
#include "RawDataDocumentParser.h"
+#include "ResourceBuffer.h"
#include "Settings.h"
using std::min;
@@ -132,7 +133,7 @@
return;
CachedImage* cachedImage = document()->cachedImage();
- cachedImage->data(frame->loader()->documentLoader()->mainResourceData(), false);
+ cachedImage->data(ResourceBuffer::adoptSharedBuffer(frame->loader()->documentLoader()->mainResourceData()), false);
document()->imageUpdated();
}
@@ -148,7 +149,7 @@
if (document()->frame()->loader()->documentLoader()->isLoadingMultipartContent())
data = ""
- cachedImage->data(data.release(), true);
+ cachedImage->data(ResourceBuffer::adoptSharedBuffer(data.release()), true);
cachedImage->finish();
cachedImage->setResponse(document()->frame()->loader()->documentLoader()->response());
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -36,6 +36,7 @@
#include "FrameLoader.h"
#include "Logging.h"
#include "MemoryCache.h"
+#include "ResourceBuffer.h"
#include "SecurityOrigin.h"
#include "SecurityPolicy.h"
#include "WebCoreMemoryInstrumentation.h"
@@ -270,9 +271,9 @@
// that all data has been received yet.
if (m_loadingMultipartContent || !resourceData()) {
RefPtr<SharedBuffer> copiedData = SharedBuffer::create(data, length);
- m_resource->data(copiedData.release(), m_loadingMultipartContent);
+ m_resource->data(ResourceBuffer::adoptSharedBuffer(copiedData.release()), m_loadingMultipartContent);
} else
- m_resource->data(resourceData(), false);
+ m_resource->data(ResourceBuffer::adoptSharedBuffer(resourceData()), false);
}
void SubresourceLoader::didReceiveCachedMetadata(const char* data, int length)
@@ -295,7 +296,7 @@
CachedResourceHandle<CachedResource> protectResource(m_resource);
m_state = Finishing;
m_resource->setLoadFinishTime(finishTime);
- m_resource->data(resourceData(), true);
+ m_resource->data(ResourceBuffer::adoptSharedBuffer(resourceData()), true);
m_resource->finish();
ResourceLoader::didFinishLoading(finishTime);
}
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -94,12 +94,12 @@
return sheetText;
}
-void CachedCSSStyleSheet::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedCSSStyleSheet::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
if (!allDataReceived)
return;
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
setEncodedSize(m_data.get() ? m_data->size() : 0);
// Decode the data to find out the encoding and keep the sheet text around during checkNotify()
if (m_data) {
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -32,7 +32,6 @@
namespace WebCore {
class CachedResourceClient;
- class SharedBuffer;
class StyleSheetContents;
class TextResourceDecoder;
struct CSSParserContext;
@@ -48,7 +47,7 @@
virtual void setEncoding(const String&);
virtual String encoding() const;
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual void destroyDecodedData() OVERRIDE;
PassRefPtr<StyleSheetContents> restoreParsedStyleSheet(const CSSParserContext&);
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -84,12 +84,12 @@
static_cast<CachedFontClient*>(c)->fontLoaded(this);
}
-void CachedFont::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedFont::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
if (!allDataReceived)
return;
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
setEncodedSize(m_data.get() ? m_data->size() : 0);
setLoading(false);
checkNotify();
Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedFont.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -39,11 +39,8 @@
class FontPlatformData;
class SVGDocument;
class SVGFontElement;
-class SharedBuffer;
struct FontCustomPlatformData;
-struct FontCustomPlatformData;
-
class CachedFont : public CachedResource {
public:
CachedFont(const ResourceRequest&);
@@ -52,7 +49,7 @@
virtual void load(CachedResourceLoader*, const ResourceLoaderOptions&);
virtual void didAddClient(CachedResourceClient*);
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual void allClientsRemoved();
void beginLoadIfNeeded(CachedResourceLoader* dl);
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -343,9 +343,9 @@
return settings ? settings->maximumDecodedImageSize() : 0;
}
-void CachedImage::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedImage::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
createImage();
Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedImage.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -72,7 +72,7 @@
virtual void allClientsRemoved();
virtual void destroyDecodedData();
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual void error(CachedResource::Status);
virtual void setResponse(const ResourceResponse&);
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -42,7 +42,7 @@
{
}
-void CachedRawResource::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedRawResource::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
CachedResourceHandle<CachedRawResource> protect(this);
if (data) {
@@ -64,9 +64,9 @@
if (m_options.shouldBufferData == BufferData) {
if (data)
setEncodedSize(data->size());
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
}
- CachedResource::data(m_data ? m_data->sharedBuffer() : 0, allDataReceived);
+ CachedResource::data(m_data, allDataReceived);
}
void CachedRawResource::didAddClient(CachedResourceClient* c)
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -48,7 +48,7 @@
private:
virtual void didAddClient(CachedResourceClient*);
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual bool shouldIgnoreHTTPStatusCodeErrors() const { return true; }
virtual void allClientsRemoved();
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -249,7 +249,7 @@
c->notifyFinished(this);
}
-void CachedResource::data(PassRefPtr<SharedBuffer>, bool allDataReceived)
+void CachedResource::data(PassRefPtr<ResourceBuffer>, bool allDataReceived)
{
if (!allDataReceived)
return;
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -100,7 +100,7 @@
virtual void setEncoding(const String&) { }
virtual String encoding() const { return String(); }
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual void error(CachedResource::Status);
virtual bool shouldIgnoreHTTPStatusCodeErrors() const { return false; }
Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -27,7 +27,7 @@
#include "CachedResourceClient.h"
#include "CachedResourceHandle.h"
-#include "SharedBuffer.h"
+#include "ResourceBuffer.h"
#include <wtf/text/StringBuilder.h>
namespace WebCore {
@@ -53,7 +53,7 @@
return m_decoder->encoding().name();
}
-void CachedSVGDocument::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedSVGDocument::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
if (!allDataReceived)
return;
Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocument.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -41,7 +41,7 @@
virtual void setEncoding(const String&);
virtual String encoding() const;
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -79,12 +79,12 @@
return m_script;
}
-void CachedScript::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedScript::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
if (!allDataReceived)
return;
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
setEncodedSize(m_data.get() ? m_data->size() : 0);
setLoading(false);
checkNotify();
Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedScript.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -48,7 +48,7 @@
virtual void setEncoding(const String&);
virtual String encoding() const;
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual void destroyDecodedData();
#if USE(JSC)
Modified: trunk/Source/WebCore/loader/cache/CachedShader.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedShader.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedShader.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -61,10 +61,10 @@
return m_shaderString;
}
-void CachedShader::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedShader::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
if (allDataReceived)
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
CachedResource::data(data, allDataReceived);
}
Modified: trunk/Source/WebCore/loader/cache/CachedShader.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedShader.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedShader.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -44,7 +44,7 @@
virtual ~CachedShader();
const String& shaderString();
- void data(PassRefPtr<SharedBuffer>, bool allDataReceived);
+ void data(PassRefPtr<ResourceBuffer>, bool allDataReceived);
virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -48,9 +48,9 @@
{
}
-void CachedTextTrack::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedTextTrack::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
setEncodedSize(m_data.get() ? m_data->size() : 0);
CachedResourceClientWalker<CachedResourceClient> walker(m_clients);
Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -33,14 +33,12 @@
namespace WebCore {
-class SharedBuffer;
-
class CachedTextTrack : public CachedResource {
public:
CachedTextTrack(const ResourceRequest&);
virtual ~CachedTextTrack();
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
};
}
Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2012-10-11 00:26:39 UTC (rev 130983)
@@ -64,12 +64,12 @@
return m_decoder->encoding().name();
}
-void CachedXSLStyleSheet::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+void CachedXSLStyleSheet::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
{
if (!allDataReceived)
return;
- m_data = ResourceBuffer::adoptSharedBuffer(data);
+ m_data = data;
setEncodedSize(m_data.get() ? m_data->size() : 0);
if (m_data.get()) {
m_sheet = m_decoder->decode(m_data->data(), encodedSize());
Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h (130982 => 130983)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2012-10-11 00:25:47 UTC (rev 130982)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2012-10-11 00:26:39 UTC (rev 130983)
@@ -45,7 +45,7 @@
virtual void setEncoding(const String&);
virtual String encoding() const;
- virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
+ virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
