Changeset 104278 in webkit


Ignore:
Timestamp:
Jan 6, 2012 1:43:44 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Move MediaDocument styles into CSS. Set black background for chromium.
​https://bugs.webkit.org/show_bug.cgi?id=74123

Source/WebCore:

Patch by Dale Curtis <​dalecurtis@chromium.org> on 2012-01-06
Reviewed by Eric Seidel.

Test: platform/chromium/media/video-black-bg-in-media-document.html

  • css/mediaControls.css:

(body:-webkit-full-page-media):
(video:-webkit-full-page-media):

  • css/mediaControlsChromium.css:

(body:-webkit-full-page-media):

  • html/MediaDocument.cpp:

(WebCore::MediaDocumentParser::createDocumentStructure):

LayoutTests:

Adds a new chromium specific test for ensuring the background is set
properly.

Rebaselines the text portions of media-document-audio-repaint.

Patch by Dale Curtis <​dalecurtis@chromium.org> on 2012-01-06
Reviewed by Eric Seidel.

  • platform/chromium-gpu-win/media/media-document-audio-repaint-expected.txt:
  • platform/chromium-gpu/media/media-document-audio-repaint-expected.txt:
  • platform/chromium-win/media/media-document-audio-repaint-expected.txt:
  • platform/chromium/media/media-document-audio-repaint-expected.txt:
  • platform/chromium/media/video-black-bg-in-media-document-expected.txt: Added.
  • platform/chromium/media/video-black-bg-in-media-document.html: Added.
  • platform/chromium/test_expectations.txt:
Location:
trunk
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r104277 r104278  
     12012-01-06  Dale Curtis  <dalecurtis@chromium.org>
     2
     3        Move MediaDocument styles into CSS. Set black background for chromium.
     4        https://bugs.webkit.org/show_bug.cgi?id=74123
     5
     6        Adds a new chromium specific test for ensuring the background is set
     7        properly.
     8
     9        Rebaselines the text portions of media-document-audio-repaint.
     10
     11        Reviewed by Eric Seidel.
     12
     13        * platform/chromium-gpu-win/media/media-document-audio-repaint-expected.txt:
     14        * platform/chromium-gpu/media/media-document-audio-repaint-expected.txt:
     15        * platform/chromium-win/media/media-document-audio-repaint-expected.txt:
     16        * platform/chromium/media/media-document-audio-repaint-expected.txt:
     17        * platform/chromium/media/video-black-bg-in-media-document-expected.txt: Added.
     18        * platform/chromium/media/video-black-bg-in-media-document.html: Added.
     19        * platform/chromium/test_expectations.txt:
     20
    1212012-01-06  Csaba Osztrogonác  <ossy@webkit.org>
    222

  • trunk/LayoutTests/platform/chromium-gpu-win/media/media-document-audio-repaint-expected.txt

    r99053 r104278  
    1717    layer at (0,0) size 380x330
    1818      RenderBlock {HTML} at (0,0) size 380x330
    19         RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#262626]
     19        RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#000000]
    2020    layer at (40,164) size 300x1
    2121      RenderVideo {VIDEO} at (40,164) size 300x1

  • trunk/LayoutTests/platform/chromium-gpu/media/media-document-audio-repaint-expected.txt

    r99053 r104278  
    1717    layer at (0,0) size 380x330
    1818      RenderBlock {HTML} at (0,0) size 380x330
    19         RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#262626]
     19        RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#000000]
    2020    layer at (40,164) size 300x1
    2121      RenderVideo {VIDEO} at (40,164) size 300x1

  • trunk/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.txt

    r94028 r104278  
    1414          layer at (0,0) size 380x330
    1515            RenderBlock {HTML} at (0,0) size 380x330
    16               RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#262626]
     16              RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#000000]
    1717          layer at (40,164) size 300x1
    1818            RenderVideo {VIDEO} at (40,164) size 300x1

  • trunk/LayoutTests/platform/chromium/media/media-document-audio-repaint-expected.txt

    r99053 r104278  
    1414          layer at (0,0) size 380x330
    1515            RenderBlock {HTML} at (0,0) size 380x330
    16               RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#262626]
     16              RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#000000]
    1717          layer at (40,164) size 300x1
    1818            RenderVideo {VIDEO} at (40,164) size 300x1

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r104257 r104278  
    25712571
    25722572// MAC CoreGraphics CG not passing the CSS3 elliptical gradient tests. Skia on the
    2573 // mac passes, refer to https://bugs.webkit.org/show_bug.cgi?id=56736 
     2573// mac passes, refer to https://bugs.webkit.org/show_bug.cgi?id=56736
    25742574BUGWK56736 MAC CPU-CG : fast/gradients/css3-radial-gradients.html = IMAGE
    25752575BUGWK56736 MAC CPU-CG : fast/gradients/css3-radial-gradients2.html = IMAGE
    … …  
    38803880
    38813881BUGWK75633 : fast/media/viewport-media-query.html = PASS IMAGE+TEXT
     3882
     3883// Needs rebaseline after BUGWK74123 goes in.
     3884BUGWK75505 : media/media-document-audio-repaint.html = IMAGE

  • trunk/Source/WebCore/ChangeLog

    r104276 r104278  
     12012-01-06  Dale Curtis  <dalecurtis@chromium.org>
     2
     3        Move MediaDocument styles into CSS. Set black background for chromium.
     4        https://bugs.webkit.org/show_bug.cgi?id=74123
     5
     6        Reviewed by Eric Seidel.
     7
     8        Test: platform/chromium/media/video-black-bg-in-media-document.html
     9
     10        * css/mediaControls.css:
     11        (body:-webkit-full-page-media):
     12        (video:-webkit-full-page-media):
     13        * css/mediaControlsChromium.css:
     14        (body:-webkit-full-page-media):
     15        * html/MediaDocument.cpp:
     16        (WebCore::MediaDocumentParser::createDocumentStructure):
     17
    1182012-01-06  Alice Boxhall  <aboxhall@chromium.org>
    219

  • trunk/Source/WebCore/css/mediaControls.css

    r103486 r104278  
    2525/* media controls */
    2626
     27body:-webkit-full-page-media {
     28    background-color: rgb(38, 38, 38);
     29}
     30
    2731audio {
    2832    width: 200px;
    … …  
    5054    height: 16px;
    5155    text-align: right;
     56}
     57
     58video:-webkit-full-page-media {
     59    margin: auto;
     60    position: absolute;
     61    top: 0;
     62    right: 0;
     63    bottom: 0;
     64    left: 0;
    5265}
    5366

  • trunk/Source/WebCore/css/mediaControlsChromium.css

    r103489 r104278  
    2525
    2626/* Chromium default media controls */
     27
     28body:-webkit-full-page-media {
     29    background-color: rgb(0, 0, 0);
     30}
    2731
    2832audio {

  • trunk/Source/WebCore/html/MediaDocument.cpp

    r95919 r104278  
    7474    RefPtr<Element> rootElement = document()->createElement(htmlTag, false);
    7575    document()->appendChild(rootElement, ec);
     76    document()->setCSSTarget(rootElement.get());
    7677    static_cast<HTMLHtmlElement*>(rootElement.get())->insertedByParser();
    7778
    … …  
    8081       
    8182    RefPtr<Element> body = document()->createElement(bodyTag, false);
    82     body->setAttribute(styleAttr, "background-color: rgb(38,38,38);");
    83 
    8483    rootElement->appendChild(body, ec);
    85        
     84
    8685    RefPtr<Element> mediaElement = document()->createElement(videoTag, false);
    87        
     86
    8887    m_mediaElement = static_cast<HTMLVideoElement*>(mediaElement.get());
    8988    m_mediaElement->setAttribute(controlsAttr, "");
    9089    m_mediaElement->setAttribute(autoplayAttr, "");
    91     m_mediaElement->setAttribute(styleAttr, "margin: auto; position: absolute; top: 0; right: 0; bottom: 0; left: 0;");
    9290
    9391    m_mediaElement->setAttribute(nameAttr, "media");
Note: See TracChangeset for help on using the changeset viewer.