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

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

Issue 9703044: aura: fix hang when the content window is removed from the tree while a swap is pending (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 void ModifyEventMovementAndCoords(WebKit::WebMouseEvent* event); 198 void ModifyEventMovementAndCoords(WebKit::WebMouseEvent* event);
199 199
200 // If |clip| is non-empty and and doesn't contain |rect| or |clip| is empty 200 // If |clip| is non-empty and and doesn't contain |rect| or |clip| is empty
201 // SchedulePaint() is invoked for |rect|. 201 // SchedulePaint() is invoked for |rect|.
202 void SchedulePaintIfNotInClip(const gfx::Rect& rect, const gfx::Rect& clip); 202 void SchedulePaintIfNotInClip(const gfx::Rect& rect, const gfx::Rect& clip);
203 203
204 // Helper method to determine if, in mouse locked mode, the cursor should be 204 // Helper method to determine if, in mouse locked mode, the cursor should be
205 // moved to center. 205 // moved to center.
206 bool ShouldMoveToCenter(); 206 bool ShouldMoveToCenter();
207 207
208 // Run the compositing callbacks.
209 void RunCompositingCallbacks();
210
211 // Called when window_ is removed from the window tree.
212 void RemovingFromRootWindow();
213
208 ui::Compositor* GetCompositor(); 214 ui::Compositor* GetCompositor();
209 215
210 // The model object. 216 // The model object.
211 content::RenderWidgetHostImpl* host_; 217 content::RenderWidgetHostImpl* host_;
212 218
213 aura::Window* window_; 219 aura::Window* window_;
214 220
215 scoped_ptr<WindowObserver> window_observer_; 221 scoped_ptr<WindowObserver> window_observer_;
216 222
217 // Is this a fullscreen view? 223 // Is this a fullscreen view?
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 bool needs_update_texture_; 286 bool needs_update_texture_;
281 287
282 // Used to prevent further resizes while a resize is pending. 288 // Used to prevent further resizes while a resize is pending.
283 class ResizeLock; 289 class ResizeLock;
284 std::vector<linked_ptr<ResizeLock> > resize_locks_; 290 std::vector<linked_ptr<ResizeLock> > resize_locks_;
285 291
286 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 292 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
287 }; 293 };
288 294
289 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 295 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698