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

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

Issue 1215973002: Oilpan: improve ScrollableArea handling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove too conservative null check 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
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 32ecf1a46c2d059dc8b599180a729e3ebee284dd..0dd11957226bb663f2cd5f3f809ecfd5a8931602 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)
{
« Source/platform/scroll/Scrollbar.cpp ('K') | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698