[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jianli at chromium.org
jianli at chromium.org
Wed Dec 22 12:32:05 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e924d9c580cd9579a2f19eab1ba9f979f465f4f9
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 25 04:18:36 2010 +0000
[chromium] WebBlobRegistry cleanup.
https://bugs.webkit.org/show_bug.cgi?id=44571
Reviewed by Darin Fisher.
Remove unneeded method from WebBlobRegistry interface.
Also remove unneeded WebBlobRegistryImpl.* files. They're already
excluded from gyp files.
* public/WebBlobRegistry.h:
* src/WebBlobRegistryImpl.cpp: Removed.
* src/WebBlobRegistryImpl.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65972 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 047a69c..047f2c8 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-24 Jian Li <jianli at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [chromium] WebBlobRegistry cleanup.
+ https://bugs.webkit.org/show_bug.cgi?id=44571
+
+ Remove unneeded method from WebBlobRegistry interface.
+ Also remove unneeded WebBlobRegistryImpl.* files. They're already
+ excluded from gyp files.
+
+ * public/WebBlobRegistry.h:
+ * src/WebBlobRegistryImpl.cpp: Removed.
+ * src/WebBlobRegistryImpl.h: Removed.
+
2010-08-24 Adam Barth <abarth at webkit.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebBlobRegistry.h b/WebKit/chromium/public/WebBlobRegistry.h
index 35e9869..cbd9a99 100644
--- a/WebKit/chromium/public/WebBlobRegistry.h
+++ b/WebKit/chromium/public/WebBlobRegistry.h
@@ -51,7 +51,6 @@ public:
virtual void registerBlobURL(const WebURL&, const WebURL& srcURL) = 0;
virtual void unregisterBlobURL(const WebURL&) = 0;
- virtual WebBlobStorageData getBlobDataFromURL(const WebURL&) = 0;
};
} // namespace WebKit
diff --git a/WebKit/chromium/src/WebBlobRegistryImpl.cpp b/WebKit/chromium/src/WebBlobRegistryImpl.cpp
deleted file mode 100644
index 662c524..0000000
--- a/WebKit/chromium/src/WebBlobRegistryImpl.cpp
+++ /dev/null
@@ -1,80 +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"
-#include "WebBlobRegistryImpl.h"
-
-#include "BlobRegistryImpl.h"
-#include "ResourceError.h"
-#include "WebBlobData.h"
-#include "WebURL.h"
-#include <wtf/MainThread.h>
-
-#if ENABLE(BLOB)
-
-namespace WebKit {
-
-WebBlobRegistry* WebBlobRegistry::create()
-{
- return new WebBlobRegistryImpl();
-}
-
-WebBlobRegistryImpl::WebBlobRegistryImpl()
- : m_blobRegistry(new WebCore::BlobRegistryImpl())
-{
-}
-
-WebBlobRegistryImpl::~WebBlobRegistryImpl()
-{
-}
-
-void WebBlobRegistryImpl::registerBlobURL(const WebURL& url, WebBlobData& blobData)
-{
- m_blobRegistry->registerBlobURL(url, blobData);
-}
-
-void WebBlobRegistryImpl::registerBlobURL(const WebURL& url, const WebURL& srcURL)
-{
- m_blobRegistry->registerBlobURL(url, srcURL);
-}
-
-void WebBlobRegistryImpl::unregisterBlobURL(const WebURL& url)
-{
- m_blobRegistry->unregisterBlobURL(url);
-}
-
-WebBlobStorageData WebBlobRegistryImpl::getBlobDataFromURL(const WebURL& url)
-{
- return m_blobRegistry->getBlobDataFromURL(url);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(BLOB)
diff --git a/WebKit/chromium/src/WebBlobRegistryImpl.h b/WebKit/chromium/src/WebBlobRegistryImpl.h
deleted file mode 100644
index da512db..0000000
--- a/WebKit/chromium/src/WebBlobRegistryImpl.h
+++ /dev/null
@@ -1,61 +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 WebBlobRegistryImpl_h
-#define WebBlobRegistryImpl_h
-
-#if ENABLE(BLOB)
-
-#include "WebBlobRegistry.h"
-#include <wtf/OwnPtr.h>
-
-namespace WebCore { class BlobRegistryImpl; }
-
-namespace WebKit {
-
-class WebBlobRegistryImpl : public WebBlobRegistry {
-public:
- WebBlobRegistryImpl();
- virtual ~WebBlobRegistryImpl();
-
- virtual void registerBlobURL(const WebURL&, WebBlobData&);
- virtual void registerBlobURL(const WebURL&, const WebURL& srcURL);
- virtual void unregisterBlobURL(const WebURL&);
- virtual WebBlobStorageData getBlobDataFromURL(const WebURL&);
-
-private:
- WTF::OwnPtr<WebCore::BlobRegistryImpl> m_blobRegistry;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(BLOB)
-
-#endif // WebBlobRegistryImpl_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list