summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/surface/accelerated_surface_win.cc3
-rw-r--r--ui/surface/d3d9_utils_win.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc
index 03d4880..65fe62c 100644
--- a/ui/surface/accelerated_surface_win.cc
+++ b/ui/surface/accelerated_surface_win.cc
@@ -620,6 +620,7 @@ void AcceleratedPresenter::ResetPresentThread(
#if defined(USE_AURA)
void AcceleratedPresenter::SetNewTargetWindow(gfx::PluginWindowHandle window) {
window_ = window;
+ swap_chain_ = NULL;
}
#endif
@@ -702,7 +703,7 @@ void AcceleratedPresenter::DoPresentAndAcknowledge(
parameters.BackBufferHeight = quantized_size.height();
parameters.BackBufferCount = 1;
parameters.BackBufferFormat = D3DFMT_A8R8G8B8;
- parameters.hDeviceWindow = GetShellWindow();
+ parameters.hDeviceWindow = window_;
parameters.Windowed = TRUE;
parameters.Flags = 0;
parameters.PresentationInterval = GetPresentationInterval();
diff --git a/ui/surface/d3d9_utils_win.cc b/ui/surface/d3d9_utils_win.cc
index a95ffb6..67df0fe 100644
--- a/ui/surface/d3d9_utils_win.cc
+++ b/ui/surface/d3d9_utils_win.cc
@@ -43,7 +43,7 @@ bool CreateDevice(const base::ScopedNativeLibrary& d3d_module,
// Any old window will do to create the device. In practice the window to
// present to is an argument to IDirect3DDevice9::Present.
- HWND window = GetShellWindow();
+ HWND window = GetDesktopWindow();
D3DPRESENT_PARAMETERS parameters = { 0 };
parameters.BackBufferWidth = 1;