Unreviewed, rolling out r121176.

http://trac.webkit.org/changeset/121176
https://bugs.webkit.org/show_bug.cgi?id=89934

[chromium] browser_tests assert failed:
FATAL:native_theme_win.cc(1541)] Check failed: false. Invalid
part: 16 (Requested by ukai on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-06-25

Source/Platform:

* chromium/public/win/WebThemeEngine.h:
(WebKit::WebThemeEngine::paintProgressBar):

Source/WebCore:

* platform/chromium/PlatformSupport.h:
(PlatformSupport):
* platform/chromium/ScrollbarThemeChromiumWin.cpp:
(WebCore::ScrollbarThemeChromiumWin::buttonSize):

Source/WebKit/chromium:

* src/PlatformSupport.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121212 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog
index 5a762fa..a6514ef 100644 (file)
--- a/Source/Platform/ChangeLog
+++ b/Source/Platform/ChangeLog
@@ -1,3 +1,16 @@
+2012-06-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r121176.
+        http://trac.webkit.org/changeset/121176
+        https://bugs.webkit.org/show_bug.cgi?id=89934
+
+        [chromium] browser_tests assert failed:
+        FATAL:native_theme_win.cc(1541)] Check failed: false. Invalid
+        part: 16 (Requested by ukai on #webkit).
+
+        * chromium/public/win/WebThemeEngine.h:
+        (WebKit::WebThemeEngine::paintProgressBar):
+
 2012-06-25  James Robinson  <jamesr@chromium.org>
 
         [chromium] Use WebGraphicsContext3D in compositor implementation

diff --git a/Source/Platform/chromium/public/win/WebThemeEngine.h b/Source/Platform/chromium/public/win/WebThemeEngine.h
index 6182569..d881d7a 100644 (file)
--- a/Source/Platform/chromium/public/win/WebThemeEngine.h
+++ b/Source/Platform/chromium/public/win/WebThemeEngine.h
@@ -83,10 +83,6 @@ public:
     virtual void paintProgressBar(
         WebCanvas*, const WebRect& barRect, const WebRect& valueRect,
         bool determinate, double animatedSeconds) { }
-
-    // Get dimensions of a particular part. Only supports SBP_ARROWBTN
-    // currently.
-    virtual WebSize getSize(int part) = 0;
 };
 
 } // namespace WebKit

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4c54d17..22185d2 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-06-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r121176.
+        http://trac.webkit.org/changeset/121176
+        https://bugs.webkit.org/show_bug.cgi?id=89934
+
+        [chromium] browser_tests assert failed:
+        FATAL:native_theme_win.cc(1541)] Check failed: false. Invalid
+        part: 16 (Requested by ukai on #webkit).
+
+        * platform/chromium/PlatformSupport.h:
+        (PlatformSupport):
+        * platform/chromium/ScrollbarThemeChromiumWin.cpp:
+        (WebCore::ScrollbarThemeChromiumWin::buttonSize):
+
 2012-06-25  Shinya Kawanaka  <shinyak@chromium.org>
 
         [Shadow] Deleting list distributed to Shadow DOM does not work correctly.

diff --git a/Source/WebCore/platform/chromium/PlatformSupport.h b/Source/WebCore/platform/chromium/PlatformSupport.h
index 3829853..f4e5ce5 100644 (file)
--- a/Source/WebCore/platform/chromium/PlatformSupport.h
+++ b/Source/WebCore/platform/chromium/PlatformSupport.h
@@ -186,7 +186,6 @@ public:
         GraphicsContext*, int part, int state, int classicState, const IntRect&);
     static void paintProgressBar(
         GraphicsContext*, const IntRect& barRect, const IntRect& valueRect, bool determinate, double animatedSeconds);
-    static IntSize getThemePartSize(int part);
 #elif OS(DARWIN)
     enum ThemePaintState {
         StateDisabled,

diff --git a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp
index e526df6..a081983 100644 (file)
--- a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp
+++ b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp
@@ -250,15 +250,13 @@ IntSize ScrollbarThemeChromiumWin::buttonSize(ScrollbarThemeClient* scrollbar)
 
     int thickness = scrollbarThickness(scrollbar->controlSize());
 
-    int standardGirth = PlatformSupport::getThemePartSize(SBP_ARROWBTN).height();
-
     // In layout test mode, we force the button "girth" (i.e., the length of
     // the button along the axis of the scrollbar) to be a fixed size.
     // FIXME: This is retarded!  scrollbarThickness is already fixed in layout
     // test mode so that should be enough to result in repeatable results, but
     // preserving this hack avoids having to rebaseline pixel tests.
     const int kLayoutTestModeGirth = 17;
-    int girth = PlatformSupport::layoutTestMode() ? kLayoutTestModeGirth : standardGirth;
+    int girth = PlatformSupport::layoutTestMode() ? kLayoutTestModeGirth : thickness;
 
     if (scrollbar->orientation() == HorizontalScrollbar) {
         int width = scrollbar->width() < 2 * girth ? scrollbar->width() / 2 : girth;

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index eab8c46..9a5d18f 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2012-06-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r121176.
+        http://trac.webkit.org/changeset/121176
+        https://bugs.webkit.org/show_bug.cgi?id=89934
+
+        [chromium] browser_tests assert failed:
+        FATAL:native_theme_win.cc(1541)] Check failed: false. Invalid
+        part: 16 (Requested by ukai on #webkit).
+
+        * src/PlatformSupport.cpp:
+
 2012-06-25  Jay Civelli  <jcivelli@chromium.org>
 
         Fix progress load reporting for MHTML documents.

diff --git a/Source/WebKit/chromium/src/PlatformSupport.cpp b/Source/WebKit/chromium/src/PlatformSupport.cpp
index 4f0adcb..94b26f0 100644 (file)
--- a/Source/WebKit/chromium/src/PlatformSupport.cpp
+++ b/Source/WebKit/chromium/src/PlatformSupport.cpp
@@ -442,11 +442,6 @@ void PlatformSupport::paintProgressBar(
         gc->platformContext()->canvas(), barRect, valueRect, determinate, animatedSeconds);
 }
 
-IntSize PlatformSupport::getThemePartSize(int part)
-{
-    return WebKit::Platform::current()->themeEngine()->getSize(part);
-}
-
 #elif OS(DARWIN)
 
 void PlatformSupport::paintScrollbarThumb(