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

Side by Side Diff: content/browser/renderer_host/legacy_render_widget_host_win.h

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: Add SetMsgHandled to the windowpos changed handler 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
« no previous file with comments | « no previous file | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_LEGACY_RENDER_WIDGET_HOST_WIN_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_LEGACY_RENDER_WIDGET_HOST_WIN_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_LEGACY_RENDER_WIDGET_HOST_WIN_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_LEGACY_RENDER_WIDGET_HOST_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlwin.h> 9 #include <atlwin.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 MESSAGE_HANDLER_EX(WM_MOUSEACTIVATE, OnMouseActivate) 82 MESSAGE_HANDLER_EX(WM_MOUSEACTIVATE, OnMouseActivate)
83 MESSAGE_HANDLER_EX(WM_SETCURSOR, OnSetCursor) 83 MESSAGE_HANDLER_EX(WM_SETCURSOR, OnSetCursor)
84 MESSAGE_HANDLER_EX(WM_TOUCH, OnTouch) 84 MESSAGE_HANDLER_EX(WM_TOUCH, OnTouch)
85 MESSAGE_HANDLER_EX(WM_HSCROLL, OnScroll) 85 MESSAGE_HANDLER_EX(WM_HSCROLL, OnScroll)
86 MESSAGE_HANDLER_EX(WM_VSCROLL, OnScroll) 86 MESSAGE_HANDLER_EX(WM_VSCROLL, OnScroll)
87 MESSAGE_HANDLER_EX(WM_NCHITTEST, OnNCHitTest) 87 MESSAGE_HANDLER_EX(WM_NCHITTEST, OnNCHitTest)
88 MESSAGE_RANGE_HANDLER(WM_NCMOUSEMOVE, WM_NCXBUTTONDBLCLK, 88 MESSAGE_RANGE_HANDLER(WM_NCMOUSEMOVE, WM_NCXBUTTONDBLCLK,
89 OnMouseRange) 89 OnMouseRange)
90 MESSAGE_HANDLER_EX(WM_NCCALCSIZE, OnNCCalcSize) 90 MESSAGE_HANDLER_EX(WM_NCCALCSIZE, OnNCCalcSize)
91 MESSAGE_HANDLER_EX(WM_SIZE, OnSize) 91 MESSAGE_HANDLER_EX(WM_SIZE, OnSize)
92 MESSAGE_HANDLER_EX(WM_WINDOWPOSCHANGED, OnWindowPosChanged)
92 END_MSG_MAP() 93 END_MSG_MAP()
93 94
94 HWND hwnd() { return m_hWnd; } 95 HWND hwnd() { return m_hWnd; }
95 96
96 // Called when the child window is to be reparented to a new window. 97 // Called when the child window is to be reparented to a new window.
97 // The |parent| parameter contains the new parent window. 98 // The |parent| parameter contains the new parent window.
98 void UpdateParent(HWND parent); 99 void UpdateParent(HWND parent);
99 HWND GetParent(); 100 HWND GetParent();
100 101
101 IAccessible* window_accessible() { return window_accessible_.get(); } 102 IAccessible* window_accessible() { return window_accessible_.get(); }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 LRESULT OnMouseActivate(UINT message, WPARAM w_param, LPARAM l_param); 136 LRESULT OnMouseActivate(UINT message, WPARAM w_param, LPARAM l_param);
136 LRESULT OnTouch(UINT message, WPARAM w_param, LPARAM l_param); 137 LRESULT OnTouch(UINT message, WPARAM w_param, LPARAM l_param);
137 LRESULT OnScroll(UINT message, WPARAM w_param, LPARAM l_param); 138 LRESULT OnScroll(UINT message, WPARAM w_param, LPARAM l_param);
138 LRESULT OnNCHitTest(UINT message, WPARAM w_param, LPARAM l_param); 139 LRESULT OnNCHitTest(UINT message, WPARAM w_param, LPARAM l_param);
139 140
140 LRESULT OnNCPaint(UINT message, WPARAM w_param, LPARAM l_param); 141 LRESULT OnNCPaint(UINT message, WPARAM w_param, LPARAM l_param);
141 LRESULT OnPaint(UINT message, WPARAM w_param, LPARAM l_param); 142 LRESULT OnPaint(UINT message, WPARAM w_param, LPARAM l_param);
142 LRESULT OnSetCursor(UINT message, WPARAM w_param, LPARAM l_param); 143 LRESULT OnSetCursor(UINT message, WPARAM w_param, LPARAM l_param);
143 LRESULT OnNCCalcSize(UINT message, WPARAM w_param, LPARAM l_param); 144 LRESULT OnNCCalcSize(UINT message, WPARAM w_param, LPARAM l_param);
144 LRESULT OnSize(UINT message, WPARAM w_param, LPARAM l_param); 145 LRESULT OnSize(UINT message, WPARAM w_param, LPARAM l_param);
146 LRESULT OnWindowPosChanged(UINT message, WPARAM w_param, LPARAM l_param);
145 147
146 base::win::ScopedComPtr<IAccessible> window_accessible_; 148 base::win::ScopedComPtr<IAccessible> window_accessible_;
147 149
148 // Set to true if we turned on mouse tracking. 150 // Set to true if we turned on mouse tracking.
149 bool mouse_tracking_enabled_; 151 bool mouse_tracking_enabled_;
150 152
151 RenderWidgetHostViewAura* host_; 153 RenderWidgetHostViewAura* host_;
152 154
153 // This class provides functionality to register the legacy window as a 155 // This class provides functionality to register the legacy window as a
154 // Direct Manipulation consumer. This allows us to support smooth scroll 156 // Direct Manipulation consumer. This allows us to support smooth scroll
155 // in Chrome on Windows 10. 157 // in Chrome on Windows 10.
156 scoped_ptr<gfx::win::DirectManipulationHelper> direct_manipulation_helper_; 158 scoped_ptr<gfx::win::DirectManipulationHelper> direct_manipulation_helper_;
157 159
158 DISALLOW_COPY_AND_ASSIGN(LegacyRenderWidgetHostHWND); 160 DISALLOW_COPY_AND_ASSIGN(LegacyRenderWidgetHostHWND);
159 }; 161 };
160 162
161 } // namespace content 163 } // namespace content
162 164
163 #endif // CONTENT_BROWSER_RENDERER_HOST_LEGACY_RENDER_WIDGET_HOST_WIN_H_ 165 #endif // CONTENT_BROWSER_RENDERER_HOST_LEGACY_RENDER_WIDGET_HOST_WIN_H_
164 166
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698