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

Unified Diff: Source/testing/runner/TestInterfaces.cpp

Issue 41733004: Roll up patch for running layout tests under Aura. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add even more comments about why we have special logic for the layout tests Created 7 years, 1 month 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/testing/runner/TestInterfaces.cpp
diff --git a/Source/testing/runner/TestInterfaces.cpp b/Source/testing/runner/TestInterfaces.cpp
index 8756149b2e5edb50b4f60bca4d900136d0569188..e218e1e404ab86948e89269026fdbd9529e66dbe 100644
--- a/Source/testing/runner/TestInterfaces.cpp
+++ b/Source/testing/runner/TestInterfaces.cpp
@@ -196,8 +196,10 @@ const vector<WebTestProxyBase*>& TestInterfaces::windowList()
WebThemeEngine* TestInterfaces::themeEngine()
{
-#if defined(USE_DEFAULT_RENDER_THEME) || !(defined(WIN32) || defined(__APPLE__))
- return 0;
+#if defined(USE_DEFAULT_RENDER_THEME)
+ if (!m_themeEngine.get())
+ m_themeEngine.reset(new WebTestThemeEngineMock());
+ return m_themeEngine.get();
#elif defined(WIN32)
if (!m_themeEngine.get())
m_themeEngine.reset(new WebTestThemeEngineWin());
@@ -206,6 +208,8 @@ WebThemeEngine* TestInterfaces::themeEngine()
if (!m_themeEngine.get())
m_themeEngine.reset(new WebTestThemeEngineMac());
return m_themeEngine.get();
+#else
+ return 0;
#endif
}

Powered by Google App Engine
This is Rietveld 408576698