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

Side by Side Diff: views/widget/root_view.cc

Issue 6462022: It turns out I had the sense of the GetLocalBounds bool wrong everywhere, so ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/widget/root_view.h" 5 #include "views/widget/root_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #if defined(TOUCH_UI) && defined(HAVE_XINPUT2) 9 #if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
10 #include <gdk/gdkx.h> 10 #include <gdk/gdkx.h>
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 } 236 }
237 237
238 const gfx::Rect& RootView::GetScheduledPaintRect() { 238 const gfx::Rect& RootView::GetScheduledPaintRect() {
239 return invalid_rect_; 239 return invalid_rect_;
240 } 240 }
241 241
242 gfx::Rect RootView::GetScheduledPaintRectConstrainedToSize() { 242 gfx::Rect RootView::GetScheduledPaintRectConstrainedToSize() {
243 if (invalid_rect_.IsEmpty()) 243 if (invalid_rect_.IsEmpty())
244 return invalid_rect_; 244 return invalid_rect_;
245 245
246 return invalid_rect_.Intersect(GetContentsBounds()); 246 return invalid_rect_.Intersect(GetLocalBounds());
247 } 247 }
248 248
249 ///////////////////////////////////////////////////////////////////////////// 249 /////////////////////////////////////////////////////////////////////////////
250 // 250 //
251 // RootView - tree 251 // RootView - tree
252 // 252 //
253 ///////////////////////////////////////////////////////////////////////////// 253 /////////////////////////////////////////////////////////////////////////////
254 254
255 Widget* RootView::GetWidget() const { 255 Widget* RootView::GetWidget() const {
256 return widget_; 256 return widget_;
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 if (!TouchFactory::GetInstance()->is_cursor_visible()) { 807 if (!TouchFactory::GetInstance()->is_cursor_visible()) {
808 cursor = gfx::GetCursor(GDK_BLANK_CURSOR); 808 cursor = gfx::GetCursor(GDK_BLANK_CURSOR);
809 } 809 }
810 #endif 810 #endif
811 811
812 gdk_window_set_cursor(native_view->window, cursor); 812 gdk_window_set_cursor(native_view->window, cursor);
813 #endif 813 #endif
814 } 814 }
815 815
816 } // namespace views 816 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698