OLD | NEW |
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/root_view.h" | 5 #include "ui/views/widget/root_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
635 mouse_pressed_handler_ = NULL; | 635 mouse_pressed_handler_ = NULL; |
636 mouse_move_handler_ = NULL; | 636 mouse_move_handler_ = NULL; |
637 gesture_handler_ = NULL; | 637 gesture_handler_ = NULL; |
638 event_dispatch_target_ = NULL; | 638 event_dispatch_target_ = NULL; |
639 old_dispatch_target_ = NULL; | 639 old_dispatch_target_ = NULL; |
640 } | 640 } |
641 } | 641 } |
642 | 642 |
643 void RootView::OnPaint(gfx::Canvas* canvas) { | 643 void RootView::OnPaint(gfx::Canvas* canvas) { |
644 if (!layer() || !layer()->fills_bounds_opaquely()) | 644 if (!layer() || !layer()->fills_bounds_opaquely()) |
645 canvas->DrawColor(SK_ColorBLACK, SkXfermode::kClear_Mode); | 645 canvas->DrawColor(SK_ColorBLACK, SkBlendMode::kClear); |
646 | 646 |
647 View::OnPaint(canvas); | 647 View::OnPaint(canvas); |
648 } | 648 } |
649 | 649 |
650 gfx::Vector2d RootView::CalculateOffsetToAncestorWithLayer( | 650 gfx::Vector2d RootView::CalculateOffsetToAncestorWithLayer( |
651 ui::Layer** layer_parent) { | 651 ui::Layer** layer_parent) { |
652 gfx::Vector2d offset(View::CalculateOffsetToAncestorWithLayer(layer_parent)); | 652 gfx::Vector2d offset(View::CalculateOffsetToAncestorWithLayer(layer_parent)); |
653 if (!layer() && layer_parent) | 653 if (!layer() && layer_parent) |
654 *layer_parent = widget_->GetLayer(); | 654 *layer_parent = widget_->GetLayer(); |
655 return offset; | 655 return offset; |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
752 | 752 |
753 #ifndef NDEBUG | 753 #ifndef NDEBUG |
754 DCHECK(!event_dispatch_target_ || Contains(event_dispatch_target_)); | 754 DCHECK(!event_dispatch_target_ || Contains(event_dispatch_target_)); |
755 #endif | 755 #endif |
756 | 756 |
757 return details; | 757 return details; |
758 } | 758 } |
759 | 759 |
760 } // namespace internal | 760 } // namespace internal |
761 } // namespace views | 761 } // namespace views |
OLD | NEW |