Switch to a single merged version of WebThemeEngine.h

public/platform/WebThemeEngine.h

Index: public/platform/WebThemeEngine.h
diff --git a/public/platform/default/WebThemeEngine.h b/public/platform/WebThemeEngine.h
similarity index 81%
rename from public/platform/default/WebThemeEngine.h
rename to public/platform/WebThemeEngine.h
index f8a1e75483567a9d43671b2e69380e8facee0a34..74a433ab7850850d9a631f2c25d337d220834e2d 100644
--- a/public/platform/default/WebThemeEngine.h
+++ b/public/platform/WebThemeEngine.h
@@ -31,16 +31,59 @@
 #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. We need to merge the Apple and non-Apple implementations.
+
 class WebThemeEngine {
 public:
+    // The current state of the associated Part.
+    enum State {
+        StateDisabled,
+        StateNormal,
+        StateInactive, // Apple-specific
+        StateActive, // Apple-specific
+        StateHover, // non-Apple
+        StatePressed, // non-Apple

[jamesr, 2014/02/06 01:10:53]

iirc, StatePressed existed in both of the pre-merging enums

[Dirk Pranke, 2014/02/07 00:20:08]

right you are.

+        StateFocused, // non-Apple
+        StateReadonly, // non-Apple
+    };
+
+    // FIXME: The next section describes stuff only used on the Apple port.
+    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&) { }
+
+    // FIXME: The remaining definitions are only used on the non-Apple ports.
+
     // The UI part which is being accessed.
     enum Part {
         // ScrollbarTheme parts
@@ -66,15 +109,6 @@ public:
         PartProgressBar
     };
 
-    // The current state of the associated Part.
-    enum State {
-        StateDisabled,
-        StateHover,
-        StateNormal,
-        StatePressed,
-        StateFocused,
-        StateReadonly,
-    };
 
     // Extra parameters for drawing the PartScrollbarHorizontalTrack and
     // PartScrollbarVerticalTrack.