Title: [100425] trunk
- Revision
- 100425
- Author
- commit-qu...@webkit.org
- Date
- 2011-11-16 02:35:31 -0800 (Wed, 16 Nov 2011)
Log Message
[GTK] fast/events/event-creation.html fails creating MediaStreamEvent
https://bugs.webkit.org/show_bug.cgi?id=70720
Patch by Per-Erik Brodin <per-erik.bro...@ericsson.com> on 2011-11-16
Reviewed by Philippe Normand.
Source/WebCore:
Added missing overriding of Event::interfaceName()
* mediastream/MediaStreamEvent.cpp:
(WebCore::MediaStreamEvent::stream): Changed return value to raw pointer.
(WebCore::MediaStreamEvent::interfaceName): Added back from r98044.
* mediastream/MediaStreamEvent.h:
* mediastream/MediaStreamEvent.idl: Changed module name to "events".
LayoutTests:
* platform/gtk/Skipped: Unskipped fast/events/event-creation.html
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (100424 => 100425)
--- trunk/LayoutTests/ChangeLog 2011-11-16 09:46:36 UTC (rev 100424)
+++ trunk/LayoutTests/ChangeLog 2011-11-16 10:35:31 UTC (rev 100425)
@@ -1,3 +1,12 @@
+2011-11-16 Per-Erik Brodin <per-erik.bro...@ericsson.com>
+
+ [GTK] fast/events/event-creation.html fails creating MediaStreamEvent
+ https://bugs.webkit.org/show_bug.cgi?id=70720
+
+ Reviewed by Philippe Normand.
+
+ * platform/gtk/Skipped: Unskipped fast/events/event-creation.html
+
2011-11-16 James Robinson <jam...@chromium.org>
[chromium] Update chromium expectations for compositing tests
Modified: trunk/LayoutTests/platform/gtk/Skipped (100424 => 100425)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-11-16 09:46:36 UTC (rev 100424)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-11-16 10:35:31 UTC (rev 100425)
@@ -1548,10 +1548,6 @@
# Missing DRT AccessibilityController::addNotificationListener implementation
accessibility/menu-list-sends-change-notification.html
-# https://bugs.webkit.org/show_bug.cgi?id=70720
-# [GTK] fast/events/event-creation.html fails creating MediaStreamEvent
-fast/events/event-creation.html
-
# https://bugs.webkit.org/show_bug.cgi?id=71022
fast/canvas/canvas-composite-image.html
fast/canvas/canvas-composite-canvas.html
Modified: trunk/Source/WebCore/ChangeLog (100424 => 100425)
--- trunk/Source/WebCore/ChangeLog 2011-11-16 09:46:36 UTC (rev 100424)
+++ trunk/Source/WebCore/ChangeLog 2011-11-16 10:35:31 UTC (rev 100425)
@@ -1,3 +1,18 @@
+2011-11-16 Per-Erik Brodin <per-erik.bro...@ericsson.com>
+
+ [GTK] fast/events/event-creation.html fails creating MediaStreamEvent
+ https://bugs.webkit.org/show_bug.cgi?id=70720
+
+ Reviewed by Philippe Normand.
+
+ Added missing overriding of Event::interfaceName()
+
+ * mediastream/MediaStreamEvent.cpp:
+ (WebCore::MediaStreamEvent::stream): Changed return value to raw pointer.
+ (WebCore::MediaStreamEvent::interfaceName): Added back from r98044.
+ * mediastream/MediaStreamEvent.h:
+ * mediastream/MediaStreamEvent.idl: Changed module name to "events".
+
2011-11-16 Mario Sanchez Prada <msanc...@igalia.com>
[GTK] Use GQuark's in the ATK wrapper to get and set arbitrary data
Modified: trunk/Source/WebCore/mediastream/MediaStreamEvent.cpp (100424 => 100425)
--- trunk/Source/WebCore/mediastream/MediaStreamEvent.cpp 2011-11-16 09:46:36 UTC (rev 100424)
+++ trunk/Source/WebCore/mediastream/MediaStreamEvent.cpp 2011-11-16 10:35:31 UTC (rev 100425)
@@ -57,11 +57,16 @@
{
}
-PassRefPtr<MediaStream> MediaStreamEvent::stream() const
+MediaStream* MediaStreamEvent::stream() const
{
- return m_stream;
+ return m_stream.get();
}
+const AtomicString& MediaStreamEvent::interfaceName() const
+{
+ return eventNames().interfaceForMediaStreamEvent;
+}
+
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/mediastream/MediaStreamEvent.h (100424 => 100425)
--- trunk/Source/WebCore/mediastream/MediaStreamEvent.h 2011-11-16 09:46:36 UTC (rev 100424)
+++ trunk/Source/WebCore/mediastream/MediaStreamEvent.h 2011-11-16 10:35:31 UTC (rev 100425)
@@ -32,8 +32,6 @@
namespace WebCore {
-class Stream;
-
class MediaStreamEvent : public Event {
public:
virtual ~MediaStreamEvent();
@@ -41,10 +39,9 @@
static PassRefPtr<MediaStreamEvent> create();
static PassRefPtr<MediaStreamEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStream>);
- // From EventTarget.
- virtual bool isMediaStreamEvent() const { return true; }
+ MediaStream* stream() const;
- PassRefPtr<MediaStream> stream() const;
+ virtual const AtomicString& interfaceName() const;
private:
MediaStreamEvent();
Modified: trunk/Source/WebCore/mediastream/MediaStreamEvent.idl (100424 => 100425)
--- trunk/Source/WebCore/mediastream/MediaStreamEvent.idl 2011-11-16 09:46:36 UTC (rev 100424)
+++ trunk/Source/WebCore/mediastream/MediaStreamEvent.idl 2011-11-16 10:35:31 UTC (rev 100425)
@@ -22,7 +22,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-module p2p {
+module events {
// According to the WHATWG specification:
// http://www.whatwg.org/specs/web-apps/current-work/multipage/video-conferencing-and-peer-to-peer-communication.html#mediastreamevent
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
