Roll up patch for running layout tests under Aura.

Source/core/platform/ScrollbarThemeGtkOrAura.cpp

 /*
  * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/platform/ScrollbarThemeGtkOrAura.h"
 
 #include "RuntimeEnabledFeatures.h"
 #include "core/platform/ScrollbarThemeOverlay.h"
 #include "core/platform/graphics/GraphicsContext.h"
+#include "platform/LayoutTestSupport.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/scroll/ScrollbarThemeClient.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/default/WebThemeEngine.h"
 
 namespace WebCore {
 
 ScrollbarTheme* ScrollbarTheme::nativeTheme()
 {
     if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
         DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, (10, 0, ScrollbarThemeOverlay::AllowHitTest, Color(128, 128, 128, 192)));
         return &theme;
     }
 
     DEFINE_STATIC_LOCAL(ScrollbarThemeGtkOrAura, theme, ());
     return &theme;
 }
 
 int ScrollbarThemeGtkOrAura::scrollbarThickness(ScrollbarControlSize controlSize)
 {
     // Horiz and Vert scrollbars are the same thickness.
     IntSize scrollbarSize = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalTrack);
     return scrollbarSize.width();
 }
 
 void ScrollbarThemeGtkOrAura::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart partType)
 {
     WebKit::WebThemeEngine::State state = scrollbar->hoveredPart() == partType ? WebKit::WebThemeEngine::StateHover : WebKit::WebThemeEngine::StateNormal;
+
+    if (isRunningLayoutTest()) {
+        if (!scrollbar->enabled())
+            state = WebKit::WebThemeEngine::StateDisabled;
+        else if (scrollbar->hoveredPart() == partType)
+            state = WebKit::WebThemeEngine::StateHot;
+        else if (scrollbar->hoveredPart() != NoPart)
+            state = WebKit::WebThemeEngine::StateHover;
+        else
+            state = WebKit::WebThemeEngine::StateNormal;
+    }
+
     IntRect alignRect = trackRect(scrollbar, false);
     WebKit::WebThemeEngine::ExtraParams extraParams;
     WebKit::WebCanvas* canvas = gc->canvas();
+    extraParams.scrollbarTrack.isBack = (partType == BackTrackPart);
     extraParams.scrollbarTrack.trackX = alignRect.x();
     extraParams.scrollbarTrack.trackY = alignRect.y();
     extraParams.scrollbarTrack.trackWidth = alignRect.width();
     extraParams.scrollbarTrack.trackHeight = alignRect.height();
     WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalTrack : WebKit::WebThemeEngine::PartScrollbarVerticalTrack, state, WebKit::WebRect(rect), &extraParams);
 }
 
 void ScrollbarThemeGtkOrAura::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part)
 {
     WebKit::WebThemeEngine::Part paintPart;
     WebKit::WebThemeEngine::State state = WebKit::WebThemeEngine::StateNormal;
     WebKit::WebCanvas* canvas = gc->canvas();
+
+    if (isRunningLayoutTest()) {
+        if (scrollbar->orientation() == HorizontalScrollbar) {
+            if (part == BackButtonStartPart)
+                paintPart = WebKit::WebThemeEngine::PartScrollbarLeftArrow;
+            else if (part == ForwardButtonEndPart)
+                paintPart = WebKit::WebThemeEngine::PartScrollbarRightArrow;
+            else
+                return;
+        } else {
+            if (part == BackButtonStartPart)
+                paintPart = WebKit::WebThemeEngine::PartScrollbarUpArrow;
+            else if (part == ForwardButtonEndPart)
+                paintPart = WebKit::WebThemeEngine::PartScrollbarDownArrow;
+            else
+                return;
+        }
+
+        if (!scrollbar->enabled()) {
+            state = WebKit::WebThemeEngine::StateDisabled;
+        } else {
+            if (part == scrollbar->pressedPart())
+                state = WebKit::WebThemeEngine::StatePressed;
+            else if (part == scrollbar->hoveredPart())
+                state = WebKit::WebThemeEngine::StateDisabled;
+            else if (NoPart != scrollbar->hoveredPart())
+                state = WebKit::WebThemeEngine::StateHover;
+        }
+        WebKit::Platform::current()->themeEngine()->paint(canvas, paintPart, state, WebKit::WebRect(rect), 0);

[jamesr, 2013/11/06 21:54:09]

how is this code different from the non-testing codepath?

[Dirk Pranke, 2013/11/06 22:29:11]

Are you referring to just lines 123-124, or the whole if block? Lines 123-124
are the same, I copied them here so that we can exit early rather than mixing
flow. I can certainly remove the duplication and put the non-test code in an
else block if you'd prefer.

Generally speaking, I tried to keep the layout test code contiguous with an eye
to moving all of this out into a separate subclass in a future patch. Let me
know if you want me to add comments to indicate that or restructure the code so
that there's fewer duplicated lines instead.

[jamesr, 2013/11/06 23:16:15]

Let's optimize for how the code is in this patch, not how we think it'll be in
the future.  I think it'll be a lot easier to see what needs to be extracted if
the test-only paths are just the parts needed for tests and not duplicates of
parts of the production code.

[Dirk Pranke, 2013/11/06 23:46:38]

Okay, I was pretty sure that keeping all the code together that would need to be
in a subclass would make it easier to extract, but I don't feel strongly one way
or another (I originally wrote it the other way, in fact). So, I will change
this.

+        return;
+    }
+
     bool checkMin = false;
     bool checkMax = false;
     if (scrollbar->orientation() == HorizontalScrollbar) {
         if (part == BackButtonStartPart) {
             paintPart = WebKit::WebThemeEngine::PartScrollbarLeftArrow;
             checkMin = true;
         } else {
             paintPart = WebKit::WebThemeEngine::PartScrollbarRightArrow;
             checkMax = true;
         }
@@ skipping 18 matching lines @@
     WebKit::Platform::current()->themeEngine()->paint(canvas, paintPart, state, WebKit::WebRect(rect), 0);
 }
 
 void ScrollbarThemeGtkOrAura::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect)
 {
     WebKit::WebThemeEngine::State state;
     WebKit::WebCanvas* canvas = gc->canvas();
     if (scrollbar->pressedPart() == ThumbPart)
         state = WebKit::WebThemeEngine::StatePressed;
     else if (scrollbar->hoveredPart() == ThumbPart)
-        state = WebKit::WebThemeEngine::StateHover;
+        state = isRunningLayoutTest() ? WebKit::WebThemeEngine::StateHot : WebKit::WebThemeEngine::StateHover;

[jamesr, 2013/11/06 21:54:09]

i think you should teach the mock WebThemeEngine to correctly handle Hot vs
Hover and not branch in the prod codepath

[Dirk Pranke, 2013/11/06 22:29:11]

I don't think I can. The theme engine is told whether a part is hot or hovered.
To figure out which was which requires context that it doesn't have. I think
perhaps an alternative is to make the non-mock implementations handle both
states and do the right thing, but I was trying to avoid changing any of the
prod implementations.

Generally speaking, there's some cleanup that can be done to restructure the
WebThemeEngine interface to get rid of some of these problems.

[jamesr, 2013/11/06 23:16:15]

It looks like what you want to do is treat StateHover as StateHot when painting
the thumb in layout tests.  What piece of information are you missing in the
WebThemeEngine implementation in order to do that?  Are there ever cases where
we paint a thumb and need to tell the difference in the mock implementation
between the two?  It looks like we're calling directly into WebThemeEngine here.

     else
         state = WebKit::WebThemeEngine::StateNormal;
     WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalThumb : WebKit::WebThemeEngine::PartScrollbarVerticalThumb, state, WebKit::WebRect(rect), 0);
 }
 
 bool ScrollbarThemeGtkOrAura::shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent& evt)
 {
     return (evt.shiftKey() && evt.button() == LeftButton) || (evt.button() == MiddleButton);
 }
 
@@ skipping 14 matching lines @@
     if (scrollbar->orientation() == VerticalScrollbar) {
         IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalThumb);
         return size.height();
     }
 
     IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarHorizontalThumb);
     return size.width();
 }
 
 } // namespace WebCore