Diff
Modified: trunk/Source/WebCore/ChangeLog (171742 => 171743)
--- trunk/Source/WebCore/ChangeLog 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/ChangeLog 2014-07-29 14:35:13 UTC (rev 171743)
@@ -1,3 +1,40 @@
+2014-07-28 Pratik Solanki <psola...@apple.com>
+
+ Get SharedBuffer.h out of ResourceBuffer.h (and a few other places)
+ https://bugs.webkit.org/show_bug.cgi?id=131782
+
+ Original patch by Tim Horton.
+ Reviewed by Darin Adler.
+
+ No new tests because no functional changes.
+
+ * Modules/indexeddb/IDBCallbacks.h:
+ * Modules/indexeddb/IDBCursorBackend.h:
+ * loader/ios/DiskImageCacheIOS.h:
+ Forward declare SharedBuffer in headers.
+
+ * Modules/indexeddb/IDBRequest.cpp:
+ * loader/cache/CachedImage.cpp:
+ * loader/icon/IconLoader.cpp:
+ * loader/ios/DiskImageCacheIOS.mm:
+ * loader/cache/MemoryCache.cpp:
+ * loader/mac/ResourceBuffer.mm:
+ Include SharedBuffer.h in implementation files.
+
+ * Modules/notifications/Notification.h:
+ * loader/appcache/ApplicationCacheGroup.h:
+ Remove unnecessary includes.
+
+ * loader/ResourceBuffer.cpp:
+ (WebCore::ResourceBuffer::adoptSharedBuffer):
+ * loader/ResourceBuffer.h:
+ Out-of-line adoptSharedBuffer so that the PassRefPtr doesn't require including SharedBuffer.h.
+
+ * platform/graphics/opentype/OpenTypeMathData.cpp:
+ * platform/graphics/opentype/OpenTypeMathData.h:
+ Out-of-line destructor to avoid requiring SharedBuffer.h for the RefPtr.
+ Forward-declare SharedBuffer in the header, include in implementation.
+
2014-07-29 Zan Dobersek <zdober...@igalia.com>
[TexMap] GraphicsLayerTextureMapper::addAnimation() box size parameter should be FloatSize
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h (171742 => 171743)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -32,7 +32,6 @@
#include "IDBDatabaseError.h"
#include "IDBKey.h"
#include "IDBKeyPath.h"
-#include "SharedBuffer.h"
#include <wtf/RefCounted.h>
#if ENABLE(INDEXED_DATABASE)
@@ -41,6 +40,7 @@
class DOMStringList;
class IDBCursorBackend;
class IDBDatabaseBackend;
+class SharedBuffer;
struct IDBDatabaseMetadata;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h (171742 => 171743)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -31,12 +31,12 @@
#include "IDBDatabaseBackend.h"
#include "IDBTransactionBackend.h"
-#include "SharedBuffer.h"
#include <wtf/RefPtr.h>
namespace WebCore {
class IDBKeyRange;
+class SharedBuffer;
class IDBCursorBackend : public RefCounted<IDBCursorBackend> {
public:
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (171742 => 171743)
--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -44,6 +44,7 @@
#include "IDBTransaction.h"
#include "Logging.h"
#include "ScriptExecutionContext.h"
+#include "SharedBuffer.h"
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/notifications/Notification.h (171742 => 171743)
--- trunk/Source/WebCore/Modules/notifications/Notification.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/Modules/notifications/Notification.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -37,7 +37,6 @@
#include "EventTarget.h"
#include "URL.h"
#include "NotificationClient.h"
-#include "SharedBuffer.h"
#include "TextDirection.h"
#include "ThreadableLoaderClient.h"
#include <wtf/PassRefPtr.h>
Modified: trunk/Source/WebCore/loader/ResourceBuffer.cpp (171742 => 171743)
--- trunk/Source/WebCore/loader/ResourceBuffer.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/ResourceBuffer.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -27,6 +27,7 @@
#include "ResourceBuffer.h"
#include "PurgeableBuffer.h"
+#include "SharedBuffer.h"
namespace WebCore {
@@ -50,6 +51,11 @@
{
}
+PassRefPtr<ResourceBuffer> ResourceBuffer::adoptSharedBuffer(PassRefPtr<SharedBuffer> shared)
+{
+ return shared ? adoptRef(new ResourceBuffer(shared)) : nullptr;
+}
+
const char* ResourceBuffer::data() const
{
return m_sharedBuffer->data();
Modified: trunk/Source/WebCore/loader/ResourceBuffer.h (171742 => 171743)
--- trunk/Source/WebCore/loader/ResourceBuffer.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/ResourceBuffer.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -26,11 +26,11 @@
#ifndef ResourceBuffer_h
#define ResourceBuffer_h
-#include "SharedBuffer.h"
-
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
+#include <wtf/RetainPtr.h>
#if USE(FOUNDATION)
OBJC_CLASS NSData;
@@ -46,7 +46,7 @@
static PassRefPtr<ResourceBuffer> create() { return adoptRef(new ResourceBuffer); }
static PassRefPtr<ResourceBuffer> create(const char* data, unsigned size) { return adoptRef(new ResourceBuffer(data, size)); }
- static PassRefPtr<ResourceBuffer> adoptSharedBuffer(PassRefPtr<SharedBuffer> shared) { return shared ? adoptRef(new ResourceBuffer(shared)) : 0; }
+ static PassRefPtr<ResourceBuffer> adoptSharedBuffer(PassRefPtr<SharedBuffer>);
virtual ~ResourceBuffer();
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h (171742 => 171743)
--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -29,7 +29,6 @@
#include "DOMApplicationCache.h"
#include "URL.h"
#include "ResourceHandleClient.h"
-#include "SharedBuffer.h"
#include <wtf/Noncopyable.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (171742 => 171743)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -41,6 +41,7 @@
#include "SVGImage.h"
#include "SecurityOrigin.h"
#include "Settings.h"
+#include "SharedBuffer.h"
#include "SubresourceLoader.h"
#include <wtf/CurrentTime.h>
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (171742 => 171743)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -38,6 +38,7 @@
#include "PublicSuffix.h"
#include "SecurityOrigin.h"
#include "SecurityOriginHash.h"
+#include "SharedBuffer.h"
#include "WorkerGlobalScope.h"
#include "WorkerLoaderProxy.h"
#include "WorkerThread.h"
Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (171742 => 171743)
--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -39,6 +39,7 @@
#include "Logging.h"
#include "ResourceBuffer.h"
#include "ResourceRequest.h"
+#include "SharedBuffer.h"
#include <wtf/text/CString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.h (171742 => 171743)
--- trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -30,7 +30,6 @@
#include "DiskImageCacheClientIOS.h"
#include "FileSystem.h"
-#include "SharedBuffer.h"
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
#include <wtf/RefCounted.h>
@@ -42,6 +41,8 @@
namespace WebCore {
+class SharedBuffer;
+
// Global disk image cache object.
class DiskImageCache {
WTF_MAKE_NONCOPYABLE(DiskImageCache);
Modified: trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.mm (171742 => 171743)
--- trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.mm 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.mm 2014-07-29 14:35:13 UTC (rev 171743)
@@ -30,6 +30,7 @@
#include "FileSystemIOS.h"
#include "Logging.h"
+#include "SharedBuffer.h"
#include "WebCoreThread.h"
#include "WebCoreThreadRun.h"
#include <errno.h>
Modified: trunk/Source/WebCore/loader/mac/ResourceBuffer.mm (171742 => 171743)
--- trunk/Source/WebCore/loader/mac/ResourceBuffer.mm 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/loader/mac/ResourceBuffer.mm 2014-07-29 14:35:13 UTC (rev 171743)
@@ -26,6 +26,8 @@
#include "config.h"
#include "ResourceBuffer.h"
+#include "SharedBuffer.h"
+
namespace WebCore {
RetainPtr<NSData> ResourceBuffer::createNSData()
Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp (171742 => 171743)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -260,6 +260,10 @@
}
#if ENABLE(OPENTYPE_MATH)
+OpenTypeMathData::~OpenTypeMathData()
+{
+}
+
float OpenTypeMathData::getMathConstant(const SimpleFontData* font, MathConstant constant) const
{
int32_t value = 0;
Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h (171742 => 171743)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -27,15 +27,15 @@
#define OpenTypeMathData_h
#include "Glyph.h"
-#include "SharedBuffer.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
namespace WebCore {
+class FontPlatformData;
+class SharedBuffer;
class SimpleFontData;
-class FontPlatformData;
class OpenTypeMathData : public RefCounted<OpenTypeMathData> {
public:
@@ -43,6 +43,7 @@
{
return adoptRef(new OpenTypeMathData(fontData));
}
+ ~OpenTypeMathData();
bool hasMathData() const { return m_mathBuffer; }
Modified: trunk/Source/WebKit2/ChangeLog (171742 => 171743)
--- trunk/Source/WebKit2/ChangeLog 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-29 14:35:13 UTC (rev 171743)
@@ -1,3 +1,18 @@
+2014-07-28 Pratik Solanki <psola...@apple.com>
+
+ Get SharedBuffer.h out of ResourceBuffer.h (and a few other places)
+ https://bugs.webkit.org/show_bug.cgi?id=131782
+
+ Original patch by Tim Horton.
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ Include SharedBuffer.h in implementation files.
+
+ * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
+ Un-indent namespace and remove SharedBuffer forward-declaration.
+
2014-07-29 Adrian Perez de Castro <ape...@igalia.com>
[GTK] Remove WebKitWebViewGroup from WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (171742 => 171743)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -48,6 +48,7 @@
#include <WebCore/NotImplemented.h>
#include <WebCore/ResourceBuffer.h>
#include <WebCore/ResourceHandle.h>
+#include <WebCore/SharedBuffer.h>
#include <wtf/MainThread.h>
using namespace WebCore;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h (171742 => 171743)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h 2014-07-29 14:35:13 UTC (rev 171743)
@@ -40,10 +40,9 @@
}
namespace WebCore {
- class CSSStyleDeclaration;
- class Node;
- class Range;
- class SharedBuffer;
+class CSSStyleDeclaration;
+class Node;
+class Range;
}
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (171742 => 171743)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2014-07-29 14:35:13 UTC (rev 171743)
@@ -37,6 +37,7 @@
#include <WebCore/MemoryCache.h>
#include <WebCore/ResourceBuffer.h>
#include <WebCore/SessionID.h>
+#include <WebCore/SharedBuffer.h>
#if ENABLE(NETWORK_PROCESS)