| 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_android.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
| 6 | 6 |
| 7 #include <android/bitmap.h> | 7 #include <android/bitmap.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 return true; | 243 return true; |
| 244 } | 244 } |
| 245 | 245 |
| 246 bool RenderWidgetHostViewAndroid::HasValidFrame() const { | 246 bool RenderWidgetHostViewAndroid::HasValidFrame() const { |
| 247 return texture_id_in_layer_ != 0 && | 247 return texture_id_in_layer_ != 0 && |
| 248 content_view_core_ && | 248 content_view_core_ && |
| 249 !texture_size_in_layer_.IsEmpty(); | 249 !texture_size_in_layer_.IsEmpty(); |
| 250 } | 250 } |
| 251 | 251 |
| 252 gfx::NativeView RenderWidgetHostViewAndroid::GetNativeView() const { | 252 gfx::NativeView RenderWidgetHostViewAndroid::GetNativeView() const { |
| 253 return content_view_core_; | 253 return content_view_core_->GetViewAndroid(); |
| 254 } | 254 } |
| 255 | 255 |
| 256 gfx::NativeViewId RenderWidgetHostViewAndroid::GetNativeViewId() const { | 256 gfx::NativeViewId RenderWidgetHostViewAndroid::GetNativeViewId() const { |
| 257 return reinterpret_cast<gfx::NativeViewId>( | 257 return reinterpret_cast<gfx::NativeViewId>( |
| 258 const_cast<RenderWidgetHostViewAndroid*>(this)); | 258 const_cast<RenderWidgetHostViewAndroid*>(this)); |
| 259 } | 259 } |
| 260 | 260 |
| 261 gfx::NativeViewAccessible | 261 gfx::NativeViewAccessible |
| 262 RenderWidgetHostViewAndroid::GetNativeViewAccessible() { | 262 RenderWidgetHostViewAndroid::GetNativeViewAccessible() { |
| 263 NOTIMPLEMENTED(); | 263 NOTIMPLEMENTED(); |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 836 // RenderWidgetHostView, public: | 836 // RenderWidgetHostView, public: |
| 837 | 837 |
| 838 // static | 838 // static |
| 839 RenderWidgetHostView* | 839 RenderWidgetHostView* |
| 840 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { | 840 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { |
| 841 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); | 841 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); |
| 842 return new RenderWidgetHostViewAndroid(rwhi, NULL); | 842 return new RenderWidgetHostViewAndroid(rwhi, NULL); |
| 843 } | 843 } |
| 844 | 844 |
| 845 } // namespace content | 845 } // namespace content |
| OLD | NEW |