Switch to a single merged version of WebThemeEngine.h

public/platform/WebThemeEngine.h

 /*
  * Copyright (C) 2010 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebThemeEngine_h
 #define WebThemeEngine_h
 
-#include "../WebCanvas.h"
-#include "../WebColor.h"
-#include "../WebSize.h"
+#include "WebCanvas.h"
+#include "WebColor.h"
+#include "WebSize.h"
 
 namespace blink {
 
 struct WebRect;
 
+// FIXME: crbug.com/327471. Here and above, we need to merge the Mac and
+// non-Mac implementations.
+
 class WebThemeEngine {
 public:
+    // The current state of the associated Part.
+    enum State {
+        StateDisabled,
+#ifdef __APPLE__

[jamesr, 2014/02/05 20:30:33]

why make these conditional? i think the reasonable thing would be to union these
two sets

[Dirk Pranke, 2014/02/05 21:34:39]

I was a bit concerned that there might be issues w/ the enums getting cast to
ints and-or being order-dependent, but I can scan the code to ensure that things
are safe.

+        StateInactive,
+        StateActive,
+        StatePressed,
+#else
+        StateHover,
+        StateNormal,
+        StatePressed,
+        StateFocused,
+        StateReadonly,
+#endif
+    };
+
+#ifdef __APPLE__

[jamesr, 2014/02/05 20:30:33]

i don't really see any harm in having these defined for non-apple builds as
well, they won't collide with anything

[Dirk Pranke, 2014/02/05 21:34:39]

fair enough, will do.

+    enum Size {
+        SizeRegular,
+        SizeSmall,
+    };
+
+    enum ScrollbarOrientation {
+        ScrollbarOrientationHorizontal,
+        ScrollbarOrientationVertical,
+    };
+
+    enum ScrollbarParent {
+        ScrollbarParentScrollView,
+        ScrollbarParentRenderLayer,
+    };
+
+    struct ScrollbarInfo {
+        ScrollbarOrientation orientation;
+        ScrollbarParent parent;
+        int maxValue;
+        int currentValue;
+        int visibleSize;
+        int totalSize;
+    };
+
+    virtual void paintScrollbarThumb(WebCanvas*, State, Size, const WebRect&, const ScrollbarInfo&) { }
+#else
     // The UI part which is being accessed.
     enum Part {
         // ScrollbarTheme parts
         PartScrollbarDownArrow,
         PartScrollbarLeftArrow,
         PartScrollbarRightArrow,
         PartScrollbarUpArrow,
         PartScrollbarHorizontalThumb,
         PartScrollbarVerticalThumb,
         PartScrollbarHorizontalTrack,
         PartScrollbarVerticalTrack,
         PartScrollbarCorner,
 
         // RenderTheme parts
         PartCheckbox,
         PartRadio,
         PartButton,
         PartTextField,
         PartMenuList,
         PartSliderTrack,
         PartSliderThumb,
         PartInnerSpinButton,
         PartProgressBar
     };
 
-    // The current state of the associated Part.
-    enum State {
-        StateDisabled,
-        StateHover,
-        StateNormal,
-        StatePressed,
-        StateFocused,
-        StateReadonly,
-    };
 
     // Extra parameters for drawing the PartScrollbarHorizontalTrack and
     // PartScrollbarVerticalTrack.
     struct ScrollbarTrackExtraParams {
         bool isBack; // Whether this is the 'back' part or the 'forward' part.
 
         // The bounds of the entire track, as opposed to the part being painted.
         int trackX;
         int trackY;
         int trackWidth;
@@ skipping 57 matching lines @@
         InnerSpinButtonExtraParams innerSpin;
         ProgressBarExtraParams progressBar;
     };
 
     // Gets the size of the given theme part. For variable sized items
     // like vertical scrollbar thumbs, the width will be the required width of
     // the track while the height will be the minimum height.
     virtual WebSize getSize(Part) { return WebSize(); }
     // Paint the given the given theme part.
     virtual void paint(WebCanvas*, Part, State, const WebRect&, const ExtraParams*) { }
+#endif
 };
 
 } // namespace blink
 
 #endif