Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / compositor / test / test_compositor_host_mac.mm

diff --git a/src/ui/compositor/test/test_compositor_host_mac.mm b/src/ui/compositor/test/test_compositor_host_mac.mm
index 9659967..b262a21 100644 (file)
--- a/src/ui/compositor/test/test_compositor_host_mac.mm
+++ b/src/ui/compositor/test/test_compositor_host_mac.mm
@@ -13,6 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/thread_task_runner_handle.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/rect.h"
 
@@ -70,8 +71,7 @@ class AppKitHost : public FoundationHost {
   AppKitHost() {
     [NSApplication sharedApplication];
   }
-  virtual ~AppKitHost() {
-  }
+  ~AppKitHost() override {}
  private:
   DISALLOW_COPY_AND_ASSIGN(AppKitHost);
 };
@@ -83,12 +83,12 @@ class TestCompositorHostMac : public TestCompositorHost,
  public:
   TestCompositorHostMac(const gfx::Rect& bounds,
                         ui::ContextFactory* context_factory);
-  virtual ~TestCompositorHostMac();
+  ~TestCompositorHostMac() override;
 
  private:
   // TestCompositorHost:
-  virtual void Show() OVERRIDE;
-  virtual ui::Compositor* GetCompositor() OVERRIDE;
+  void Show() override;
+  ui::Compositor* GetCompositor() override;
 
   gfx::Rect bounds_;
 
@@ -130,7 +130,9 @@ void TestCompositorHostMac::Show() {
                               defer:NO];
   base::scoped_nsobject<AcceleratedTestView> view(
       [[AcceleratedTestView alloc] init]);
-  compositor_.reset(new ui::Compositor(view, context_factory_));
+  compositor_.reset(new ui::Compositor(view,
+                                       context_factory_,
+                                       base::ThreadTaskRunnerHandle::Get()));
   compositor_->SetScaleAndSize(1.0f, bounds_.size());
   [view setCompositor:compositor_.get()];
   [window_ setContentView:view];