Changeset 36869 in webkit
- Timestamp:
- Sep 24, 2008 2:45:19 PM (16 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r36868 r36869 1 1 2008-09-24 David Hyatt <hyatt@apple.com> 2 3 https://bugs.webkit.org/show_bug.cgi?id=21074 2 4 3 5 Make sure the viewless scrollbar knows how to paint properly when transformed. -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r36816 r36869 3885 3885 BC8243E80D0CFD7500460C8F /* WindowFeatures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8243E60D0CFD7500460C8F /* WindowFeatures.cpp */; }; 3886 3886 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 */; };3889 3887 BC8B853E0E7C7F1100AB6984 /* ScrollbarThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8B853C0E7C7F1100AB6984 /* ScrollbarThemeMac.h */; }; 3890 3888 BC8B854B0E7C7F5600AB6984 /* ScrollbarTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8B854A0E7C7F5600AB6984 /* ScrollbarTheme.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 8412 8410 BC8243E60D0CFD7500460C8F /* WindowFeatures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFeatures.cpp; sourceTree = "<group>"; }; 8413 8411 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>"; };8416 8412 BC8B853C0E7C7F1100AB6984 /* ScrollbarThemeMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarThemeMac.h; sourceTree = "<group>"; }; 8417 8413 BC8B854A0E7C7F5600AB6984 /* ScrollbarTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarTheme.h; sourceTree = "<group>"; }; … … 9380 9376 children = ( 9381 9377 BCEF869E0E844E9D00A85CD5 /* ScrollbarThemeMac.mm */, 9382 BC84B13F0E80A16D00841D6D /* ScrollbarMac.h */,9383 BC84B1400E80A16D00841D6D /* ScrollbarMac.mm */,9384 9378 51E1ECAD0C91C54600DC255B /* AutodrainedPool.mm */, 9385 9379 65A640F00533BB1F0085E777 /* BlockExceptions.h */, … … 15826 15820 BC8B853E0E7C7F1100AB6984 /* ScrollbarThemeMac.h in Headers */, 15827 15821 BC8B854B0E7C7F5600AB6984 /* ScrollbarTheme.h in Headers */, 15828 BC84B1410E80A16D00841D6D /* ScrollbarMac.h in Headers */,15829 15822 BC5EB5DB0E81B7EA00B25965 /* BorderValue.h in Headers */, 15830 15823 BC5EB5DD0E81B8DD00B25965 /* OutlineValue.h in Headers */, … … 17676 17669 29FFBB820E7C5A3D00407730 /* AccessibilityList.cpp in Sources */, 17677 17670 54C50F7B0E801DF3009832A0 /* XMLTokenizerLibxml2.cpp in Sources */, 17678 BC84B1420E80A16D00841D6D /* ScrollbarMac.mm in Sources */,17679 17671 BC5EB5E70E81BFEF00B25965 /* StyleSurroundData.cpp in Sources */, 17680 17672 BC5EB67D0E81D42000B25965 /* StyleBoxData.cpp in Sources */, -
trunk/WebCore/platform/Scrollbar.cpp
r36860 r36869 42 42 namespace WebCore { 43 43 44 #if ! USE(NSSCROLLER) && !PLATFORM(GTK)44 #if !PLATFORM(GTK) 45 45 PassRefPtr<Scrollbar> Scrollbar::createNativeScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize size) 46 46 { -
trunk/WebCore/platform/Scrollbar.h
r36621 r36869 46 46 #define PAGE_KEEP 40 47 47 48 #if PLATFORM(MAC)49 #define WTF_USE_NSSCROLLER 150 #endif51 52 48 class Scrollbar : public Widget, public RefCounted<Scrollbar> { 53 49 protected: … … 57 53 virtual ~Scrollbar(); 58 54 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. 61 56 static PassRefPtr<Scrollbar> createNativeScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize size); 62 57 -
trunk/WebCore/platform/ScrollbarThemeComposite.h
r36777 r36869 28 28 29 29 #include "ScrollbarTheme.h" 30 #include "Scrollbar.h" // FIXME: Temporary.31 30 32 31 namespace WebCore { -
trunk/WebCore/platform/mac/ScrollbarThemeMac.h
r36860 r36869 28 28 29 29 #include "ScrollbarThemeComposite.h" 30 #include "Scrollbar.h"31 30 32 31 namespace WebCore { … … 48 47 virtual ScrollbarButtonsPlacement buttonsPlacement() const; 49 48 50 #if !USE(NSSCROLLER)51 49 virtual void registerScrollbar(Scrollbar*); 52 50 virtual void unregisterScrollbar(Scrollbar*); 53 #endif54 51 55 52 protected: -
trunk/WebCore/platform/mac/ScrollbarThemeMac.mm
r36868 r36869 43 43 using namespace WebCore; 44 44 45 #if !USE(NSSCROLLER)46 45 static HashSet<Scrollbar*>* gScrollbars; 47 46 … … 79 78 80 79 @end 81 #endif82 80 83 81 namespace WebCore { … … 106 104 static ScrollbarButtonsPlacement gButtonPlacement = ScrollbarButtonsDoubleEnd; 107 105 108 #if !USE(NSSCROLLER)109 106 static void updateArrowPlacement() 110 107 { … … 136 133 } 137 134 138 #endif139 140 135 ScrollbarThemeMac::ScrollbarThemeMac() 141 136 { 142 #if !USE(NSSCROLLER)143 137 static bool initialized; 144 138 if (!initialized) { … … 147 141 preferencesChanged(); 148 142 } 149 #endif150 143 } 151 144 … … 156 149 void ScrollbarThemeMac::preferencesChanged() 157 150 { 158 #if !USE(NSSCROLLER)159 151 updateArrowPlacement(); 160 152 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; … … 163 155 gAutoscrollButtonDelay = [defaults floatForKey:@"NSScrollerButtonPeriod"]; 164 156 gJumpOnTrackClick = [defaults boolForKey:@"AppleScrollerPagingBehavior"]; 165 #endif166 157 } 167 158 … … 341 332 } 342 333 343 #if !USE(NSSCROLLER)344 334 static int scrollbarPartToHIPressedState(ScrollbarPart part) 345 335 { … … 359 349 } 360 350 } 361 #endif362 351 363 352 bool ScrollbarThemeMac::paint(Scrollbar* scrollbar, GraphicsContext* context, const IntRect& damageRect) 364 353 { 365 #if !USE(NSSCROLLER)366 354 HIThemeTrackDrawInfo trackInfo; 367 355 trackInfo.version = 0; … … 406 394 407 395 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.