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/aura/window.h" | 5 #include "ui/aura/window.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <utility> | 10 #include <utility> |
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
985 ui::GestureRecognizer::Get()->CleanupStateForConsumer(this); | 985 ui::GestureRecognizer::Get()->CleanupStateForConsumer(this); |
986 for (Window::Windows::iterator iter = children_.begin(); | 986 for (Window::Windows::iterator iter = children_.begin(); |
987 iter != children_.end(); | 987 iter != children_.end(); |
988 ++iter) { | 988 ++iter) { |
989 state_modified |= (*iter)->CleanupGestureState(); | 989 state_modified |= (*iter)->CleanupGestureState(); |
990 } | 990 } |
991 return state_modified; | 991 return state_modified; |
992 } | 992 } |
993 | 993 |
994 std::unique_ptr<cc::CompositorFrameSink> Window::CreateCompositorFrameSink() { | 994 std::unique_ptr<cc::CompositorFrameSink> Window::CreateCompositorFrameSink() { |
995 return port_->CreateCompositorFrameSink(); | 995 return port_->CreateCompositorFrameSink( |
996 nullptr, | |
sadrul
2017/05/26 20:22:25
these extra params don't seem necessary? Can Windo
Peng
2017/05/26 20:41:32
I added this two args, because we want to get rid
sadrul
2017/05/27 01:43:22
I see. I guess you need the ContextProvider param,
| |
997 aura::Env::GetInstance()->context_factory()->GetGpuMemoryBufferManager()); | |
996 } | 998 } |
997 | 999 |
998 cc::SurfaceId Window::GetSurfaceId() const { | 1000 cc::SurfaceId Window::GetSurfaceId() const { |
999 return port_->GetSurfaceId(); | 1001 return port_->GetSurfaceId(); |
1000 } | 1002 } |
1001 | 1003 |
1002 void Window::OnPaintLayer(const ui::PaintContext& context) { | 1004 void Window::OnPaintLayer(const ui::PaintContext& context) { |
1003 Paint(context); | 1005 Paint(context); |
1004 } | 1006 } |
1005 | 1007 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1083 layer_name = "Unnamed Window"; | 1085 layer_name = "Unnamed Window"; |
1084 | 1086 |
1085 if (id_ != -1) | 1087 if (id_ != -1) |
1086 layer_name += " " + base::IntToString(id_); | 1088 layer_name += " " + base::IntToString(id_); |
1087 | 1089 |
1088 layer()->set_name(layer_name); | 1090 layer()->set_name(layer_name); |
1089 #endif | 1091 #endif |
1090 } | 1092 } |
1091 | 1093 |
1092 } // namespace aura | 1094 } // namespace aura |
OLD | NEW |