| OLD | NEW |
| 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/view.h" | 5 #include "views/view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1130 } else { | 1130 } else { |
| 1131 for (int i = 0, count = child_count(); i < count; ++i) { | 1131 for (int i = 0, count = child_count(); i < count; ++i) { |
| 1132 gfx::Point new_offset(offset.x() + child_at(i)->x(), | 1132 gfx::Point new_offset(offset.x() + child_at(i)->x(), |
| 1133 offset.y() + child_at(i)->y()); | 1133 offset.y() + child_at(i)->y()); |
| 1134 child_at(i)->UpdateChildLayerBounds(new_offset); | 1134 child_at(i)->UpdateChildLayerBounds(new_offset); |
| 1135 } | 1135 } |
| 1136 } | 1136 } |
| 1137 } | 1137 } |
| 1138 | 1138 |
| 1139 void View::OnPaintLayer(gfx::Canvas* canvas) { | 1139 void View::OnPaintLayer(gfx::Canvas* canvas) { |
| 1140 canvas->AsCanvasSkia()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode); | 1140 canvas->GetSkCanvas()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode); |
| 1141 PaintCommon(canvas); | 1141 PaintCommon(canvas); |
| 1142 } | 1142 } |
| 1143 | 1143 |
| 1144 // Input ----------------------------------------------------------------------- | 1144 // Input ----------------------------------------------------------------------- |
| 1145 | 1145 |
| 1146 bool View::HasHitTestMask() const { | 1146 bool View::HasHitTestMask() const { |
| 1147 return false; | 1147 return false; |
| 1148 } | 1148 } |
| 1149 | 1149 |
| 1150 void View::GetHitTestMask(gfx::Path* mask) const { | 1150 void View::GetHitTestMask(gfx::Path* mask) const { |
| (...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1994 | 1994 |
| 1995 OSExchangeData data; | 1995 OSExchangeData data; |
| 1996 WriteDragData(press_pt, &data); | 1996 WriteDragData(press_pt, &data); |
| 1997 | 1997 |
| 1998 // Message the RootView to do the drag and drop. That way if we're removed | 1998 // Message the RootView to do the drag and drop. That way if we're removed |
| 1999 // the RootView can detect it and avoid calling us back. | 1999 // the RootView can detect it and avoid calling us back. |
| 2000 GetWidget()->RunShellDrag(this, data, drag_operations); | 2000 GetWidget()->RunShellDrag(this, data, drag_operations); |
| 2001 } | 2001 } |
| 2002 | 2002 |
| 2003 } // namespace views | 2003 } // namespace views |
| OLD | NEW |