Changeset 89120 in webkit

Timestamp:

Jun 16, 2011 11:18:19 PM (13 years ago)

Author:

yutak@chromium.org

Message:

2011-06-16 Yuta Kitamura <​yutak@chromium.org>

Unreviewed, rolling out r89073.
​http://trac.webkit.org/changeset/89073
​https://bugs.webkit.org/show_bug.cgi?id=62783

Broke Chromium Clang build.

• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm: (wkScrollbarPainterPaint):
• platform/chromium/ScrollbarThemeChromiumMac.h:
• platform/chromium/ScrollbarThemeChromiumMac.mm: (WebCore::ScrollbarThemeChromiumMac::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h (modified) (1 diff)
• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (modified) (2 diffs)
• platform/chromium/ScrollbarThemeChromiumMac.h (modified) (1 diff)
• platform/chromium/ScrollbarThemeChromiumMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-16  Yuta Kitamura  <yutak@chromium.org>
+
+        Unreviewed, rolling out r89073.
+        http://trac.webkit.org/changeset/89073
+        https://bugs.webkit.org/show_bug.cgi?id=62783
+
+        Broke Chromium Clang build.
+
+        * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
+        * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm:
+        (wkScrollbarPainterPaint):
+        * platform/chromium/ScrollbarThemeChromiumMac.h:
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
 2011-06-16  Jeffrey Pfau  <jpfau@apple.com>
 

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

@@ -58 +58 @@
 void wkScrollbarPainterSetOverlayState(WKScrollbarPainterRef, int overlayScrollerState);
 void wkScrollbarPainterPaint(WKScrollbarPainterRef, bool enabled, double value, CGFloat proportion, NSRect frameRect);
-void wkScrollbarPainterPaintTrack(WKScrollbarPainterRef, bool enabled, double value, CGFloat proportion, NSRect frameRect);
-void wkScrollbarPainterPaintKnob(WKScrollbarPainterRef);
 int wkScrollbarMinimumThumbLength(WKScrollbarPainterRef);
 void wkScrollbarPainterSetDelegate(WKScrollbarPainterRef, id scrollbarPainterDelegate);

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

@@ -153 +153 @@
 void wkScrollbarPainterPaint(WKScrollbarPainterRef painter, bool enabled, double value, CGFloat proportion, NSRect frameRect)
 {
-    wkScrollbarPainterPaintTrack(painter, enabled, value, proportion, frameRect);
-    wkScrollbarPainterPaintKnob(painter);
-}
-
-void wkScrollbarPainterPaintTrack(WKScrollbarPainterRef painter, bool enabled, double value, CGFloat proportion, NSRect frameRect)
-{
     [painter setEnabled:enabled];
     [painter setBoundsSize:frameRect.size];
@@ -171 +165 @@
 
     [painter drawKnobSlotInRect:frameRect highlight:NO];
-}
-
-void wkScrollbarPainterPaintKnob(WKScrollbarPainterRef painter)
-{
     [painter drawKnob];
 }

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

@@ -72 +72 @@
     virtual bool shouldDragDocumentInsteadOfThumb(Scrollbar*, const PlatformMouseEvent&);
 
-    void paintTickmarks(Scrollbar*, GraphicsContext* drawingContext, bool canDrawDirectly, float alpha);
-
 public:
     void preferencesChanged();

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

@@ -480 +480 @@
         context->translate(scrollbar->frameRect().x(), scrollbar->frameRect().y());
         LocalCurrentGraphicsContext localContext(context);
-        WKScrollbarPainterRef scrollbarPainter = scrollbarMap()->get(scrollbar).get();
-        wkScrollbarPainterPaintTrack(scrollbarPainter,
-                                     scrollbar->enabled(),
-                                     value,
-                                     (static_cast<CGFloat>(scrollbar->visibleSize()) - overhang) / scrollbar->totalSize(),
-                                     scrollbar->frameRect());
-        CGFloat trackAlpha = wkScrollbarPainterTrackAlpha(scrollbarPainter);
-        if (trackAlpha >= 0.0)
-            paintTickmarks(scrollbar, context, false, trackAlpha);
-        wkScrollbarPainterPaintKnob(scrollbarPainter);
+        wkScrollbarPainterPaint(scrollbarMap()->get(scrollbar).get(),
+                                scrollbar->enabled(),
+                                value,
+                                (static_cast<CGFloat>(scrollbar->visibleSize()) - overhang) / scrollbar->totalSize(),
+                                scrollbar->frameRect());
 
         scrollAnimator->setIsDrawingIntoLayer(false);
@@ -550 +545 @@
     HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
 
-    paintTickmarks(scrollbar, drawingContext, canDrawDirectly, 1.0);
+    Vector<IntRect> tickmarks;
+    scrollbar->scrollableArea()->getTickmarks(tickmarks);
+    if (scrollbar->orientation() == VerticalScrollbar && tickmarks.size()) {
+        drawingContext->save();
+        drawingContext->setShouldAntialias(false);
+        drawingContext->setStrokeColor(Color(0xCC, 0xAA, 0x00, 0xFF), ColorSpaceDeviceRGB);
+        drawingContext->setFillColor(Color(0xFF, 0xDD, 0x00, 0xFF), ColorSpaceDeviceRGB);
+
+        IntRect thumbArea = trackRect(scrollbar, false);
+        if (!canDrawDirectly) {
+            thumbArea.setX(0);
+            thumbArea.setY(0);
+        }
+        // The ends are rounded and the thumb doesn't go there.
+        thumbArea.inflateY(-thumbArea.width());
+
+        for (Vector<IntRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
+            // Calculate how far down (in %) the tick-mark should appear.
+            const float percent = static_cast<float>(i->y()) / scrollbar->totalSize();
+            if (percent < 0.0 || percent > 1.0)
+              continue;
+
+            // Calculate how far down (in pixels) the tick-mark should appear.
+            const int yPos = static_cast<int>((thumbArea.y() + (thumbArea.height() * percent))) & ~1;
+
+            // Paint.
+            const int indent = 2;
+            FloatRect tickRect(thumbArea.x() + indent, yPos, thumbArea.width() - 2 * indent - 1, 2);
+            drawingContext->fillRect(tickRect);
+            drawingContext->strokeRect(tickRect, 1);
+        }
+
+        drawingContext->restore();
+    }
 
     if (hasThumb(scrollbar)) {
@@ -575 +603 @@
 }
 
-void ScrollbarThemeChromiumMac::paintTickmarks(Scrollbar* scrollbar, GraphicsContext* drawingContext, bool canDrawDirectly, float alpha) {
-    Vector<IntRect> tickmarks;
-    scrollbar->scrollableArea()->getTickmarks(tickmarks);
-    if (scrollbar->orientation() == VerticalScrollbar && tickmarks.size()) {
-        drawingContext->save();
-        drawingContext->setShouldAntialias(false);
-        int alphaInt = 0xFF * alpha;
-        drawingContext->setStrokeColor(Color(0xCC, 0xAA, 0x00, alphaInt), ColorSpaceDeviceRGB);
-        drawingContext->setFillColor(Color(0xFF, 0xDD, 0x00, alphaInt), ColorSpaceDeviceRGB);
-
-        IntRect thumbArea = trackRect(scrollbar, false);
-        if (!canDrawDirectly) {
-            thumbArea.setX(0);
-            thumbArea.setY(0);
-        }
-        // The ends are rounded and the thumb doesn't go there.
-        thumbArea.inflateY(-thumbArea.width());
-
-        for (Vector<IntRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
-            // Calculate how far down (in %) the tick-mark should appear.
-            const float percent = static_cast<float>(i->y()) / scrollbar->totalSize();
-            if (percent < 0.0 || percent > 1.0)
-              continue;
-
-            // Calculate how far down (in pixels) the tick-mark should appear.
-            const int yPos = static_cast<int>((thumbArea.y() + (thumbArea.height() * percent))) & ~1;
-
-            // Paint.
-            const int indent = 2;
-            FloatRect tickRect(thumbArea.x() + indent, yPos, thumbArea.width() - 2 * indent - 1, 2);
-            drawingContext->fillRect(tickRect);
-            drawingContext->strokeRect(tickRect, 1);
-        }
-
-        drawingContext->restore();
-    }
-}
-
-}
+}