| 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 "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 954 | 954 |
| 955 void RenderWidgetHostViewAura::BeginFrameSubscription( | 955 void RenderWidgetHostViewAura::BeginFrameSubscription( |
| 956 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) { | 956 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) { |
| 957 delegated_frame_host_->BeginFrameSubscription(subscriber.Pass()); | 957 delegated_frame_host_->BeginFrameSubscription(subscriber.Pass()); |
| 958 } | 958 } |
| 959 | 959 |
| 960 void RenderWidgetHostViewAura::EndFrameSubscription() { | 960 void RenderWidgetHostViewAura::EndFrameSubscription() { |
| 961 delegated_frame_host_->EndFrameSubscription(); | 961 delegated_frame_host_->EndFrameSubscription(); |
| 962 } | 962 } |
| 963 | 963 |
| 964 void RenderWidgetHostViewAura::OnAcceleratedCompositingStateChange() { | |
| 965 } | |
| 966 | |
| 967 void RenderWidgetHostViewAura::AcceleratedSurfaceInitialized(int host_id, | 964 void RenderWidgetHostViewAura::AcceleratedSurfaceInitialized(int host_id, |
| 968 int route_id) { | 965 int route_id) { |
| 969 } | 966 } |
| 970 | 967 |
| 971 void RenderWidgetHostViewAura::InternalSetBounds(const gfx::Rect& rect) { | 968 void RenderWidgetHostViewAura::InternalSetBounds(const gfx::Rect& rect) { |
| 972 if (HasDisplayPropertyChanged(window_)) | 969 if (HasDisplayPropertyChanged(window_)) |
| 973 host_->InvalidateScreenInfo(); | 970 host_->InvalidateScreenInfo(); |
| 974 | 971 |
| 975 // Don't recursively call SetBounds if this bounds update is the result of | 972 // Don't recursively call SetBounds if this bounds update is the result of |
| 976 // a Window::SetBoundsInternal call. | 973 // a Window::SetBoundsInternal call. |
| (...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2382 | 2379 |
| 2383 //////////////////////////////////////////////////////////////////////////////// | 2380 //////////////////////////////////////////////////////////////////////////////// |
| 2384 // RenderWidgetHostViewBase, public: | 2381 // RenderWidgetHostViewBase, public: |
| 2385 | 2382 |
| 2386 // static | 2383 // static |
| 2387 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2384 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2388 GetScreenInfoForWindow(results, NULL); | 2385 GetScreenInfoForWindow(results, NULL); |
| 2389 } | 2386 } |
| 2390 | 2387 |
| 2391 } // namespace content | 2388 } // namespace content |
| OLD | NEW |