Title: [123345] trunk
Revision
123345
Author
[email protected]
Date
2012-07-23 09:15:25 -0700 (Mon, 23 Jul 2012)

Log Message

[chromium] MediaStream API: Clean up the MockWebKitPlatformSupport object at shutdown
https://bugs.webkit.org/show_bug.cgi?id=91857

Reviewed by Adam Barth.

Source/Platform:

Made Platforms destructor virtual.

* chromium/public/Platform.h:
(WebKit::Platform::~Platform):

Tools:

Made a few changes so that the destructor could be called at shutdown.

* DumpRenderTree/chromium/DumpRenderTree.cpp:
(WebKitSupportTestEnvironment::WebKitSupportTestEnvironment):
(WebKitSupportTestEnvironment):
* DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp:
(MockWebKitPlatformSupport::create):
* DumpRenderTree/chromium/MockWebKitPlatformSupport.h:
(MockWebKitPlatformSupport):
(MockWebKitPlatformSupport::~MockWebKitPlatformSupport):

Modified Paths

Diff

Modified: trunk/Source/Platform/ChangeLog (123344 => 123345)


--- trunk/Source/Platform/ChangeLog	2012-07-23 15:59:12 UTC (rev 123344)
+++ trunk/Source/Platform/ChangeLog	2012-07-23 16:15:25 UTC (rev 123345)
@@ -1,3 +1,15 @@
+2012-07-23  Tommy Widenflycht  <[email protected]>
+
+        [chromium] MediaStream API: Clean up the MockWebKitPlatformSupport object at shutdown
+        https://bugs.webkit.org/show_bug.cgi?id=91857
+
+        Reviewed by Adam Barth.
+
+        Made Platforms destructor virtual.
+
+        * chromium/public/Platform.h:
+        (WebKit::Platform::~Platform):
+
 2012-07-18  Antoine Labour  <[email protected]>
 
         [chromium] Introduce CCResourceProvider, replacing TextureAllocator and hiding textures from clients to allow transport

Modified: trunk/Source/Platform/chromium/public/Platform.h (123344 => 123345)


--- trunk/Source/Platform/chromium/public/Platform.h	2012-07-23 15:59:12 UTC (rev 123344)
+++ trunk/Source/Platform/chromium/public/Platform.h	2012-07-23 16:15:25 UTC (rev 123345)
@@ -424,7 +424,7 @@
     virtual void didStopWorkerRunLoop(const WebWorkerRunLoop&) { }
 
 protected:
-    ~Platform() { }
+    virtual ~Platform() { }
 };
 
 } // namespace WebKit

Modified: trunk/Tools/ChangeLog (123344 => 123345)


--- trunk/Tools/ChangeLog	2012-07-23 15:59:12 UTC (rev 123344)
+++ trunk/Tools/ChangeLog	2012-07-23 16:15:25 UTC (rev 123345)
@@ -1,3 +1,21 @@
+2012-07-23  Tommy Widenflycht  <[email protected]>
+
+        [chromium] MediaStream API: Clean up the MockWebKitPlatformSupport object at shutdown
+        https://bugs.webkit.org/show_bug.cgi?id=91857
+
+        Reviewed by Adam Barth.
+
+        Made a few changes so that the destructor could be called at shutdown.
+
+        * DumpRenderTree/chromium/DumpRenderTree.cpp:
+        (WebKitSupportTestEnvironment::WebKitSupportTestEnvironment):
+        (WebKitSupportTestEnvironment):
+        * DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp:
+        (MockWebKitPlatformSupport::create):
+        * DumpRenderTree/chromium/MockWebKitPlatformSupport.h:
+        (MockWebKitPlatformSupport):
+        (MockWebKitPlatformSupport::~MockWebKitPlatformSupport):
+
 2012-07-23  Philippe Normand  <[email protected]>
 
         [GTK][jhbuild] Switch to GStreamer 0.11 build

Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (123344 => 123345)


--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp	2012-07-23 15:59:12 UTC (rev 123344)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp	2012-07-23 16:15:25 UTC (rev 123345)
@@ -36,6 +36,7 @@
 #include "webkit/support/webkit_support.h"
 #include <v8/include/v8-testing.h>
 #include <v8/include/v8.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 
 using namespace std;
@@ -73,12 +74,15 @@
 public:
     WebKitSupportTestEnvironment()
     {
-        webkit_support::SetUpTestEnvironment(MockWebKitPlatformSupport::create());
+        m_mockPlatform = MockWebKitPlatformSupport::create();
+        webkit_support::SetUpTestEnvironment(m_mockPlatform.get());
     }
     ~WebKitSupportTestEnvironment()
     {
         webkit_support::TearDownTestEnvironment();
     }
+private:
+    OwnPtr<MockWebKitPlatformSupport> m_mockPlatform;
 };
 
 static void runTest(TestShell& shell, TestParams& params, const string& testName)

Modified: trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp (123344 => 123345)


--- trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp	2012-07-23 15:59:12 UTC (rev 123344)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp	2012-07-23 16:15:25 UTC (rev 123345)
@@ -35,15 +35,19 @@
 
 using namespace WebKit;
 
-Platform* MockWebKitPlatformSupport::create()
+PassOwnPtr<MockWebKitPlatformSupport> MockWebKitPlatformSupport::create()
 {
-    return new MockWebKitPlatformSupport();
+    return WTF::adoptPtr(new MockWebKitPlatformSupport());
 }
 
 MockWebKitPlatformSupport::MockWebKitPlatformSupport()
 {
 }
 
+MockWebKitPlatformSupport::~MockWebKitPlatformSupport()
+{
+}
+
 void MockWebKitPlatformSupport::cryptographicallyRandomValues(unsigned char*, size_t)
 {
     CRASH();

Modified: trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h (123344 => 123345)


--- trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h	2012-07-23 15:59:12 UTC (rev 123344)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h	2012-07-23 16:15:25 UTC (rev 123345)
@@ -32,10 +32,12 @@
 #define MockWebKitPlatformSupport_h
 
 #include <public/Platform.h>
+#include <wtf/PassOwnPtr.h>
 
 class MockWebKitPlatformSupport : public WebKit::Platform {
 public:
-    static WebKit::Platform* create();
+    static PassOwnPtr<MockWebKitPlatformSupport> create();
+    ~MockWebKitPlatformSupport();
 
     virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) OVERRIDE;
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to