Changeset 69311 in webkit

Timestamp:

Oct 7, 2010 8:08:08 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-07 Dave Moore <​davemoore@chromium.org>

Reviewed by Kent Tamura.

Add WebThemeEngine api for chromium/linux
​https://bugs.webkit.org/show_bug.cgi?id=47278
Create new linux specific version of WinThemeEngine.h and move
existing windows specific one to win directory. Keep old top
level file until chromium is updated to use the new ones.

• WebKit.gyp:
• public/WebThemeEngine.h:
• src/ChromiumBridge.cpp:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (3 diffs)
• public/WebThemeEngine.h (modified) (1 diff)
• public/linux/WebThemeEngine.h (copied) (copied from trunk/WebKit/chromium/public/WebThemeEngine.h) (1 diff)
• public/win/WebThemeEngine.h (copied) (copied from trunk/WebKit/chromium/public/WebThemeEngine.h) (3 diffs)
• src/ChromiumBridge.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-07  Dave Moore  <davemoore@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Add WebThemeEngine api for chromium/linux
+        https://bugs.webkit.org/show_bug.cgi?id=47278
+        Create new linux specific version of WinThemeEngine.h and move
+        existing windows specific one to win directory. Keep old top
+        level file until chromium is updated to use the new ones.
+
+        * WebKit.gyp:
+        * public/WebThemeEngine.h:
+        * src/ChromiumBridge.cpp:
+
 2010-10-07  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -97 +97 @@
                 'public/linux/WebFontRenderStyle.h',
                 'public/linux/WebRenderTheme.h',
+                'public/linux/WebThemeEngine.h',
                 'public/x11/WebScreenInfoFactory.h',
                 'public/mac/WebInputEventFactory.h',
@@ -264 +265 @@
                 'public/WebTextInputType.h',
                 'public/WebTextRun.h',
-                'public/WebThemeEngine.h',
                 'public/WebURL.h',
                 'public/WebURLError.h',
@@ -282 +282 @@
                 'public/win/WebSandboxSupport.h',
                 'public/win/WebScreenInfoFactory.h',
+                'public/win/WebThemeEngine.h',
                 'src/ApplicationCacheHost.cpp',
                 'src/ApplicationCacheHostInternal.h',

trunk/WebKit/chromium/public/WebThemeEngine.h

@@ -40 +40 @@
 struct WebSize;
 
+// FIXME: This file has been moved to the win subdirectory as it's entirely
+// windows dependent. Once chromium has been updated to access the file from
+// there this file should be deleted.
 class WebThemeEngine {
 public:

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

@@ -32 +32 @@
 #define WebThemeEngine_h
 
-#include "WebCanvas.h"
-#include "WebColor.h"
+#include "../WebCanvas.h"
+#include "../WebColor.h"
+#include "../WebSize.h"
 
 namespace WebKit {
 
 struct WebRect;
-struct WebSize;
 
 class WebThemeEngine {
 public:
-#ifdef WIN32
-// The part and state parameters correspond to values defined by the
-// Windows Theme API (see
-// http://msdn.microsoft.com/en-us/library/bb773187(VS.85).aspx ).
-// The classicState parameter corresponds to the uState
-// parameter of the Windows DrawFrameControl() function.
-// See the definitions in <vsstyle.h> and <winuser.h>.
-    virtual void paintButton(
-        WebCanvas*, int part, int state, int classicState,
-        const WebRect&) = 0;
+    // The UI part which is being accessed.
+    enum Part {
+        PartScrollbarDownArrow,
+        PartScrollbarLeftArrow,
+        PartScrollbarRightArrow,
+        PartScrollbarUpArrow,
+        PartScrollbarHorizontalThumb,
+        PartScrollbarVerticalThumb,
+        PartScrollbarHoriztonalTrack,
+        PartScrollbarVerticalTrack
+    };
 
-    virtual void paintMenuList(
-        WebCanvas*, int part, int state, int classicState,
-        const WebRect&) = 0;
+    // The current state of the associated Part.
+    enum State {
+        StateDisabled,
+        StateHover,
+        StateNormal,
+        StatePressed,
+    };
 
-    virtual void paintScrollbarArrow(
-        WebCanvas*, int state, int classicState,
-        const WebRect&) = 0;
+    // Extra parameters for drawing the PartScrollbarHoriztonalTrack and
+    // PartScrollbarVerticalTrack.
+    struct ScrollbarTrackExtraParams {
+        // The bounds of the entire track, as opposed to the part being painted.
+        int trackX;
+        int trackY;
+        int trackWidth;
+        int trackHeight;
+    };
 
-    virtual void paintScrollbarThumb(
-        WebCanvas*, int part, int state, int classicState,
-        const WebRect&) = 0;
+    union ExtraParams {
+        ScrollbarTrackExtraParams scrollbarTrack;
+    };
 
-    virtual void paintScrollbarTrack(
-        WebCanvas*, int part, int state, int classicState,
-        const WebRect&, const WebRect& alignRect) = 0;
-
-    virtual void paintSpinButton(
-        WebCanvas*, int part, int state, int classicState,
-        const WebRect&) {}
-
-    virtual void paintTextField(
-        WebCanvas*, int part, int state, int classicState,
-        const WebRect&, WebColor, bool fillContentArea, bool drawEdges) = 0;
-
-    virtual void paintTrackbar(
-        WebCanvas*, int part, int state, int classicState,
-        const WebRect&) = 0;
-
-    virtual void paintProgressBar(
-        WebCanvas*, const WebRect& barRect, const WebRect& valueRect,
-        bool determinate, double animatedSeconds) {}
-
-#endif
+    // 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*) {}
 };
 

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

@@ -32 +32 @@
 #define WebThemeEngine_h
 
-#include "WebCanvas.h"
-#include "WebColor.h"
+#include "../WebCanvas.h"
+#include "../WebColor.h"
+#include "../WebSize.h"
 
 namespace WebKit {
@@ -42 +43 @@
 class WebThemeEngine {
 public:
-#ifdef WIN32
 // The part and state parameters correspond to values defined by the
 // Windows Theme API (see
@@ -84 +84 @@
         WebCanvas*, const WebRect& barRect, const WebRect& valueRect,
         bool determinate, double animatedSeconds) {}
-
-#endif
 };
 

trunk/WebKit/chromium/src/ChromiumBridge.cpp

@@ -64 +64 @@
 #if OS(WINDOWS)
 #include "WebRect.h"
-#include "WebThemeEngine.h"
+#include "win/WebThemeEngine.h"
 #endif