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

Unified Diff: Tools/DumpRenderTree/chromium/TestShell.cpp

Issue 14516007: Remove OS(IOS) and OS(MAC_OS_X) guards. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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/wtf/unicode/icu/CollatorICU.cpp ('k') | Tools/DumpRenderTree/chromium/WebViewHost.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/DumpRenderTree/chromium/TestShell.cpp
diff --git a/Tools/DumpRenderTree/chromium/TestShell.cpp b/Tools/DumpRenderTree/chromium/TestShell.cpp
index e8830bef56fc07efdefaaf538429f8c32f7f923e..285ce39a942588d2ab851970ffbef4a8bc6ec881 100644
--- a/Tools/DumpRenderTree/chromium/TestShell.cpp
+++ b/Tools/DumpRenderTree/chromium/TestShell.cpp
@@ -135,7 +135,7 @@ void TestShell::initialize(MockPlatform* platformSupport)
platformSupport->setInterfaces(m_testInterfaces.get());
m_devToolsTestInterfaces = adoptPtr(new WebTestInterfaces());
m_prerenderingSupport = adoptPtr(new MockWebPrerenderingSupport());
-#if !defined(USE_DEFAULT_RENDER_THEME) && (OS(WINDOWS) || OS(MAC_OS_X))
+#if !defined(USE_DEFAULT_RENDER_THEME) && (OS(WINDOWS) || OS(DARWIN))
// Set theme engine.
webkit_support::SetThemeEngine(m_testInterfaces->themeEngine());
#endif
@@ -401,7 +401,7 @@ void TestShell::dumpImage(SkCanvas* canvas) const
// drawing may have erased it in a few places. So on Windows we force it to
// opaque and also don't write the alpha channel for the reference. Linux
// doesn't have the wrong alpha like Windows, but we match Windows.
-#if OS(MAC_OS_X)
+#if OS(DARWIN)
bool discardTransparency = false;
#else
bool discardTransparency = true;
« no previous file with comments | « Source/wtf/unicode/icu/CollatorICU.cpp ('k') | Tools/DumpRenderTree/chromium/WebViewHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698