Changeset 93356 in webkit


Ignore:
Timestamp:
Aug 18, 2011 3:14:23 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Chromium: Update forked ScrollbarThemeChromiumMac.mm
​https://bugs.webkit.org/show_bug.cgi?id=65555

Patch by Sailesh Agrawal <​sail@chromium.org> on 2011-08-18
Reviewed by James Robinson.

Source/WebCore:

Merge recent changes to ScrollbarThemeMac.mm to ScrollbarThemeChromiumMac.mm.

  • platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
  • platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm:

(wkScrollbarPainterSetEnabled):

  • platform/chromium/ScrollbarThemeChromiumMac.h:

(WebCore::ScrollbarThemeChromiumMac::maxOverlapBetweenPages):

  • platform/chromium/ScrollbarThemeChromiumMac.mm:

(WebCore::ScrollbarThemeChromiumMac::registerScrollbar):
(WebCore::ScrollbarThemeChromiumMac::setNewPainterForScrollbar):
(WebCore::toScrollbarPainterKnobStyle):
(WebCore::ScrollbarThemeChromiumMac::updateScrollbarOverlayStyle):
(WebCore::ScrollbarThemeChromiumMac::updateEnabledState):
(WebCore::ScrollbarThemeChromiumMac::paint):

LayoutTests:

Removing the chromium-cg-mac version of the expectation file since it now matches the mac one.

  • platform/chromium-cg-mac/fast/events/scrollbar-double-click-expected.txt: Removed.
Location:
trunk
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r93354 r93356  
     12011-08-18  Sailesh Agrawal  <sail@chromium.org>
     2
     3        Chromium: Update forked ScrollbarThemeChromiumMac.mm
     4        https://bugs.webkit.org/show_bug.cgi?id=65555
     5
     6        Reviewed by James Robinson.
     7
     8        Removing the chromium-cg-mac version of the expectation file since it now matches the mac one.
     9
     10        * platform/chromium-cg-mac/fast/events/scrollbar-double-click-expected.txt: Removed.
     11
    1122011-08-18  Justin Novosad  <junov@chromium.org>
    213

  • trunk/Source/WebCore/ChangeLog

    r93354 r93356  
     12011-08-18  Sailesh Agrawal  <sail@chromium.org>
     2
     3        Chromium: Update forked ScrollbarThemeChromiumMac.mm
     4        https://bugs.webkit.org/show_bug.cgi?id=65555
     5
     6        Reviewed by James Robinson.
     7
     8        Merge recent changes to ScrollbarThemeMac.mm to ScrollbarThemeChromiumMac.mm.
     9
     10        * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
     11        * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm:
     12        (wkScrollbarPainterSetEnabled):
     13        * platform/chromium/ScrollbarThemeChromiumMac.h:
     14        (WebCore::ScrollbarThemeChromiumMac::maxOverlapBetweenPages):
     15        * platform/chromium/ScrollbarThemeChromiumMac.mm:
     16        (WebCore::ScrollbarThemeChromiumMac::registerScrollbar):
     17        (WebCore::ScrollbarThemeChromiumMac::setNewPainterForScrollbar):
     18        (WebCore::toScrollbarPainterKnobStyle):
     19        (WebCore::ScrollbarThemeChromiumMac::updateScrollbarOverlayStyle):
     20        (WebCore::ScrollbarThemeChromiumMac::updateEnabledState):
     21        (WebCore::ScrollbarThemeChromiumMac::paint):
     22
    1232011-08-18  Justin Novosad  <junov@chromium.org>
    224

  • trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h

    r92343 r93356  
    6767int wkScrollbarMinimumThumbLength(WKScrollbarPainterRef);
    6868void wkScrollbarPainterSetDelegate(WKScrollbarPainterRef, id scrollbarPainterDelegate);
     69void wkScrollbarPainterSetEnabled(WKScrollbarPainterRef, bool enabled);
    6970CGFloat wkScrollbarPainterTrackAlpha(WKScrollbarPainterRef);
    7071WKScrollbarPainterRef wkMakeScrollbarPainter(int controlSize, bool isHorizontal);

  • trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm

    r93202 r93356  
    193193}
    194194
     195void wkScrollbarPainterSetEnabled(WKScrollbarPainterRef painter, bool enabled)
     196{
     197    [painter setEnabled:enabled];
     198}
     199
    195200CGFloat wkScrollbarPainterTrackAlpha(WKScrollbarPainterRef painter)
    196201{

  • trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h

    r93136 r93356  
    4343    void preferencesChanged();
    4444
     45    virtual void updateEnabledState(Scrollbar*);
     46
    4547    virtual bool paint(Scrollbar*, GraphicsContext* context, const IntRect& damageRect);
    4648
    … …  
    4951    virtual bool supportsControlTints() const { return true; }
    5052    virtual bool usesOverlayScrollbars() const;
     53    virtual void updateScrollbarOverlayStyle(Scrollbar*);
    5154
    5255    virtual double initialAutoscrollTimerDelay();
    … …  
    7174    virtual IntRect trackRect(Scrollbar*, bool painting = false);
    7275
     76    virtual int maxOverlapBetweenPages() { return 40; }
     77
    7378    virtual int minimumThumbLength(Scrollbar*);
    7479

  • trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm

    r93343 r93356  
    174174    WKScrollbarPainterRef scrollbarPainter = wkMakeScrollbarPainter(scrollbar->controlSize(), isHorizontal);
    175175    scrollbarMap()->add(scrollbar, scrollbarPainter);
     176    updateEnabledState(scrollbar);
     177    updateScrollbarOverlayStyle(scrollbar);
    176178}
    177179
    … …  
    184186{
    185187    scrollbarMap()->set(scrollbar, newPainter);
     188    updateEnabledState(scrollbar);
     189    updateScrollbarOverlayStyle(scrollbar);
    186190}
    187191
    … …  
    249253    else
    250254        return false;
     255}
     256
     257static inline wkScrollerKnobStyle toScrollbarPainterKnobStyle(ScrollbarOverlayStyle style)
     258{
     259    switch (style) {
     260    case ScrollbarOverlayStyleDark:
     261        return wkScrollerKnobStyleDark;
     262    case ScrollbarOverlayStyleLight:
     263        return wkScrollerKnobStyleLight;
     264    default:
     265        return wkScrollerKnobStyleDefault;
     266    }
     267}
     268
     269void ScrollbarThemeChromiumMac::updateScrollbarOverlayStyle(Scrollbar* scrollbar)
     270{
     271    if (isScrollbarOverlayAPIAvailable()) {
     272        wkSetScrollbarPainterKnobStyle(painterForScrollbar(scrollbar), toScrollbarPainterKnobStyle(scrollbar->scrollableArea()->scrollbarOverlayStyle()));
     273    }
    251274}
    252275
    … …  
    455478}
    456479
    457 static inline wkScrollerKnobStyle toScrollbarPainterKnobStyle(ScrollbarOverlayStyle style)
    458 {
    459     switch (style) {
    460     case ScrollbarOverlayStyleDark:
    461         return wkScrollerKnobStyleDark;
    462     case ScrollbarOverlayStyleLight:
    463         return wkScrollerKnobStyleLight;
    464     default:
    465         return wkScrollerKnobStyleDefault;
    466     }
    467 }
    468 
    469480static PlatformBridge::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar)
    470481{
    … …  
    477488
    478489    return PlatformBridge::StateActive;
     490}
     491
     492void ScrollbarThemeChromiumMac::updateEnabledState(Scrollbar* scrollbar)
     493{
     494    if (isScrollbarOverlayAPIAvailable()) {
     495        wkScrollbarPainterSetEnabled(scrollbarMap()->get(scrollbar).get(), scrollbar->enabled());
     496    }
    479497}
    480498
    … …  
    508526        scrollAnimator->setIsDrawingIntoLayer(false);
    509527#endif
    510 
    511         wkSetScrollbarPainterKnobStyle(painterForScrollbar(scrollbar), toScrollbarPainterKnobStyle(scrollbar->scrollableArea()->scrollbarOverlayStyle()));
    512528
    513529        GraphicsContextStateSaver stateSaver(*context);
Note: See TracChangeset for help on using the changeset viewer.