1 files changed, 10 insertions, 0 deletions
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc
index 1e72d9a..ded05b4 100644
--- a/ui/surface/accelerated_surface_win.cc
+++ b/ui/surface/accelerated_surface_win.cc
@@ -412,6 +412,10 @@ void AcceleratedPresenterMap::RemovePresenter(
 scoped_refptr<AcceleratedPresenter> AcceleratedPresenterMap::GetPresenter(
     gfx::PluginWindowHandle window) {
   base::AutoLock locked(lock_);
+
+  if (!window)
+    return presenters_.begin()->second;
+
   PresenterMap::iterator it = presenters_.find(window);
   if (it == presenters_.end())
     return scoped_refptr<AcceleratedPresenter>();
@@ -661,6 +665,12 @@ void AcceleratedPresenter::Invalidate() {
   window_ = NULL;
 }
 
+#if defined(USE_AURA)
+void AcceleratedPresenter::SetNewTargetWindow(gfx::PluginWindowHandle window) {
+  window_ = window;
+}
+#endif
+
 AcceleratedPresenter::~AcceleratedPresenter() {
 }