Changeset 36869 in webkit


Ignore:
Timestamp:
Sep 24, 2008 2:45:19 PM (16 years ago)
Author:
hyatt@apple.com
Message:

2008-09-24 David Hyatt <​hyatt@apple.com>

​https://bugs.webkit.org/show_bug.cgi?id=21074

Make sure the viewless scrollbar knows how to paint properly when transformed.

Reviewed by Sam Weinig

  • platform/mac/ScrollbarThemeMac.mm: (WebCore::ScrollbarThemeMac::ScrollbarThemeMac): (WebCore::ScrollbarThemeMac::paint):
Location:
trunk/WebCore
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r36868 r36869  
    112008-09-24  David Hyatt  <hyatt@apple.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=21074
    24
    35        Make sure the viewless scrollbar knows how to paint properly when transformed.

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r36816 r36869  
    38853885                BC8243E80D0CFD7500460C8F /* WindowFeatures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8243E60D0CFD7500460C8F /* WindowFeatures.cpp */; };
    38863886                BC8243E90D0CFD7500460C8F /* WindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8243E70D0CFD7500460C8F /* WindowFeatures.h */; settings = {ATTRIBUTES = (Private, ); }; };
    3887                 BC84B1410E80A16D00841D6D /* ScrollbarMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC84B13F0E80A16D00841D6D /* ScrollbarMac.h */; };
    3888                 BC84B1420E80A16D00841D6D /* ScrollbarMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC84B1400E80A16D00841D6D /* ScrollbarMac.mm */; };
    38893887                BC8B853E0E7C7F1100AB6984 /* ScrollbarThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8B853C0E7C7F1100AB6984 /* ScrollbarThemeMac.h */; };
    38903888                BC8B854B0E7C7F5600AB6984 /* ScrollbarTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8B854A0E7C7F5600AB6984 /* ScrollbarTheme.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    84128410                BC8243E60D0CFD7500460C8F /* WindowFeatures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFeatures.cpp; sourceTree = "<group>"; };
    84138411                BC8243E70D0CFD7500460C8F /* WindowFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowFeatures.h; sourceTree = "<group>"; };
    8414                 BC84B13F0E80A16D00841D6D /* ScrollbarMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarMac.h; sourceTree = "<group>"; };
    8415                 BC84B1400E80A16D00841D6D /* ScrollbarMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollbarMac.mm; sourceTree = "<group>"; };
    84168412                BC8B853C0E7C7F1100AB6984 /* ScrollbarThemeMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarThemeMac.h; sourceTree = "<group>"; };
    84178413                BC8B854A0E7C7F5600AB6984 /* ScrollbarTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarTheme.h; sourceTree = "<group>"; };
    … …  
    93809376                        children = (
    93819377                                BCEF869E0E844E9D00A85CD5 /* ScrollbarThemeMac.mm */,
    9382                                 BC84B13F0E80A16D00841D6D /* ScrollbarMac.h */,
    9383                                 BC84B1400E80A16D00841D6D /* ScrollbarMac.mm */,
    93849378                                51E1ECAD0C91C54600DC255B /* AutodrainedPool.mm */,
    93859379                                65A640F00533BB1F0085E777 /* BlockExceptions.h */,
    … …  
    1582615820                                BC8B853E0E7C7F1100AB6984 /* ScrollbarThemeMac.h in Headers */,
    1582715821                                BC8B854B0E7C7F5600AB6984 /* ScrollbarTheme.h in Headers */,
    15828                                 BC84B1410E80A16D00841D6D /* ScrollbarMac.h in Headers */,
    1582915822                                BC5EB5DB0E81B7EA00B25965 /* BorderValue.h in Headers */,
    1583015823                                BC5EB5DD0E81B8DD00B25965 /* OutlineValue.h in Headers */,
    … …  
    1767617669                                29FFBB820E7C5A3D00407730 /* AccessibilityList.cpp in Sources */,
    1767717670                                54C50F7B0E801DF3009832A0 /* XMLTokenizerLibxml2.cpp in Sources */,
    17678                                 BC84B1420E80A16D00841D6D /* ScrollbarMac.mm in Sources */,
    1767917671                                BC5EB5E70E81BFEF00B25965 /* StyleSurroundData.cpp in Sources */,
    1768017672                                BC5EB67D0E81D42000B25965 /* StyleBoxData.cpp in Sources */,

  • trunk/WebCore/platform/Scrollbar.cpp

    r36860 r36869  
    4242namespace WebCore {
    4343
    44 #if !USE(NSSCROLLER) && !PLATFORM(GTK)
     44#if !PLATFORM(GTK)
    4545PassRefPtr<Scrollbar> Scrollbar::createNativeScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize size)
    4646{

  • trunk/WebCore/platform/Scrollbar.h

    r36621 r36869  
    4646#define PAGE_KEEP   40
    4747
    48 #if PLATFORM(MAC)
    49 #define WTF_USE_NSSCROLLER 1
    50 #endif
    51 
    5248class Scrollbar : public Widget, public RefCounted<Scrollbar> {
    5349protected:
    … …  
    5753    virtual ~Scrollbar();
    5854
    59     // Must be implemented by platforms that can't simply use the Scrollbar base class.  Right now those two platforms
    60     // are Mac and GTK.
     55    // Must be implemented by platforms that can't simply use the Scrollbar base class.  Right now the only platform that is not using the base class is GTK.
    6156    static PassRefPtr<Scrollbar> createNativeScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize size);
    6257   

  • trunk/WebCore/platform/ScrollbarThemeComposite.h

    r36777 r36869  
    2828
    2929#include "ScrollbarTheme.h"
    30 #include "Scrollbar.h" // FIXME: Temporary.
    3130
    3231namespace WebCore {

  • trunk/WebCore/platform/mac/ScrollbarThemeMac.h

    r36860 r36869  
    2828
    2929#include "ScrollbarThemeComposite.h"
    30 #include "Scrollbar.h"
    3130
    3231namespace WebCore {
    … …  
    4847    virtual ScrollbarButtonsPlacement buttonsPlacement() const;
    4948
    50 #if !USE(NSSCROLLER)
    5149    virtual void registerScrollbar(Scrollbar*);
    5250    virtual void unregisterScrollbar(Scrollbar*);
    53 #endif
    5451
    5552protected:

  • trunk/WebCore/platform/mac/ScrollbarThemeMac.mm

    r36868 r36869  
    4343using namespace WebCore;
    4444
    45 #if !USE(NSSCROLLER)
    4645static HashSet<Scrollbar*>* gScrollbars;
    4746
    … …  
    7978
    8079@end
    81 #endif
    8280
    8381namespace WebCore {
    … …  
    106104static ScrollbarButtonsPlacement gButtonPlacement = ScrollbarButtonsDoubleEnd;
    107105
    108 #if !USE(NSSCROLLER)
    109106static void updateArrowPlacement()
    110107{
    … …  
    136133}
    137134
    138 #endif
    139 
    140135ScrollbarThemeMac::ScrollbarThemeMac()
    141136{
    142 #if !USE(NSSCROLLER)
    143137    static bool initialized;
    144138    if (!initialized) {
    … …  
    147141        preferencesChanged();
    148142    }
    149 #endif
    150143}
    151144
    … …  
    156149void ScrollbarThemeMac::preferencesChanged()
    157150{
    158 #if !USE(NSSCROLLER)
    159151    updateArrowPlacement();
    160152    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
    … …  
    163155    gAutoscrollButtonDelay = [defaults floatForKey:@"NSScrollerButtonPeriod"];
    164156    gJumpOnTrackClick = [defaults boolForKey:@"AppleScrollerPagingBehavior"];
    165 #endif
    166157}
    167158
    … …  
    341332}
    342333
    343 #if !USE(NSSCROLLER)
    344334static int scrollbarPartToHIPressedState(ScrollbarPart part)
    345335{
    … …  
    359349    }
    360350}
    361 #endif
    362351
    363352bool ScrollbarThemeMac::paint(Scrollbar* scrollbar, GraphicsContext* context, const IntRect& damageRect)
    364353{
    365 #if !USE(NSSCROLLER)
    366354    HIThemeTrackDrawInfo trackInfo;
    367355    trackInfo.version = 0;
    … …  
    406394
    407395    return true;
    408 #else
    409     return false;
    410 #endif
    411 }
    412 
    413 }
    414 
     396}
     397
     398}
     399
Note: See TracChangeset for help on using the changeset viewer.