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

Unified Diff: content/browser/gpu/browser_gpu_channel_host_factory.cc

Issue 2096843002: mus+ash: Enable Chrome HW rendering in mus+ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 years, 5 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: content/browser/gpu/browser_gpu_channel_host_factory.cc
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
index aff2083e6deff4b7e3fe02f0b11d17a907cee9c5..58c43314bea5c55bb105e9f89758478fcb82fe48 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
@@ -29,6 +29,10 @@
#include "ipc/ipc_channel_handle.h"
#include "ipc/message_filter.h"
+#if defined(MOJO_RUNNER_CLIENT)
+#include "services/shell/runner/common/client_util.h"
+#endif
+
namespace content {
BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
@@ -297,6 +301,9 @@ BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
void BrowserGpuChannelHostFactory::EstablishGpuChannel(
CauseForGpuLaunch cause_for_gpu_launch,
const base::Closure& callback) {
+#if defined(MOJO_RUNNER_CLIENT)
+ DCHECK(!shell::ShellIsRemote());
+#endif
if (gpu_channel_.get() && gpu_channel_->IsLost()) {
DCHECK(!pending_request_.get());
// Recreate the channel if it has been lost.

Powered by Google App Engine
This is Rietveld 408576698