Changeset 137482 in webkit

Timestamp:

Dec 12, 2012, 10:34:01 AM (13 years ago)

Author:

gavinp@chromium.org

Message:

[chromium] Add destructor to WebPrerender
​https://bugs.webkit.org/show_bug.cgi?id=104820

Reviewed by James Robinson.

When making WebPrerender default constructible and assignable, the destructor should have been moved out of WEBKIT_IMPLEMENTATION.

Source/Platform:

• chromium/public/WebPrerender.h:

(WebKit::WebPrerender::~WebPrerender):
(WebPrerender):

Source/WebCore:

Existing WebKit unit tests should test this, as do chromium browser tests.

• platform/chromium/support/WebPrerender.cpp:

(WebKit::WebPrerender::toPrerender):
(WebKit::WebPrerender::reset):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebPrerender.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/support/WebPrerender.cpp (modified) (1 diff)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-12-12  Gavin Peters  <gavinp@chromium.org>
+
+        [chromium] Add destructor to WebPrerender
+        https://bugs.webkit.org/show_bug.cgi?id=104820
+
+        Reviewed by James Robinson.
+
+        When making WebPrerender default constructible and assignable, the destructor should have been moved out of WEBKIT_IMPLEMENTATION.
+
+        * chromium/public/WebPrerender.h:
+        (WebKit::WebPrerender::~WebPrerender):
+        (WebPrerender):
+
 2012-12-12  Alexei Filippov  <alph@chromium.org>
 

trunk/Source/Platform/chromium/public/WebPrerender.h

@@ -55 +55 @@
     };
 
+    ~WebPrerender() { reset(); }
     WebPrerender() { }
     WebPrerender(const WebPrerender& other) { assign(other); }
@@ -65 +66 @@
 #if WEBKIT_IMPLEMENTATION
     explicit WebPrerender(PassRefPtr<WebCore::Prerender>);
-    ~WebPrerender();
 
     const WebCore::Prerender* toPrerender() const;
 #endif
 
+    WEBKIT_EXPORT void reset();
     WEBKIT_EXPORT void assign(const WebPrerender&);
     WEBKIT_EXPORT bool isNull() const;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-12  Gavin Peters  <gavinp@chromium.org>
+
+        [chromium] Add destructor to WebPrerender
+        https://bugs.webkit.org/show_bug.cgi?id=104820
+
+        Reviewed by James Robinson.
+
+        When making WebPrerender default constructible and assignable, the destructor should have been moved out of WEBKIT_IMPLEMENTATION.
+
+        Existing WebKit unit tests should test this, as do chromium browser tests.
+
+        * platform/chromium/support/WebPrerender.cpp:
+        (WebKit::WebPrerender::toPrerender):
+        (WebKit::WebPrerender::reset):
+
 2012-12-12  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/platform/chromium/support/WebPrerender.cpp

@@ -65 +65 @@
 }
 
-WebPrerender::~WebPrerender()
-{
-    m_private.reset();
-}
-
 const WebCore::Prerender* WebPrerender::toPrerender() const
 {
     return m_private.get();
+}
+
+void WebPrerender::reset()
+{
+    m_private.reset();
 }