| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index bb9e409d7024de96fb77b1aafc2828dc972909d6..377bfde1ec137dc49688661609c4a5d640e8b484 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -138,6 +138,7 @@
|
| #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| #include "third_party/icu/source/i18n/unicode/timezone.h"
|
| +#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
|
| #include "third_party/skia/include/core/SkGraphics.h"
|
| #include "ui/base/layout.h"
|
| #include "ui/base/ui_base_switches.h"
|
| @@ -340,11 +341,11 @@ void LowMemoryNotificationOnThisThread() {
|
| isolate->LowMemoryNotification();
|
| }
|
|
|
| -class RenderFrameSetupImpl : public mojo::InterfaceImpl<RenderFrameSetup> {
|
| +class RenderFrameSetupImpl : public RenderFrameSetup {
|
| public:
|
| - RenderFrameSetupImpl()
|
| - : routing_id_highmark_(-1) {
|
| - }
|
| + explicit RenderFrameSetupImpl(
|
| + mojo::InterfaceRequest<RenderFrameSetup> request)
|
| + : routing_id_highmark_(-1), binding_(this, request.Pass()) {}
|
|
|
| void ExchangeServiceProviders(
|
| int32_t frame_routing_id,
|
| @@ -371,10 +372,11 @@ class RenderFrameSetupImpl : public mojo::InterfaceImpl<RenderFrameSetup> {
|
|
|
| private:
|
| int32_t routing_id_highmark_;
|
| + mojo::StrongBinding<RenderFrameSetup> binding_;
|
| };
|
|
|
| void CreateRenderFrameSetup(mojo::InterfaceRequest<RenderFrameSetup> request) {
|
| - mojo::BindToRequest(new RenderFrameSetupImpl(), &request);
|
| + new RenderFrameSetupImpl(request.Pass());
|
| }
|
|
|
| blink::WebGraphicsContext3D::Attributes GetOffscreenAttribs() {
|
|
|