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

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

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes 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 #include "ui/views/widget/widget.h" 5 #include "ui/views/widget/widget.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "ui/base/hit_test.h" 10 #include "ui/base/hit_test.h"
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 // It doesn't, and so a clear is required. 1021 // It doesn't, and so a clear is required.
1022 force_clear = true; 1022 force_clear = true;
1023 } 1023 }
1024 } 1024 }
1025 } 1025 }
1026 1026
1027 compositor->Draw(force_clear); 1027 compositor->Draw(force_clear);
1028 return true; 1028 return true;
1029 } 1029 }
1030 1030
1031 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) { 1031 void Widget::OnNativeWidgetPaint(gfx::CanvasSkia* canvas) {
1032 GetRootView()->Paint(canvas); 1032 GetRootView()->Paint(canvas);
1033 } 1033 }
1034 1034
1035 int Widget::GetNonClientComponent(const gfx::Point& point) { 1035 int Widget::GetNonClientComponent(const gfx::Point& point) {
1036 return non_client_view_ ? 1036 return non_client_view_ ?
1037 non_client_view_->NonClientHitTest(point) : 1037 non_client_view_->NonClientHitTest(point) :
1038 HTNOWHERE; 1038 HTNOWHERE;
1039 } 1039 }
1040 1040
1041 bool Widget::OnKeyEvent(const KeyEvent& event) { 1041 bool Widget::OnKeyEvent(const KeyEvent& event) {
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 1283
1284 //////////////////////////////////////////////////////////////////////////////// 1284 ////////////////////////////////////////////////////////////////////////////////
1285 // internal::NativeWidgetPrivate, NativeWidget implementation: 1285 // internal::NativeWidgetPrivate, NativeWidget implementation:
1286 1286
1287 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { 1287 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
1288 return this; 1288 return this;
1289 } 1289 }
1290 1290
1291 } // namespace internal 1291 } // namespace internal
1292 } // namespace views 1292 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698