| 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/android/sys_utils.h" | 9 #include "base/android/sys_utils.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1293 void RenderWidgetHostViewAndroid::OnCompositingDidCommit() { | 1293 void RenderWidgetHostViewAndroid::OnCompositingDidCommit() { |
| 1294 RunAckCallbacks(); | 1294 RunAckCallbacks(); |
| 1295 } | 1295 } |
| 1296 | 1296 |
| 1297 void RenderWidgetHostViewAndroid::OnDetachCompositor() { | 1297 void RenderWidgetHostViewAndroid::OnDetachCompositor() { |
| 1298 DCHECK(content_view_core_); | 1298 DCHECK(content_view_core_); |
| 1299 DCHECK(!using_synchronous_compositor_); | 1299 DCHECK(!using_synchronous_compositor_); |
| 1300 RunAckCallbacks(); | 1300 RunAckCallbacks(); |
| 1301 } | 1301 } |
| 1302 | 1302 |
| 1303 void RenderWidgetHostViewAndroid::OnWillDestroyWindow() { | |
| 1304 // crbug.com/324341 | |
| 1305 // WindowAndroid and Compositor should outlive all WebContents. | |
| 1306 NOTREACHED(); | |
| 1307 observing_root_window_ = false; | |
| 1308 } | |
| 1309 | |
| 1310 void RenderWidgetHostViewAndroid::OnVSync(base::TimeTicks frame_time, | 1303 void RenderWidgetHostViewAndroid::OnVSync(base::TimeTicks frame_time, |
| 1311 base::TimeDelta vsync_period) { | 1304 base::TimeDelta vsync_period) { |
| 1312 TRACE_EVENT0("cc", "RenderWidgetHostViewAndroid::OnVSync"); | 1305 TRACE_EVENT0("cc", "RenderWidgetHostViewAndroid::OnVSync"); |
| 1313 if (!host_) | 1306 if (!host_) |
| 1314 return; | 1307 return; |
| 1315 | 1308 |
| 1316 if (flush_input_requested_) { | 1309 if (flush_input_requested_) { |
| 1317 flush_input_requested_ = false; | 1310 flush_input_requested_ = false; |
| 1318 host_->FlushInput(); | 1311 host_->FlushInput(); |
| 1319 } | 1312 } |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1451 results->availableRect = display.work_area(); | 1444 results->availableRect = display.work_area(); |
| 1452 results->deviceScaleFactor = display.device_scale_factor(); | 1445 results->deviceScaleFactor = display.device_scale_factor(); |
| 1453 results->orientationAngle = display.RotationAsDegree(); | 1446 results->orientationAngle = display.RotationAsDegree(); |
| 1454 gfx::DeviceDisplayInfo info; | 1447 gfx::DeviceDisplayInfo info; |
| 1455 results->depth = info.GetBitsPerPixel(); | 1448 results->depth = info.GetBitsPerPixel(); |
| 1456 results->depthPerComponent = info.GetBitsPerComponent(); | 1449 results->depthPerComponent = info.GetBitsPerComponent(); |
| 1457 results->isMonochrome = (results->depthPerComponent == 0); | 1450 results->isMonochrome = (results->depthPerComponent == 0); |
| 1458 } | 1451 } |
| 1459 | 1452 |
| 1460 } // namespace content | 1453 } // namespace content |
| OLD | NEW |