From b29f9da30af462d558a43731b3213b4fa05e66a1 Mon Sep 17 00:00:00 2001
From: Victor Wang <victorw@chromium.org>
Date: Tue, 20 Jul 2010 17:42:10 +0000
Subject: [PATCH] 2010-07-19  Victor Wang  <victorw@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):


Canonical link: https://commits.webkit.org/54593@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 WebKit/chromium/ChangeLog                    | 18 ++++++++++++++++++
 WebKit/chromium/public/WebIDBDatabaseError.h |  3 ++-
 WebKit/chromium/public/WebIDBKey.h           |  3 ++-
 WebKit/chromium/src/WebIDBDatabaseError.cpp  | 10 +++++-----
 WebKit/chromium/src/WebIDBKey.cpp            | 10 +++++-----
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d4a5222bb6ed..f441f2f92364 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,21 @@
+2010-07-19  Victor Wang  <victorw@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@chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebKit/chromium/public/WebIDBDatabaseError.h b/WebKit/chromium/public/WebIDBDatabaseError.h
index 255d175e8c0a..a237d5fc35da 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 @@ class WebIDBDatabaseError {
     }
 
     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 876928a7a658..1cf336d22065 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 @@ class WebIDBKey {
     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 17fdd3884226..cbbe14a046c5 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 a52ea566d706..1c4c6855ef97 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())