Changeset 144967 in webkit


Ignore:
Timestamp:
Mar 6, 2013, 12:58:37 PM (12 years ago)
Author:
scherkus@chromium.org
Message:

Merge 144789

REGRESSION(r142191): Fix closed caption buttons for ports still using the painting path.
​https://bugs.webkit.org/show_bug.cgi?id=111109

Reviewed by Eric Carlson.

Source/WebCore:

Covered by following tests:
media/track/track-cue-rendering-horizontal.html
media/track/track-cue-rendering-vertical.html

  • rendering/RenderTheme.cpp:

(WebCore::RenderTheme::paint):

  • rendering/RenderTheme.h:

(WebCore::RenderTheme::paintMediaToggleClosedCaptionsButton):

LayoutTests:

  • platform/chromium/TestExpectations:

TBR=​scherkus@chromium.org
Review URL: ​https://codereview.chromium.org/12463019

Location:
branches/chromium/1410
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/chromium/1410/LayoutTests/platform/chromium/TestExpectations

    r144539 r144967  
    43924392webkit.org/b/97037 media/encrypted-media/encrypted-media-v2-syntax.html [ Timeout ]
    43934393
     4394# Current baselines are incorrect -- needs rebaseline after webkit.org/b/111388 lands.
     4395webkit.org/b/111388 media/track/track-cue-rendering-horizontal.html [ ImageOnlyFailure ]
     4396webkit.org/b/111388 media/track/track-cue-rendering-vertical.html [ ImageOnlyFailure ]

  • branches/chromium/1410/Source/WebCore/rendering/RenderTheme.cpp

    r142191 r144967  
    342342    case MediaReturnToRealtimeButtonPart:
    343343        return paintMediaReturnToRealtimeButton(o, paintInfo, r);
     344    case MediaToggleClosedCaptionsButtonPart:
     345        return paintMediaToggleClosedCaptionsButton(o, paintInfo, r);
    344346    case MediaSliderPart:
    345347        return paintMediaSliderTrack(o, paintInfo, r);

  • branches/chromium/1410/Source/WebCore/rendering/RenderTheme.h

    r142191 r144967  
    339339    virtual bool paintMediaRewindButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
    340340    virtual bool paintMediaReturnToRealtimeButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
     341    virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
    341342    virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
    342343    virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
Note: See TracChangeset for help on using the changeset viewer.