Title: [121212] trunk/Source
Revision
121212
Author
[email protected]
Date
2012-06-25 18:57:37 -0700 (Mon, 25 Jun 2012)

Log Message

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 <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/Source/Platform/ChangeLog (121211 => 121212)


--- trunk/Source/Platform/ChangeLog	2012-06-26 01:49:11 UTC (rev 121211)
+++ trunk/Source/Platform/ChangeLog	2012-06-26 01:57:37 UTC (rev 121212)
@@ -1,3 +1,16 @@
+2012-06-25  Sheriff Bot  <[email protected]>
+
+        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  <[email protected]>
 
         [chromium] Use WebGraphicsContext3D in compositor implementation

Modified: trunk/Source/Platform/chromium/public/win/WebThemeEngine.h (121211 => 121212)


--- trunk/Source/Platform/chromium/public/win/WebThemeEngine.h	2012-06-26 01:49:11 UTC (rev 121211)
+++ trunk/Source/Platform/chromium/public/win/WebThemeEngine.h	2012-06-26 01:57:37 UTC (rev 121212)
@@ -83,10 +83,6 @@
     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

Modified: trunk/Source/WebCore/ChangeLog (121211 => 121212)


--- trunk/Source/WebCore/ChangeLog	2012-06-26 01:49:11 UTC (rev 121211)
+++ trunk/Source/WebCore/ChangeLog	2012-06-26 01:57:37 UTC (rev 121212)
@@ -1,3 +1,18 @@
+2012-06-25  Sheriff Bot  <[email protected]>
+
+        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  <[email protected]>
 
         [Shadow] Deleting list distributed to Shadow DOM does not work correctly.

Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (121211 => 121212)


--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h	2012-06-26 01:49:11 UTC (rev 121211)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h	2012-06-26 01:57:37 UTC (rev 121212)
@@ -186,7 +186,6 @@
         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,

Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp (121211 => 121212)


--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp	2012-06-26 01:49:11 UTC (rev 121211)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp	2012-06-26 01:57:37 UTC (rev 121212)
@@ -250,15 +250,13 @@
 
     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;

Modified: trunk/Source/WebKit/chromium/ChangeLog (121211 => 121212)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-06-26 01:49:11 UTC (rev 121211)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-06-26 01:57:37 UTC (rev 121212)
@@ -1,3 +1,15 @@
+2012-06-25  Sheriff Bot  <[email protected]>
+
+        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  <[email protected]>
 
         Fix progress load reporting for MHTML documents.

Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (121211 => 121212)


--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp	2012-06-26 01:49:11 UTC (rev 121211)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp	2012-06-26 01:57:37 UTC (rev 121212)
@@ -442,11 +442,6 @@
         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(
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to