[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
victorw at chromium.org
victorw at chromium.org
Wed Dec 22 11:21:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a0e26411bd4bb59f4a92f94054445634d666c120
Author: victorw at chromium.org <victorw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 17:42:10 2010 +0000
2010-07-19 Victor Wang <victorw at chromium.org>
Reviewed by Darin Fisher.
[Chromium] Add webkit api reset to WebIDBDatabaseError and WebIDBKey
and refactor their destructors for chromium multi dll build.
https://bugs.webkit.org/show_bug.cgi?id=42574
* public/WebIDBDatabaseError.h:
(WebKit::WebIDBDatabaseError::~WebIDBDatabaseError):
* public/WebIDBKey.h:
(WebKit::WebIDBKey::~WebIDBKey):
* src/WebIDBDatabaseError.cpp:
(WebKit::WebIDBDatabaseError::reset):
* src/WebIDBKey.cpp:
(WebKit::WebIDBKey::reset):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d4a5222..f441f2f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,21 @@
+2010-07-19 Victor Wang <victorw at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Chromium] Add webkit api reset to WebIDBDatabaseError and WebIDBKey
+ and refactor their destructors for chromium multi dll build.
+
+ https://bugs.webkit.org/show_bug.cgi?id=42574
+
+ * public/WebIDBDatabaseError.h:
+ (WebKit::WebIDBDatabaseError::~WebIDBDatabaseError):
+ * public/WebIDBKey.h:
+ (WebKit::WebIDBKey::~WebIDBKey):
+ * src/WebIDBDatabaseError.cpp:
+ (WebKit::WebIDBDatabaseError::reset):
+ * src/WebIDBKey.cpp:
+ (WebKit::WebIDBKey::reset):
+
2010-07-20 Hans Wennborg <hans at chromium.org>
Reviewed by Steve Block.
diff --git a/WebKit/chromium/public/WebIDBDatabaseError.h b/WebKit/chromium/public/WebIDBDatabaseError.h
index 255d175..a237d5f 100644
--- a/WebKit/chromium/public/WebIDBDatabaseError.h
+++ b/WebKit/chromium/public/WebIDBDatabaseError.h
@@ -40,7 +40,7 @@ namespace WebKit {
// See comment in WebIndexedDatabase for a high level overview these classes.
class WebIDBDatabaseError {
public:
- WEBKIT_API ~WebIDBDatabaseError();
+ ~WebIDBDatabaseError() { reset(); }
WEBKIT_API WebIDBDatabaseError(unsigned short code, const WebString& message) { assign(code, message); }
WEBKIT_API WebIDBDatabaseError(const WebIDBDatabaseError& e) { assign(e); }
@@ -51,6 +51,7 @@ public:
}
WEBKIT_API void assign(const WebIDBDatabaseError&);
+ WEBKIT_API void reset();
WEBKIT_API unsigned short code() const;
WEBKIT_API WebString message() const;
diff --git a/WebKit/chromium/public/WebIDBKey.h b/WebKit/chromium/public/WebIDBKey.h
index 876928a..1cf336d 100644
--- a/WebKit/chromium/public/WebIDBKey.h
+++ b/WebKit/chromium/public/WebIDBKey.h
@@ -36,7 +36,7 @@ namespace WebKit {
class WebIDBKey {
public:
- ~WebIDBKey();
+ ~WebIDBKey() { reset(); }
WEBKIT_API static WebIDBKey createNull();
WEBKIT_API static WebIDBKey createInvalid();
@@ -55,6 +55,7 @@ public:
WEBKIT_API void assign(const WebString&);
WEBKIT_API void assign(int32_t);
WEBKIT_API void assignInvalid();
+ WEBKIT_API void reset();
enum Type {
NullType = 0,
diff --git a/WebKit/chromium/src/WebIDBDatabaseError.cpp b/WebKit/chromium/src/WebIDBDatabaseError.cpp
index 17fdd38..cbbe14a 100644
--- a/WebKit/chromium/src/WebIDBDatabaseError.cpp
+++ b/WebKit/chromium/src/WebIDBDatabaseError.cpp
@@ -40,11 +40,6 @@ using namespace WebCore;
namespace WebKit {
-WebIDBDatabaseError::~WebIDBDatabaseError()
-{
- m_private.reset();
-}
-
void WebIDBDatabaseError::assign(const WebIDBDatabaseError& value)
{
m_private = value.m_private;
@@ -55,6 +50,11 @@ void WebIDBDatabaseError::assign(unsigned short code, const WebString& message)
m_private = IDBDatabaseError::create(code, message);
}
+void WebIDBDatabaseError::reset()
+{
+ m_private.reset();
+}
+
unsigned short WebIDBDatabaseError::code() const
{
return m_private->code();
diff --git a/WebKit/chromium/src/WebIDBKey.cpp b/WebKit/chromium/src/WebIDBKey.cpp
index a52ea56..1c4c685 100644
--- a/WebKit/chromium/src/WebIDBKey.cpp
+++ b/WebKit/chromium/src/WebIDBKey.cpp
@@ -36,11 +36,6 @@ using namespace WebCore;
namespace WebKit {
-WebIDBKey::~WebIDBKey()
-{
- m_private.reset();
-}
-
WebIDBKey WebIDBKey::createNull()
{
WebIDBKey key;
@@ -80,6 +75,11 @@ void WebIDBKey::assignInvalid()
m_private = 0;
}
+void WebIDBKey::reset()
+{
+ m_private.reset();
+}
+
WebIDBKey::Type WebIDBKey::type() const
{
if (!m_private.get())
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list