Title: [135379] trunk/Source
- Revision
- 135379
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-21 03:48:29 -0800 (Wed, 21 Nov 2012)
Log Message
WebMediaStreamComponent: Add assignment and copy operators
https://bugs.webkit.org/show_bug.cgi?id=102915
Patch by Harald Alvestrand <h...@google.com> on 2012-11-21
Reviewed by Adam Barth.
Source/Platform:
* chromium/public/WebMediaStreamComponent.h:
(WebKit::WebMediaStreamComponent::WebMediaStreamComponent):
(WebKit::WebMediaStreamComponent::operator=):
(WebMediaStreamComponent):
Source/WebCore:
Tests that use this functionality are being submitted to Chrome.
* platform/chromium/support/WebMediaStreamComponent.cpp:
(WebKit::WebMediaStreamComponent::assign):
(WebKit):
* platform/chromium/support/WebMediaStreamDescriptor.cpp:
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (135378 => 135379)
--- trunk/Source/Platform/ChangeLog 2012-11-21 11:43:12 UTC (rev 135378)
+++ trunk/Source/Platform/ChangeLog 2012-11-21 11:48:29 UTC (rev 135379)
@@ -1,3 +1,15 @@
+2012-11-21 Harald Alvestrand <h...@google.com>
+
+ WebMediaStreamComponent: Add assignment and copy operators
+ https://bugs.webkit.org/show_bug.cgi?id=102915
+
+ Reviewed by Adam Barth.
+
+ * chromium/public/WebMediaStreamComponent.h:
+ (WebKit::WebMediaStreamComponent::WebMediaStreamComponent):
+ (WebKit::WebMediaStreamComponent::operator=):
+ (WebMediaStreamComponent):
+
2012-11-19 Dana Jansens <dan...@chromium.org>
[chromium] Remove the WebCompositorSupport virtual methods from the base class
Modified: trunk/Source/Platform/chromium/public/WebMediaStreamComponent.h (135378 => 135379)
--- trunk/Source/Platform/chromium/public/WebMediaStreamComponent.h 2012-11-21 11:43:12 UTC (rev 135378)
+++ trunk/Source/Platform/chromium/public/WebMediaStreamComponent.h 2012-11-21 11:48:29 UTC (rev 135379)
@@ -47,8 +47,15 @@
class WebMediaStreamComponent {
public:
WebMediaStreamComponent() { }
+ WebMediaStreamComponent(const WebMediaStreamComponent& other) { assign(other); }
~WebMediaStreamComponent() { reset(); }
+ WebMediaStreamComponent& operator=(const WebMediaStreamComponent& other)
+ {
+ assign(other);
+ return *this;
+ }
+ WEBKIT_EXPORT void assign(const WebMediaStreamComponent&);
WEBKIT_EXPORT void reset();
bool isNull() const { return m_private.isNull(); }
Modified: trunk/Source/WebCore/ChangeLog (135378 => 135379)
--- trunk/Source/WebCore/ChangeLog 2012-11-21 11:43:12 UTC (rev 135378)
+++ trunk/Source/WebCore/ChangeLog 2012-11-21 11:48:29 UTC (rev 135379)
@@ -1,3 +1,17 @@
+2012-11-21 Harald Alvestrand <h...@google.com>
+
+ WebMediaStreamComponent: Add assignment and copy operators
+ https://bugs.webkit.org/show_bug.cgi?id=102915
+
+ Reviewed by Adam Barth.
+
+ Tests that use this functionality are being submitted to Chrome.
+
+ * platform/chromium/support/WebMediaStreamComponent.cpp:
+ (WebKit::WebMediaStreamComponent::assign):
+ (WebKit):
+ * platform/chromium/support/WebMediaStreamDescriptor.cpp:
+
2012-11-21 Kentaro Hara <hara...@chromium.org>
[V8] Remove STRING_TO_V8PARAMETER_EXCEPTION_BLOCK()
Modified: trunk/Source/WebCore/platform/chromium/support/WebMediaStreamComponent.cpp (135378 => 135379)
--- trunk/Source/WebCore/platform/chromium/support/WebMediaStreamComponent.cpp 2012-11-21 11:43:12 UTC (rev 135378)
+++ trunk/Source/WebCore/platform/chromium/support/WebMediaStreamComponent.cpp 2012-11-21 11:48:29 UTC (rev 135379)
@@ -81,7 +81,11 @@
return WebMediaStreamSource(m_private.get()->source());
}
+void WebMediaStreamComponent::assign(const WebMediaStreamComponent& other)
+{
+ m_private = other.m_private;
+}
+
} // namespace WebKit
#endif // ENABLE(MEDIA_STREAM)
-
Modified: trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp (135378 => 135379)
--- trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2012-11-21 11:43:12 UTC (rev 135378)
+++ trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2012-11-21 11:48:29 UTC (rev 135379)
@@ -147,4 +147,3 @@
} // namespace WebKit
#endif // ENABLE(MEDIA_STREAM)
-
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
