Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1411)

Unified Diff: Source/web/tests/WebFrameTest.cpp

Issue 1215973002: Oilpan: improve ScrollableArea handling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review-induced improvements Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 75f4d56138e70755e41973a871821fc8505e7c39..62f89b625fdb1c2d19698a9ae45beaff0351a1ed 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -292,15 +292,9 @@ void PrintTo(ParameterizedWebFrameTestConfig config, ::std::ostream* os)
}
}
-#if OS(MACOSX) && ENABLE(OILPAN)
-// FIXME(504655): RootLayerScrolls configuration crashes on Mac Oilpan bots.
-INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Values(
- ParameterizedWebFrameTestConfig::Default));
-#else
INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Values(
ParameterizedWebFrameTestConfig::Default,
ParameterizedWebFrameTestConfig::RootLayerScrolls));
-#endif
TEST_P(ParameterizedWebFrameTest, ContentText)
{
@@ -2223,15 +2217,9 @@ protected:
}
};
-#if OS(MACOSX) && ENABLE(OILPAN)
-// FIXME(504655): RootLayerScrolls configuration crashes on Mac Oilpan bots.
-INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values(
- ParameterizedWebFrameTestConfig::Default));
-#else
INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values(
ParameterizedWebFrameTestConfig::Default,
ParameterizedWebFrameTestConfig::RootLayerScrolls));
-#endif
TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
{
« no previous file with comments | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698