[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dglazkov at chromium.org
dglazkov at chromium.org
Wed Dec 22 12:59:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a4fff01e4a2ec52bc849bdabd222456b1a2c6a1c
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 3 20:43:03 2010 +0000
2010-09-03 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by Tony Chang.
[Chromium] Make sure that the width of the menu list is always constant under layout tests.
https://bugs.webkit.org/show_bug.cgi?id=45196
* platform/chromium/drt_expectations.txt: Remove now-passing tests.
2010-09-03 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by Tony Chang.
[Chromium] Make sure that the width of the menu list is always constant under layout tests.
https://bugs.webkit.org/show_bug.cgi?id=45196
* rendering/RenderThemeChromiumWin.cpp:
(WebCore::menuListButtonWidth): Added.
(WebCore::RenderThemeChromiumWin::paintMenuList): Use menuListButtonWidth instead of always
querying system metrics.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66768 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 063ea72..cd8a1b3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-03 Dimitri Glazkov <dglazkov at chromium.org>
+
+ Reviewed by Tony Chang.
+
+ [Chromium] Make sure that the width of the menu list is always constant under layout tests.
+ https://bugs.webkit.org/show_bug.cgi?id=45196
+
+ * platform/chromium/drt_expectations.txt: Remove now-passing tests.
+
2010-09-03 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed.
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index 86ab57b..8972a16 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -389,79 +389,3 @@ BUG_DRT WIN : css2.1/t0905-c414-flt-fit-01-d-g.html = IMAGE+TEXT
BUG_DRT WIN : css2.1/t0905-c5525-fltblck-00-d-ag.html = IMAGE+TEXT
BUG_DRT WIN : css2.1/t0905-c5525-flthw-00-c-g.html = IMAGE+TEXT
BUG_DRT WIN : css2.1/t0905-c5526-flthw-00-c-g.html = IMAGE+TEXT
-BUG_DRT WIN : editing/pasteboard/4641033.html = IMAGE
-BUG_DRT WIN : editing/pasteboard/4944770-1.html = IMAGE
-BUG_DRT WIN : editing/pasteboard/4944770-2.html = IMAGE
-BUG_DRT WIN : editing/pasteboard/select-element-1.html = IMAGE
-BUG_DRT WIN : editing/selection/caret-before-select.html = IMAGE
-BUG_DRT WIN : editing/selection/replaced-boundaries-3.html = IMAGE
-BUG_DRT WIN : editing/selection/select-box.html = IMAGE
-BUG_DRT WIN : editing/selection/select-element-paragraph-boundary.html = IMAGE
-BUG_DRT WIN : fast/block/float/float-avoidance.html = IMAGE
-BUG_DRT WIN : fast/block/margin-collapse/103.html = IMAGE
-BUG_DRT WIN : fast/css/css2-system-fonts.html = IMAGE+TEXT
-BUG_DRT WIN : fast/forms/003.html = IMAGE
-BUG_DRT WIN : fast/forms/004.html = IMAGE
-BUG_DRT WIN : fast/forms/HTMLOptionElement_label01.html = IMAGE
-BUG_DRT WIN : fast/forms/HTMLOptionElement_label02.html = IMAGE
-BUG_DRT WIN : fast/forms/HTMLOptionElement_label03.html = IMAGE
-BUG_DRT WIN : fast/forms/HTMLOptionElement_label04.html = IMAGE
-BUG_DRT WIN : fast/forms/HTMLOptionElement_label06.html = IMAGE
-BUG_DRT WIN : fast/forms/HTMLOptionElement_label07.html = IMAGE
-BUG_DRT WIN : fast/forms/basic-selects.html = IMAGE
-BUG_DRT WIN : fast/forms/control-clip-overflow.html = IMAGE
-BUG_DRT WIN : fast/forms/control-restrict-line-height.html = IMAGE
-BUG_DRT WIN : fast/forms/disabled-select-change-index.html = IMAGE
-BUG_DRT WIN : fast/forms/form-element-geometry.html = IMAGE
-BUG_DRT WIN : fast/forms/menulist-deselect-update.html = IMAGE
-BUG_DRT WIN : fast/forms/menulist-no-overflow.html = IMAGE
-BUG_DRT WIN : fast/forms/menulist-restrict-line-height.html = IMAGE
-BUG_DRT WIN : fast/forms/menulist-separator-painting.html = IMAGE
-BUG_DRT WIN : fast/forms/menulist-style-color.html = IMAGE
-BUG_DRT WIN : fast/forms/menulist-width-change.html = IMAGE
-BUG_DRT WIN : fast/forms/option-script.html = IMAGE
-BUG_DRT WIN : fast/forms/option-strip-whitespace.html = IMAGE
-BUG_DRT WIN : fast/forms/option-text-clip.html = IMAGE
-BUG_DRT WIN : fast/forms/search-styled.html = TEXT
-BUG_DRT WIN : fast/forms/select-align.html = IMAGE
-BUG_DRT WIN : fast/forms/select-baseline.html = IMAGE
-BUG_DRT WIN : fast/forms/select-change-listbox-to-popup.html = IMAGE
-BUG_DRT WIN : fast/forms/select-dirty-parent-pref-widths.html = IMAGE
-BUG_DRT WIN : fast/forms/select-disabled-appearance.html = IMAGE
-BUG_DRT WIN : fast/forms/select-selected.html = IMAGE
-BUG_DRT WIN : fast/forms/select-size.html = IMAGE
-BUG_DRT WIN : fast/forms/select-style.html = IMAGE
-BUG_DRT WIN : fast/forms/stuff-on-my-optgroup.html = IMAGE
-BUG_DRT WIN : fast/gradients/radial-centered.html = IMAGE+TEXT
-BUG_DRT WIN : fast/html/keygen.html = IMAGE
-BUG_DRT WIN : fast/invalid/014.html = IMAGE
-BUG_DRT WIN : fast/multicol/client-rects.html = IMAGE
-BUG_DRT WIN : fast/notifications/notifications-replace.html = TEXT
-BUG_DRT WIN : fast/parser/document-write-option.html = IMAGE
-BUG_DRT WIN : fast/replaced/replaced-breaking-mixture.html = IMAGE
-BUG_DRT WIN : fast/replaced/replaced-breaking.html = IMAGE
-BUG_DRT WIN : fast/replaced/three-selects-break.html = IMAGE
-BUG_DRT WIN : fast/replaced/width100percent-menulist.html = IMAGE
-BUG_DRT WIN : fast/text/atsui-spacing-features.html = IMAGE
-BUG_DRT WIN : fast/text/backslash-to-yen-sign.html = IMAGE+TEXT
-BUG_DRT WIN : fast/text/international/bidi-menulist.html = IMAGE
-BUG_DRT WIN : fast/text/international/bidi-mirror-he-ar.html = IMAGE+TEXT
-BUG_DRT WIN : fast/text/international/hindi-spacing.html = IMAGE
-BUG_DRT WIN : fast/text/international/hindi-whitespace.html = IMAGE
-BUG_DRT WIN : fast/text/international/plane2.html = IMAGE+TEXT
-BUG_DRT WIN : http/tests/local/send-sliced-dragged-file.html = TEXT
-BUG_DRT WIN : http/tests/security/xssAuditor/link-opens-new-window.html = TEXT
-BUG_DRT WIN : svg/batik/text/textFeatures.svg = IMAGE
-BUG_DRT WIN : svg/batik/text/verticalText.svg = IMAGE
-BUG_DRT WIN : svg/custom/text-linking.svg = IMAGE
-BUG_DRT WIN : svg/text/text-intro-05-t.svg = IMAGE
-BUG_DRT WIN : tables/mozilla/bugs/bug1188.html = IMAGE
-BUG_DRT WIN : tables/mozilla/bugs/bug18359.html = IMAGE
-BUG_DRT WIN : tables/mozilla/bugs/bug2479-3.html = IMAGE
-BUG_DRT WIN : tables/mozilla/bugs/bug29326.html = IMAGE
-BUG_DRT WIN : tables/mozilla/bugs/bug33855.html = IMAGE
-BUG_DRT WIN : tables/mozilla/bugs/bug4382.html = IMAGE
-BUG_DRT WIN : tables/mozilla/bugs/bug96334.html = IMAGE
-BUG_DRT WIN : tables/mozilla/core/margins.html = IMAGE
-BUG_DRT WIN : tables/mozilla/dom/tableDom.html = IMAGE
-BUG_DRT WIN : transforms/2d/zoom-menulist.html = IMAGE
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d66088f..52048c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-03 Dimitri Glazkov <dglazkov at chromium.org>
+
+ Reviewed by Tony Chang.
+
+ [Chromium] Make sure that the width of the menu list is always constant under layout tests.
+ https://bugs.webkit.org/show_bug.cgi?id=45196
+
+ * rendering/RenderThemeChromiumWin.cpp:
+ (WebCore::menuListButtonWidth): Added.
+ (WebCore::RenderThemeChromiumWin::paintMenuList): Use menuListButtonWidth instead of always
+ querying system metrics.
+
2010-09-03 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r66732.
diff --git a/WebCore/rendering/RenderThemeChromiumWin.cpp b/WebCore/rendering/RenderThemeChromiumWin.cpp
index 3023798..be670ff 100644
--- a/WebCore/rendering/RenderThemeChromiumWin.cpp
+++ b/WebCore/rendering/RenderThemeChromiumWin.cpp
@@ -56,6 +56,10 @@
namespace WebCore {
+// The standard width for the menu list drop-down button when run under
+// layout test mode. Use the value that's currently captured in most baselines.
+static const int kStandardMenuListButtonWidth = 17;
+
namespace {
class ThemePainter {
public:
@@ -437,6 +441,12 @@ bool RenderThemeChromiumWin::paintSliderThumb(RenderObject* o, const PaintInfo&
return paintSliderTrack(o, i, r);
}
+static int menuListButtonWidth()
+{
+ static int width = ChromiumBridge::layoutTestMode() ? kStandardMenuListButtonWidth : GetSystemMetrics(SM_CXVSCROLL);
+ return width;
+}
+
// Used to paint unstyled menulists (i.e. with the default border)
bool RenderThemeChromiumWin::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& r)
{
@@ -461,7 +471,7 @@ bool RenderThemeChromiumWin::paintMenuList(RenderObject* o, const PaintInfo& i,
// Take padding and border into account. If the MenuList is smaller than
// the size of a button, make sure to shrink it appropriately and not put
// its x position to the left of the menulist.
- const int buttonWidth = GetSystemMetrics(SM_CXVSCROLL);
+ const int buttonWidth = menuListButtonWidth();
int spacingLeft = borderLeft + box->paddingLeft();
int spacingRight = borderRight + box->paddingRight();
int spacingTop = borderTop + box->paddingTop();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list