Changeset 75292 in webkit

Timestamp:

Jan 7, 2011 4:38:42 PM (13 years ago)

Author:

mihaip@chromium.org

Message:

2011-01-07 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Scrollbar code cleanup
​https://bugs.webkit.org/show_bug.cgi?id=52073

Scrollbar code cleanup:

• Remove ScrollbarThemeMac.{mm|h} from the mac sources list, we use ScrollbarThemeChromiumMac.{mm|h}
• Remove USE_WEB_THEME_ENGINE_TO_PAINT_THUMB #define now that switch to WebThemeEngine is permanent
• Fix typo in Linux scrollbar enum name

No new tests (compiles).

• WebCore.gypi:
• platform/chromium/ChromiumBridge.h:
• platform/chromium/ScrollbarThemeChromiumLinux.cpp: (WebCore::ScrollbarThemeChromiumLinux::paintTrackPiece):
• platform/chromium/ScrollbarThemeChromiumMac.mm: (WebCore::scrollbarStateToThemeState): (WebCore::ScrollbarThemeChromiumMac::paint):

2011-01-07 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Scrollbar code cleanup
​https://bugs.webkit.org/show_bug.cgi?id=52073

Scrollbar code cleanup:

• Fix typo in Linux scrollbar enum name

• public/linux/WebThemeEngine.h:
• src/ChromiumBridge.cpp: (WebCore::WebThemePart): (WebCore::GetWebThemeExtraParams):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/platform/chromium/ChromiumBridge.h (modified) (1 diff)
• WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp (modified) (1 diff)
• WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm (modified) (6 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/linux/WebThemeEngine.h (modified) (3 diffs)
• WebKit/chromium/src/ChromiumBridge.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-07  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Scrollbar code cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=52073
+
+        Scrollbar code cleanup:
+        - Remove ScrollbarThemeMac.{mm|h} from the mac sources list, we use
+          ScrollbarThemeChromiumMac.{mm|h}
+        - Remove USE_WEB_THEME_ENGINE_TO_PAINT_THUMB #define now that switch to
+          WebThemeEngine is permanent
+        - Fix typo in Linux scrollbar enum name
+
+        No new tests (compiles).
+
+        * WebCore.gypi:
+        * platform/chromium/ChromiumBridge.h:
+        * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
+        (WebCore::ScrollbarThemeChromiumLinux::paintTrackPiece):
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::scrollbarStateToThemeState):
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
 2011-01-07  Jer Noble  <jer.noble@apple.com>
 

trunk/WebCore/WebCore.gypi

@@ -3082 +3082 @@
             'platform/mac/SchedulePairMac.mm',
             'platform/mac/ScrollViewMac.mm',
-            'platform/mac/ScrollbarThemeMac.h',
-            'platform/mac/ScrollbarThemeMac.mm',
             'platform/mac/SearchPopupMenuMac.h',
             'platform/mac/SearchPopupMenuMac.mm',

trunk/WebCore/platform/chromium/ChromiumBridge.h

@@ -278 +278 @@
             PartScrollbarHorizontalThumb,
             PartScrollbarVerticalThumb,
-            PartScrollbarHoriztonalTrack,
+            PartScrollbarHorizontalTrack,
             PartScrollbarVerticalTrack,
         };

trunk/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp

@@ -62 +62 @@
     ChromiumBridge::paintThemePart(
         gc,
-        scrollbar->orientation() == HorizontalScrollbar ? ChromiumBridge::PartScrollbarHoriztonalTrack : ChromiumBridge::PartScrollbarVerticalTrack,
+        scrollbar->orientation() == HorizontalScrollbar ? ChromiumBridge::PartScrollbarHorizontalTrack : ChromiumBridge::PartScrollbarVerticalTrack,
         state,
         rect,

trunk/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm

@@ -28 +28 @@
 #include "ScrollbarThemeChromiumMac.h"
 
-// FIXME: Remove this (always use WebThemeEngine) once we rebaseline tests
-#define USE_WEB_THEME_ENGINE_TO_PAINT_THUMB 1
-
-#if USE_WEB_THEME_ENGINE_TO_PAINT_THUMB
 #include "ChromiumBridge.h"
 #include "FrameView.h"
-#endif
 #include "ImageBuffer.h"
 #include "PlatformMouseEvent.h"
@@ -55 +50 @@
 // - The classname change from ScrollbarThemeMac to ScrollbarThemeChromiumMac.
 // - In paint() the code to paint the track, tickmarks, and thumb separately.
+// - In paint() the thumb is drawn via ChromeBridge/WebThemeEngine.
 //
 // For all other differences, if it was introduced in this file, then the
@@ -375 +371 @@
 }
 
-#if USE_WEB_THEME_ENGINE_TO_PAINT_THUMB
 static ChromiumBridge::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar) {
     if (!scrollbar->enabled())
@@ -386 +381 @@
     return ChromiumBridge::StateActive;
 }
-#endif // USE_WEB_THEME_ENGINE_TO_PAINT_THUMB
 
 bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* context, const IntRect& damageRect)
@@ -470 +464 @@
 
     if (hasThumb(scrollbar)) {
-#if USE_WEB_THEME_ENGINE_TO_PAINT_THUMB
         ChromiumBridge::ThemePaintScrollbarInfo scrollbarInfo;
         scrollbarInfo.orientation = scrollbar->orientation() == HorizontalScrollbar ? ChromiumBridge::ScrollbarOrientationHorizontal : ChromiumBridge::ScrollbarOrientationVertical;
@@ -485 +478 @@
             scrollbar->frameRect(),
             scrollbarInfo);
-#else
-        trackInfo.attributes |= (kThemeTrackShowThumb | kThemeTrackHideTrack);
-        HIThemeDrawTrack(&trackInfo, 0, drawingContext->platformContext(), kHIThemeOrientationNormal);
-#endif
     }
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-07  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Scrollbar code cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=52073
+
+        Scrollbar code cleanup:
+        - Fix typo in Linux scrollbar enum name
+
+        * public/linux/WebThemeEngine.h:
+        * src/ChromiumBridge.cpp:
+        (WebCore::WebThemePart):
+        (WebCore::GetWebThemeExtraParams):
+
 2011-01-07  James Robinson  <jamesr@chromium.org>
 

trunk/WebKit/chromium/public/linux/WebThemeEngine.h

@@ -40 +40 @@
 struct WebRect;
 
+// FIXME: Remove once webkit/glue/webthemeengine_impl_linux.c has been updated to use the correct spelling.
+#define PartScrollbarHoriztonalTrack PartScrollbarHorizontalTrack
+
 class WebThemeEngine {
 public:
@@ -50 +53 @@
         PartScrollbarHorizontalThumb,
         PartScrollbarVerticalThumb,
-        PartScrollbarHoriztonalTrack,
+        PartScrollbarHorizontalTrack,
         PartScrollbarVerticalTrack
     };
@@ -62 +65 @@
     };
 
-    // Extra parameters for drawing the PartScrollbarHoriztonalTrack and
+    // Extra parameters for drawing the PartScrollbarHorizontalTrack and
     // PartScrollbarVerticalTrack.
     struct ScrollbarTrackExtraParams {

trunk/WebKit/chromium/src/ChromiumBridge.cpp

@@ -804 +804 @@
     case ChromiumBridge::PartScrollbarHorizontalThumb: return WebThemeEngine::PartScrollbarHorizontalThumb;
     case ChromiumBridge::PartScrollbarVerticalThumb: return WebThemeEngine::PartScrollbarVerticalThumb;
-    case ChromiumBridge::PartScrollbarHoriztonalTrack: return WebThemeEngine::PartScrollbarHoriztonalTrack;
+    case ChromiumBridge::PartScrollbarHorizontalTrack: return WebThemeEngine::PartScrollbarHorizontalTrack;
     case ChromiumBridge::PartScrollbarVerticalTrack: return WebThemeEngine::PartScrollbarVerticalTrack;
     }
@@ -825 +825 @@
 static void GetWebThemeExtraParams(ChromiumBridge::ThemePart part, ChromiumBridge::ThemePaintState state, const ChromiumBridge::ThemePaintExtraParams* extraParams, WebThemeEngine::ExtraParams* webThemeExtraParams)
 {
-    if (part == ChromiumBridge::PartScrollbarHoriztonalTrack || part == ChromiumBridge::PartScrollbarVerticalTrack) {
+    if (part == ChromiumBridge::PartScrollbarHorizontalTrack || part == ChromiumBridge::PartScrollbarVerticalTrack) {
         webThemeExtraParams->scrollbarTrack.trackX = extraParams->scrollbarTrack.trackX;
         webThemeExtraParams->scrollbarTrack.trackY = extraParams->scrollbarTrack.trackY;