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

Side by Side Diff: ui/gfx/win/direct_manipulation.cc

Issue 1295683003: Remove the CHECK from the DirectManipulationHelper::Activate function as it is firing in Canary on … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/win/direct_manipulation.h" 5 #include "ui/gfx/win/direct_manipulation.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/win/windows_version.h" 8 #include "base/win/windows_version.h"
9 9
10 namespace gfx { 10 namespace gfx {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 hr = view_port_outer_->SetViewportRect(&rect); 85 hr = view_port_outer_->SetViewportRect(&rect);
86 CHECK(SUCCEEDED(hr)); 86 CHECK(SUCCEEDED(hr));
87 87
88 hr = content_outer->SetContentRect(&rect); 88 hr = content_outer->SetContentRect(&rect);
89 CHECK(SUCCEEDED(hr)); 89 CHECK(SUCCEEDED(hr));
90 } 90 }
91 91
92 void DirectManipulationHelper::Activate(HWND window) { 92 void DirectManipulationHelper::Activate(HWND window) {
93 DCHECK(::IsWindow(window)); 93 DCHECK(::IsWindow(window));
94 HRESULT hr = manager_->Activate(window); 94 manager_->Activate(window);
95 CHECK(SUCCEEDED(hr)); 95 }
96
97 void DirectManipulationHelper::Deactivate(HWND window) {
98 DCHECK(::IsWindow(window));
99 manager_->Deactivate(window);
96 } 100 }
97 101
98 void DirectManipulationHelper:: HandleMouseWheel(HWND window, UINT message, 102 void DirectManipulationHelper:: HandleMouseWheel(HWND window, UINT message,
99 WPARAM w_param, LPARAM l_param) { 103 WPARAM w_param, LPARAM l_param) {
100 MSG msg = { window, message, w_param, l_param}; 104 MSG msg = { window, message, w_param, l_param};
101 105
102 HRESULT hr = view_port_outer_->SetContact(DIRECTMANIPULATION_MOUSEFOCUS); 106 HRESULT hr = view_port_outer_->SetContact(DIRECTMANIPULATION_MOUSEFOCUS);
103 if (SUCCEEDED(hr)) { 107 if (SUCCEEDED(hr)) {
104 BOOL handled = FALSE; 108 BOOL handled = FALSE;
105 manager_->ProcessInput(&msg, &handled); 109 manager_->ProcessInput(&msg, &handled);
106 view_port_outer_->ReleaseContact(DIRECTMANIPULATION_MOUSEFOCUS); 110 view_port_outer_->ReleaseContact(DIRECTMANIPULATION_MOUSEFOCUS);
107 } 111 }
108 } 112 }
109 113
110 } // namespace win. 114 } // namespace win.
111 } // namespace gfx. 115 } // namespace gfx.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698