Diff
Modified: trunk/Source/WebCore/ChangeLog (139697 => 139698)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 01:40:54 UTC (rev 139697)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 01:58:07 UTC (rev 139698)
@@ -1,3 +1,26 @@
+2013-01-14 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move BlobRegistryProxy into WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=106831
+
+ Reviewed by Adam Barth.
+
+ Part of a larger refactoring series to remove layering violations
+ in Chromium. See tracking bug 106829.
+
+ * WebCore.gypi:
+ * platform/network/chromium/BlobRegistryProxy.cpp: Added.
+ (WebCore):
+ (WebCore::blobRegistry):
+ (WebCore::BlobRegistryProxy::BlobRegistryProxy):
+ (WebCore::BlobRegistryProxy::registerBlobURL):
+ (WebCore::BlobRegistryProxy::unregisterBlobURL):
+ * platform/network/chromium/BlobRegistryProxy.h: Added.
+ (WebCore):
+ (BlobRegistryProxy):
+ (WebCore::BlobRegistryProxy::loadResourceSynchronously):
+ (WebCore::BlobRegistryProxy::~BlobRegistryProxy):
+
2013-01-14 Levi Weintraub <[email protected]>
Rolling out r139618. Appears to be causing sporadic crashes on Debug bots.
Modified: trunk/Source/WebCore/WebCore.gypi (139697 => 139698)
--- trunk/Source/WebCore/WebCore.gypi 2013-01-15 01:40:54 UTC (rev 139697)
+++ trunk/Source/WebCore/WebCore.gypi 2013-01-15 01:58:07 UTC (rev 139698)
@@ -4424,6 +4424,8 @@
'platform/network/cf/SocketStreamHandleCFNet.cpp',
'platform/network/chromium/AuthenticationChallenge.h',
'platform/network/chromium/AuthenticationChallengeChromium.cpp',
+ 'platform/network/chromium/BlobRegistryProxy.cpp',
+ 'platform/network/chromium/BlobRegistryProxy.h',
'platform/network/chromium/CookieJarChromium.cpp',
'platform/network/chromium/DNSChromium.cpp',
'platform/network/chromium/ResourceError.h',
Copied: trunk/Source/WebCore/platform/network/chromium/BlobRegistryProxy.cpp (from rev 139697, trunk/Source/WebKit/chromium/src/BlobRegistryProxy.cpp) (0 => 139698)
--- trunk/Source/WebCore/platform/network/chromium/BlobRegistryProxy.cpp (rev 0)
+++ trunk/Source/WebCore/platform/network/chromium/BlobRegistryProxy.cpp 2013-01-15 01:58:07 UTC (rev 139698)
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(BLOB)
+
+#include "BlobRegistryProxy.h"
+
+#include "BlobData.h"
+#include "KURL.h"
+#include "ResourceHandle.h"
+#include <public/Platform.h>
+#include <public/WebBlobData.h>
+#include <public/WebBlobRegistry.h>
+#include <public/WebURL.h>
+#include <wtf/MainThread.h>
+#include <wtf/StdLibExtras.h>
+
+// We are part of the WebKit implementation.
+using namespace WebKit;
+
+namespace WebCore {
+
+BlobRegistry& blobRegistry()
+{
+ ASSERT(isMainThread());
+ DEFINE_STATIC_LOCAL(BlobRegistryProxy, instance, ());
+ return instance;
+}
+
+BlobRegistryProxy::BlobRegistryProxy()
+ : m_webBlobRegistry(WebKit::Platform::current()->blobRegistry())
+{
+}
+
+void BlobRegistryProxy::registerBlobURL(const KURL& url, PassOwnPtr<BlobData> blobData)
+{
+ if (m_webBlobRegistry) {
+ WebBlobData webBlobData(blobData);
+ m_webBlobRegistry->registerBlobURL(url, webBlobData);
+ }
+}
+
+void BlobRegistryProxy::registerBlobURL(const KURL& url, const KURL& srcURL)
+{
+ if (m_webBlobRegistry)
+ m_webBlobRegistry->registerBlobURL(url, srcURL);
+}
+
+void BlobRegistryProxy::unregisterBlobURL(const KURL& url)
+{
+ if (m_webBlobRegistry)
+ m_webBlobRegistry->unregisterBlobURL(url);
+}
+
+} // namespace WebCore
+
+#endif
Copied: trunk/Source/WebCore/platform/network/chromium/BlobRegistryProxy.h (from rev 139697, trunk/Source/WebKit/chromium/src/BlobRegistryProxy.h) (0 => 139698)
--- trunk/Source/WebCore/platform/network/chromium/BlobRegistryProxy.h (rev 0)
+++ trunk/Source/WebCore/platform/network/chromium/BlobRegistryProxy.h 2013-01-15 01:58:07 UTC (rev 139698)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BlobRegistryProxy_h
+#define BlobRegistryProxy_h
+
+#if ENABLE(BLOB)
+
+#include "BlobRegistry.h"
+
+namespace WebKit { class WebBlobRegistry; }
+
+namespace WebCore {
+
+class BlobRegistryProxy : public BlobRegistry {
+public:
+ BlobRegistryProxy();
+
+ virtual void registerBlobURL(const KURL&, PassOwnPtr<BlobData>);
+ virtual void registerBlobURL(const KURL&, const KURL& srcURL);
+ virtual void unregisterBlobURL(const KURL&);
+
+ virtual bool loadResourceSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data) { return false; }
+
+private:
+ virtual ~BlobRegistryProxy() { }
+
+ WebKit::WebBlobRegistry* m_webBlobRegistry;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(BLOB)
+
+#endif // BlobRegistryProxy_h
Modified: trunk/Source/WebKit/chromium/ChangeLog (139697 => 139698)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-15 01:40:54 UTC (rev 139697)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-15 01:58:07 UTC (rev 139698)
@@ -1,3 +1,17 @@
+2013-01-14 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move BlobRegistryProxy into WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=106831
+
+ Reviewed by Adam Barth.
+
+ Part of a larger refactoring series to remove layering violations
+ in Chromium. See tracking bug 106829.
+
+ * WebKit.gyp:
+ * src/BlobRegistryProxy.cpp: Removed.
+ * src/BlobRegistryProxy.h: Removed.
+
2013-01-14 Alec Flett <[email protected]>
IndexedDB: Remove IDBObjectStore/IndexBackendImpl and support functions
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (139697 => 139698)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-15 01:40:54 UTC (rev 139697)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-15 01:58:07 UTC (rev 139698)
@@ -354,8 +354,6 @@
'src/BackForwardListChromium.h',
'src/BatteryClientImpl.cpp',
'src/BatteryClientImpl.h',
- 'src/BlobRegistryProxy.cpp',
- 'src/BlobRegistryProxy.h',
'src/DateTimeChooserImpl.cpp',
'src/DateTimeChooserImpl.h',
'src/ChromeClientImpl.cpp',
Deleted: trunk/Source/WebKit/chromium/src/BlobRegistryProxy.cpp (139697 => 139698)
--- trunk/Source/WebKit/chromium/src/BlobRegistryProxy.cpp 2013-01-15 01:40:54 UTC (rev 139697)
+++ trunk/Source/WebKit/chromium/src/BlobRegistryProxy.cpp 2013-01-15 01:58:07 UTC (rev 139698)
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(BLOB)
-
-#include "BlobRegistryProxy.h"
-
-#include "BlobData.h"
-#include "KURL.h"
-#include "ResourceHandle.h"
-#include <public/Platform.h>
-#include <public/WebBlobData.h>
-#include <public/WebBlobRegistry.h>
-#include <public/WebURL.h>
-#include <wtf/MainThread.h>
-#include <wtf/StdLibExtras.h>
-
-// We are part of the WebKit implementation.
-using namespace WebKit;
-
-namespace WebCore {
-
-BlobRegistry& blobRegistry()
-{
- ASSERT(isMainThread());
- DEFINE_STATIC_LOCAL(BlobRegistryProxy, instance, ());
- return instance;
-}
-
-BlobRegistryProxy::BlobRegistryProxy()
- : m_webBlobRegistry(WebKit::Platform::current()->blobRegistry())
-{
-}
-
-void BlobRegistryProxy::registerBlobURL(const KURL& url, PassOwnPtr<BlobData> blobData)
-{
- if (m_webBlobRegistry) {
- WebBlobData webBlobData(blobData);
- m_webBlobRegistry->registerBlobURL(url, webBlobData);
- }
-}
-
-void BlobRegistryProxy::registerBlobURL(const KURL& url, const KURL& srcURL)
-{
- if (m_webBlobRegistry)
- m_webBlobRegistry->registerBlobURL(url, srcURL);
-}
-
-void BlobRegistryProxy::unregisterBlobURL(const KURL& url)
-{
- if (m_webBlobRegistry)
- m_webBlobRegistry->unregisterBlobURL(url);
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebKit/chromium/src/BlobRegistryProxy.h (139697 => 139698)
--- trunk/Source/WebKit/chromium/src/BlobRegistryProxy.h 2013-01-15 01:40:54 UTC (rev 139697)
+++ trunk/Source/WebKit/chromium/src/BlobRegistryProxy.h 2013-01-15 01:58:07 UTC (rev 139698)
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef BlobRegistryProxy_h
-#define BlobRegistryProxy_h
-
-#if ENABLE(BLOB)
-
-#include "BlobRegistry.h"
-
-namespace WebKit { class WebBlobRegistry; }
-
-namespace WebCore {
-
-class BlobRegistryProxy : public BlobRegistry {
-public:
- BlobRegistryProxy();
-
- virtual void registerBlobURL(const KURL&, PassOwnPtr<BlobData>);
- virtual void registerBlobURL(const KURL&, const KURL& srcURL);
- virtual void unregisterBlobURL(const KURL&);
-
- virtual bool loadResourceSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data) { return false; }
-
-private:
- virtual ~BlobRegistryProxy() { }
-
- WebKit::WebBlobRegistry* m_webBlobRegistry;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(BLOB)
-
-#endif // BlobRegistryProxy_h
