diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 19:41:24 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 19:41:24 +0000 |
| commit | 3cc5ac1372cff363701c13d2366ee16ca9e73e4b (patch) | |
| tree | c4a06e314c781638dcc4ba9ce468f738b352986a /webkit | |
| parent | 6e23f64fdab9affa342f0b6f5dc603bc03305e8e (diff) | |
| download | chromium_src-3cc5ac1372cff363701c13d2366ee16ca9e73e4b.zip chromium_src-3cc5ac1372cff363701c13d2366ee16ca9e73e4b.tar.gz chromium_src-3cc5ac1372cff363701c13d2366ee16ca9e73e4b.tar.bz2 | |
Revert r46500 in an attempt to verify a perf regression on the Mac bots.
We will also need to revert WebKit rev r58675.
BUG=43276
R=johnnyg@chromium.org
TEST=none
Review URL: http://codereview.chromium.org/2095010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/notification_presenter.cc | 14 | ||||
| -rw-r--r-- | webkit/tools/test_shell/notification_presenter.h | 4 |
3 files changed, 6 insertions, 17 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 0ca4cc3..15273b9 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -4,3 +4,8 @@ // // Only add expectations here to temporarily suppress messages on the bots // until the changes can be landed upstream. + +// temporarily mark these tests as failing until we can figure out why +// r46500 (and wk 58765) seems to have caused a perf regression +BUG43276 : fast/notifications/notifications-replace.html = FAIL +BUG43276 : fast/notifications/notifications-rtl.html = FAIL diff --git a/webkit/tools/test_shell/notification_presenter.cc b/webkit/tools/test_shell/notification_presenter.cc index 163b181..e0402d29 100644 --- a/webkit/tools/test_shell/notification_presenter.cc +++ b/webkit/tools/test_shell/notification_presenter.cc @@ -26,23 +26,11 @@ void TestNotificationPresenter::grantPermission(const std::string& origin) { // The output from all these methods matches what DumpRenderTree produces. bool TestNotificationPresenter::show(const WebNotification& notification) { - if (!notification.replaceId().isEmpty()) { - std::string replace_id(notification.replaceId().utf8()); - if (replacements_.find(replace_id) != replacements_.end()) - printf("REPLACING NOTIFICATION %s\n", - replacements_.find(replace_id)->second.c_str()); - - WebString identifier = notification.isHTML() ? - notification.url().spec().utf16() : notification.title(); - replacements_[replace_id] = identifier.utf8(); - } - if (notification.isHTML()) { printf("DESKTOP NOTIFICATION: contents at %s\n", notification.url().spec().data()); } else { - printf("DESKTOP NOTIFICATION:%s icon %s, title %s, text %s\n", - notification.dir() == "rtl" ? "(RTL)" : "", + printf("DESKTOP NOTIFICATION: icon %s, title %s, text %s\n", notification.iconURL().isEmpty() ? "" : notification.iconURL().spec().data(), notification.title().isEmpty() ? "" : diff --git a/webkit/tools/test_shell/notification_presenter.h b/webkit/tools/test_shell/notification_presenter.h index f5b3b07..07d7978 100644 --- a/webkit/tools/test_shell/notification_presenter.h +++ b/webkit/tools/test_shell/notification_presenter.h @@ -5,7 +5,6 @@ #ifndef WEBKIT_TOOLS_TEST_SHELL_NOTIFICATION_PRESENTER_H_ #define WEBKIT_TOOLS_TEST_SHELL_NOTIFICATION_PRESENTER_H_ -#include <map> #include <set> #include <string> @@ -41,9 +40,6 @@ class TestNotificationPresenter : public WebKit::WebNotificationPresenter { // List of allowed origins. std::set<std::string> allowed_origins_; - - // Map of active replacement IDs to the titles of those notifications - std::map<std::string, std::string> replacements_; }; #endif // WEBKIT_TOOLS_TEST_SHELL_NOTIFICATION_PRESENTER_H_ |