[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mihaip at chromium.org
mihaip at chromium.org
Wed Dec 22 15:37:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8ef75ce987398e1030aa5529932fbef5161ca382
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 15:33:59 2010 +0000
2010-11-09 Mihai Parparita <mihaip at chromium.org>
Unreviewed Chromium Windows build fix.
Add isDisplayNone to the PopupMenuStyle constructor call in
PopupMenuTest (necessary after r71618).
* tests/PopupMenuTest.cpp:
(WebKit::TestPopupMenuClient::itemStyle):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71631 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 2b1c084..7739705 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-09 Mihai Parparita <mihaip at chromium.org>
+
+ Unreviewed Chromium Windows build fix.
+
+ Add isDisplayNone to the PopupMenuStyle constructor call in
+ PopupMenuTest (necessary after r71618).
+
+ * tests/PopupMenuTest.cpp:
+ (WebKit::TestPopupMenuClient::itemStyle):
+
2010-11-09 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/tests/PopupMenuTest.cpp b/WebKit/chromium/tests/PopupMenuTest.cpp
index aef29cf..b68980f 100644
--- a/WebKit/chromium/tests/PopupMenuTest.cpp
+++ b/WebKit/chromium/tests/PopupMenuTest.cpp
@@ -76,7 +76,7 @@ public:
virtual PopupMenuStyle itemStyle(unsigned listIndex) const
{
Font font(FontPlatformData(12.0, false, false), false);
- return PopupMenuStyle(Color::black, Color::white, font, true, Length(), TextDirection());
+ return PopupMenuStyle(Color::black, Color::white, font, true, false, Length(), TextDirection());
}
virtual PopupMenuStyle menuStyle() const { return itemStyle(0); }
virtual int clientInsetLeft() const { return 0; }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list