Index: content/shell/shell_main_delegate.cc |
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc |
index 133494bceb55a915d1f0e38cc0c62546d1f5b15e..f2b7174f2d51943e5582ffddd30e54f7700b1a98 100644 |
--- a/content/shell/shell_main_delegate.cc |
+++ b/content/shell/shell_main_delegate.cc |
@@ -8,6 +8,7 @@ |
#include "base/files/file_path.h" |
#include "base/logging.h" |
#include "base/path_service.h" |
+#include "content/common/gpu/image_transport_surface.h" |
jochen (gone - plz use gerrit)
2013/02/26 14:12:07
content_shell is a content embedder and therefore
Nico
2013/02/26 14:26:52
Done.
Is this automatically enforced somehow?
jochen (gone - plz use gerrit)
2013/02/26 14:35:18
sure, via include rules in the DEPS files.
|
#include "content/public/browser/browser_main_runner.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/common/url_constants.h" |
@@ -101,6 +102,9 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
command_line.AppendSwitchASCII( |
switches::kUseGL, gfx::kGLImplementationOSMesaName); |
command_line.AppendSwitch(switches::kIgnoreGpuBlacklist); |
+#if defined(OS_MACOSX) |
+ ImageTransportSurface::SetAllowOSMesa(true); |
+#endif |
command_line.AppendSwitch(switches::kEnableExperimentalWebKitFeatures); |
command_line.AppendSwitch(switches::kEnableCssShaders); |
command_line.AppendSwitchASCII(switches::kTouchEvents, |