Changeset 190061 in webkit

Timestamp:

Sep 21, 2015 11:03:25 AM (9 years ago)

Author:

timothy_horton@apple.com

Message:

UserMediaClientMock leaks every test run
​https://bugs.webkit.org/show_bug.cgi?id=149358

Reviewed by Eric Carlson.

• Modules/mediastream/UserMediaController.cpp:

(WebCore::provideUserMediaTo):
Make provideUserMediaTo operate unconditionally, just like all of the
other similar functions, reverting r165733.

• Modules/mediastream/UserMediaController.h:
• testing/Internals.cpp:

(WebCore::Internals::Internals):
Remove the existing UserMediaController supplement before installing a new one.
This way, we're replacing it with the one Internals is trying to install,
instead of leaking UserMediaClientMocks.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/UserMediaController.cpp (modified) (1 diff)
• Modules/mediastream/UserMediaController.h (modified) (1 diff)
• testing/Internals.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-21  Tim Horton  <timothy_horton@apple.com>
+
+        UserMediaClientMock leaks every test run
+        https://bugs.webkit.org/show_bug.cgi?id=149358
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediastream/UserMediaController.cpp:
+        (WebCore::provideUserMediaTo):
+        Make provideUserMediaTo operate unconditionally, just like all of the
+        other similar functions, reverting r165733.
+
+        * Modules/mediastream/UserMediaController.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::Internals):
+        Remove the existing UserMediaController supplement before installing a new one.
+        This way, we're replacing it with the one Internals is trying to install,
+        instead of leaking UserMediaClientMocks.
+
 2015-09-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/mediastream/UserMediaController.cpp

@@ -47 +47 @@
 void provideUserMediaTo(Page* page, UserMediaClient* client)
 {
-    if (!Supplement<Page>::from(page, UserMediaController::supplementName()))
-        UserMediaController::provideTo(page, UserMediaController::supplementName(), std::make_unique<UserMediaController>(client));
+    UserMediaController::provideTo(page, UserMediaController::supplementName(), std::make_unique<UserMediaController>(client));
 }
 

trunk/Source/WebCore/Modules/mediastream/UserMediaController.h

@@ -43 +43 @@
     void cancelRequest(UserMediaRequest&);
 
-    static const char* supplementName();
+    WEBCORE_EXPORT static const char* supplementName();
     static UserMediaController* from(Page* page) { return static_cast<UserMediaController*>(Supplement<Page>::from(page, supplementName())); }
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -113 +113 @@
 #include "TreeScope.h"
 #include "TypeConversions.h"
+#include "UserMediaController.h"
 #include "ViewportArguments.h"
 #include "WebConsoleAgent.h"
@@ -386 +387 @@
     MockRealtimeMediaSourceCenter::registerMockRealtimeMediaSourceCenter();
     enableMockRTCPeerConnectionHandler();
+    document->page()->removeSupplement(UserMediaController::supplementName());
     WebCore::provideUserMediaTo(document->page(), new UserMediaClientMock());
 #endif