Title: [137482] trunk/Source
- Revision
- 137482
- Author
- [email protected]
- Date
- 2012-12-12 10:34:01 -0800 (Wed, 12 Dec 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (137481 => 137482)
--- trunk/Source/Platform/ChangeLog 2012-12-12 18:32:01 UTC (rev 137481)
+++ trunk/Source/Platform/ChangeLog 2012-12-12 18:34:01 UTC (rev 137482)
@@ -1,3 +1,16 @@
+2012-12-12 Gavin Peters <[email protected]>
+
+ [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 <[email protected]>
Web Inspector: add memory used by memory allocator itself to NMI
Modified: trunk/Source/Platform/chromium/public/WebPrerender.h (137481 => 137482)
--- trunk/Source/Platform/chromium/public/WebPrerender.h 2012-12-12 18:32:01 UTC (rev 137481)
+++ trunk/Source/Platform/chromium/public/WebPrerender.h 2012-12-12 18:34:01 UTC (rev 137482)
@@ -54,6 +54,7 @@
virtual ~ExtraData() { }
};
+ ~WebPrerender() { reset(); }
WebPrerender() { }
WebPrerender(const WebPrerender& other) { assign(other); }
WebPrerender& operator=(const WebPrerender& other)
@@ -64,11 +65,11 @@
#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;
Modified: trunk/Source/WebCore/ChangeLog (137481 => 137482)
--- trunk/Source/WebCore/ChangeLog 2012-12-12 18:32:01 UTC (rev 137481)
+++ trunk/Source/WebCore/ChangeLog 2012-12-12 18:34:01 UTC (rev 137482)
@@ -1,3 +1,18 @@
+2012-12-12 Gavin Peters <[email protected]>
+
+ [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 <[email protected]>
[Qt] Animation fails on large layers
Modified: trunk/Source/WebCore/platform/chromium/support/WebPrerender.cpp (137481 => 137482)
--- trunk/Source/WebCore/platform/chromium/support/WebPrerender.cpp 2012-12-12 18:32:01 UTC (rev 137481)
+++ trunk/Source/WebCore/platform/chromium/support/WebPrerender.cpp 2012-12-12 18:34:01 UTC (rev 137482)
@@ -64,14 +64,14 @@
{
}
-WebPrerender::~WebPrerender()
+const WebCore::Prerender* WebPrerender::toPrerender() const
{
- m_private.reset();
+ return m_private.get();
}
-const WebCore::Prerender* WebPrerender::toPrerender() const
+void WebPrerender::reset()
{
- return m_private.get();
+ m_private.reset();
}
void WebPrerender::assign(const WebPrerender& other)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
