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

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 19114006: Remove dwm function because it is going away in windows 8.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing telemetry test Created 7 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
« no previous file with comments | « no previous file | tools/telemetry/telemetry/core/tab_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_win.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index f6903eff817603676a8b31ca9b64d54402c78fea..1f607a76d91bf5f39e367e102bf618d54ac267e5 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -4,7 +4,6 @@
#include "content/browser/renderer_host/render_widget_host_view_win.h"
-#include <dwmapi.h>
#include <InputScope.h>
#include <wtsapi32.h>
#pragma comment(lib, "wtsapi32.lib")
@@ -332,22 +331,6 @@ void GetScreenInfoForWindow(gfx::NativeViewId id,
*results = screen_info;
}
-void SetDwmPresentParameters(HWND window) {
- if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
- BOOL is_composited;
- HRESULT result = DwmIsCompositionEnabled(&is_composited);
- if (SUCCEEDED(result) && is_composited) {
- DWM_PRESENT_PARAMETERS present_parameters = {0};
- present_parameters.cbSize = sizeof(present_parameters);
- present_parameters.cBuffer = 2;
-
- result = DwmSetPresentParameters(window, &present_parameters);
- if (FAILED(result))
- DLOG(ERROR) << "Unable to set present parameters: 0x%08X", result;
- }
- }
-}
-
} // namespace
const wchar_t kRenderWidgetHostHWNDClass[] = L"Chrome_RenderWidgetHostHWND";
@@ -1244,7 +1227,6 @@ LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
props_.push_back(ui::SetWindowSupportsRerouteMouseWheel(m_hWnd));
WTSRegisterSessionNotification(m_hWnd, NOTIFY_FOR_THIS_SESSION);
- SetDwmPresentParameters(m_hWnd);
UpdateDesiredTouchMode();
UpdateIMEState();
@@ -2582,19 +2564,16 @@ gfx::GLSurfaceHandle RenderWidgetHostViewWin::GetCompositingSurface() {
static_cast<int>(currentRect.bottom - currentRect.top));
compositor_host_window_ = CreateWindowEx(
- WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR,
- MAKEINTATOM(atom), 0,
- WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_DISABLED,
- 0, 0, width, height, m_hWnd, 0, instance, 0);
+ WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR,
+ MAKEINTATOM(atom), 0,
+ WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_DISABLED,
+ 0, 0, width, height, m_hWnd, 0, instance, 0);
ui::CheckWindowCreated(compositor_host_window_);
ui::SetWindowUserData(compositor_host_window_, this);
- SetDwmPresentParameters(compositor_host_window_);
-
gfx::GLSurfaceHandle surface_handle(compositor_host_window_,
gfx::NATIVE_TRANSPORT);
-
return surface_handle;
}
« no previous file with comments | « no previous file | tools/telemetry/telemetry/core/tab_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698