Changeset 104764 in webkit


Ignore:
Timestamp:
Jan 11, 2012 4:26:57 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

implement layout tests for <video> with media stream
​https://bugs.webkit.org/show_bug.cgi?id=74882

Patch by Wei Jia <​wjia@chromium.org> on 2012-01-11
Reviewed by Kent Tamura.

Tools:

  • DumpRenderTree/DumpRenderTree.gypi:
  • DumpRenderTree/chromium/WebUserMediaClientMock.cpp: Added.

(WebKit::WebUserMediaClientMock::create):
(WebKit::WebUserMediaClientMock::IsMockStream):
(WebKit::WebUserMediaClientMock::requestUserMedia):
(WebKit::WebUserMediaClientMock::cancelUserMediaRequest):

  • DumpRenderTree/chromium/WebUserMediaClientMock.h: Added.

(WebKit::WebUserMediaClientMock::~WebUserMediaClientMock):
(WebKit::WebUserMediaClientMock::WebUserMediaClientMock):

  • DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::userMediaClient):
(WebViewHost::userMediaClientMock):
(WebViewHost::createMediaPlayer):
(WebViewHost::mediaStreamUtil):
(WebViewHost::testMediaStreamClient):

  • DumpRenderTree/chromium/WebViewHost.h:

LayoutTests:

  • platform/chromium/media/video-capture-preview-expected.txt: Added.
  • platform/chromium/media/video-capture-preview.html: Added.
Location:
trunk
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r104762 r104764  
     12012-01-11  Wei Jia  <wjia@chromium.org>
     2
     3        implement layout tests for <video> with media stream
     4        https://bugs.webkit.org/show_bug.cgi?id=74882
     5
     6        Reviewed by Kent Tamura.
     7
     8        * platform/chromium/media/video-capture-preview-expected.txt: Added.
     9        * platform/chromium/media/video-capture-preview.html: Added.
     10
    1112012-01-09  Geoffrey Garen  <ggaren@apple.com>
    212

  • trunk/Tools/ChangeLog

    r104763 r104764  
     12012-01-11  Wei Jia  <wjia@chromium.org>
     2
     3        implement layout tests for <video> with media stream
     4        https://bugs.webkit.org/show_bug.cgi?id=74882
     5
     6        Reviewed by Kent Tamura.
     7
     8        * DumpRenderTree/DumpRenderTree.gypi:
     9        * DumpRenderTree/chromium/WebUserMediaClientMock.cpp: Added.
     10        (WebKit::WebUserMediaClientMock::create):
     11        (WebKit::WebUserMediaClientMock::IsMockStream):
     12        (WebKit::WebUserMediaClientMock::requestUserMedia):
     13        (WebKit::WebUserMediaClientMock::cancelUserMediaRequest):
     14        * DumpRenderTree/chromium/WebUserMediaClientMock.h: Added.
     15        (WebKit::WebUserMediaClientMock::~WebUserMediaClientMock):
     16        (WebKit::WebUserMediaClientMock::WebUserMediaClientMock):
     17        * DumpRenderTree/chromium/WebViewHost.cpp:
     18        (WebViewHost::userMediaClient):
     19        (WebViewHost::userMediaClientMock):
     20        (WebViewHost::createMediaPlayer):
     21        (WebViewHost::mediaStreamUtil):
     22        (WebViewHost::testMediaStreamClient):
     23        * DumpRenderTree/chromium/WebViewHost.h:
     24
    1252012-01-11  Dirk Pranke  <dpranke@chromium.org>
    226

  • trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

    r101464 r104764  
    4747            'chromium/WebPreferences.cpp',
    4848            'chromium/WebPreferences.h',
     49            'chromium/WebUserMediaClientMock.cpp',
     50            'chromium/WebUserMediaClientMock.h',
    4951            'chromium/WebViewHost.cpp',
    5052            'chromium/WebViewHost.h',

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r104717 r104764  
    11/*
    2  * Copyright (C) 2010, 2011 Google Inc. All rights reserved.
     2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    6060#include "WebTextCheckingCompletion.h"
    6161#include "WebTextCheckingResult.h"
     62#include "WebUserMediaClientMock.h"
    6263#include "platform/WebThread.h"
    6364#include "platform/WebURLRequest.h"
    … …  
    6667#include "WebWindowFeatures.h"
    6768#include "skia/ext/platform_canvas.h"
     69#include "webkit/support/test_media_stream_client.h"
    6870#include "webkit/support/webkit_support.h"
    6971
    … …  
    695697}
    696698
     699WebUserMediaClient* WebViewHost::userMediaClient()
     700{
     701    return userMediaClientMock();
     702}
     703
     704WebUserMediaClientMock* WebViewHost::userMediaClientMock()
     705{
     706    if (!m_userMediaClientMock.get())
     707        m_userMediaClientMock = WebUserMediaClientMock::create();
     708    return m_userMediaClientMock.get();
     709}
     710
    697711// WebWidgetClient -----------------------------------------------------------
    698712
    … …  
    846860WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, WebMediaPlayerClient* client)
    847861{
    848     return webkit_support::CreateMediaPlayer(frame, client);
     862    return webkit_support::CreateMediaPlayer(frame, client, testMediaStreamClient());
    849863}
    850864
    … …  
    15551569}
    15561570
     1571webkit_support::MediaStreamUtil* WebViewHost::mediaStreamUtil()
     1572{
     1573    return userMediaClientMock();
     1574}
     1575
     1576webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient()
     1577{
     1578    if (!m_testMediaStreamClient.get())
     1579        m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamClient(mediaStreamUtil()));
     1580    return m_testMediaStreamClient.get();
     1581}
     1582
    15571583// Painting functions ---------------------------------------------------------
    15581584

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r104717 r104764  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2012 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    6161class WebSpeechInputListener;
    6262class WebURL;
     63class WebUserMediaClientMock;
    6364struct WebRect;
    6465struct WebURLError;
    6566struct WebWindowFeatures;
     67}
     68
     69namespace webkit_support {
     70class MediaStreamUtil;
     71class TestMediaStreamClient;
    6672}
    6773
    … …  
    151157    virtual WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*);
    152158    virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
     159    virtual WebKit::WebUserMediaClient* userMediaClient();
    153160
    154161    // WebKit::WebWidgetClient
    … …  
    281288    void discardBackingStore();
    282289
     290    WebKit::WebUserMediaClientMock* userMediaClientMock();
     291    webkit_support::MediaStreamUtil* mediaStreamUtil();
     292    webkit_support::TestMediaStreamClient* testMediaStreamClient();
     293
    283294    // Causes navigation actions just printout the intended navigation instead
    284295    // of taking you to the page. This is used for cases like mailto, where you
    … …  
    357368    OwnPtr<WebKit::WebSpeechInputControllerMock> m_speechInputControllerMock;
    358369
     370    OwnPtr<WebKit::WebUserMediaClientMock> m_userMediaClientMock;
     371    OwnPtr<webkit_support::TestMediaStreamClient> m_testMediaStreamClient;
     372
    359373    OwnPtr<TestNavigationController> m_navigationController;
    360374
Note: See TracChangeset for help on using the changeset viewer.