| 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 <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 737 TRACE_EVENT1("cc", "RenderWidgetHostViewAndroid::SetNeedsBeginFrames", | 737 TRACE_EVENT1("cc", "RenderWidgetHostViewAndroid::SetNeedsBeginFrames", |
| 738 "needs_begin_frames", needs_begin_frames); | 738 "needs_begin_frames", needs_begin_frames); |
| 739 if (needs_begin_frames) | 739 if (needs_begin_frames) |
| 740 RequestVSyncUpdate(PERSISTENT_BEGIN_FRAME); | 740 RequestVSyncUpdate(PERSISTENT_BEGIN_FRAME); |
| 741 else | 741 else |
| 742 outstanding_vsync_requests_ &= ~PERSISTENT_BEGIN_FRAME; | 742 outstanding_vsync_requests_ &= ~PERSISTENT_BEGIN_FRAME; |
| 743 } | 743 } |
| 744 | 744 |
| 745 void RenderWidgetHostViewAndroid::OnStartContentIntent( | 745 void RenderWidgetHostViewAndroid::OnStartContentIntent( |
| 746 const GURL& content_url, bool is_main_frame) { | 746 const GURL& content_url, bool is_main_frame) { |
| 747 if (content_view_core_) | 747 if (view_.GetWindowAndroid()) |
| 748 content_view_core_->StartContentIntent(content_url, is_main_frame); | 748 view_.GetWindowAndroid()->StartContentIntent(content_url, is_main_frame); |
| 749 } | 749 } |
| 750 | 750 |
| 751 void RenderWidgetHostViewAndroid::OnSmartClipDataExtracted( | 751 void RenderWidgetHostViewAndroid::OnSmartClipDataExtracted( |
| 752 const base::string16& text, | 752 const base::string16& text, |
| 753 const base::string16& html, | 753 const base::string16& html, |
| 754 const gfx::Rect rect) { | 754 const gfx::Rect rect) { |
| 755 if (content_view_core_) | 755 if (content_view_core_) |
| 756 content_view_core_->OnSmartClipDataExtracted(text, html, rect); | 756 content_view_core_->OnSmartClipDataExtracted(text, html, rect); |
| 757 } | 757 } |
| 758 | 758 |
| (...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1964 case ui::MotionEvent::ACTION_UP: | 1964 case ui::MotionEvent::ACTION_UP: |
| 1965 case ui::MotionEvent::ACTION_POINTER_UP: | 1965 case ui::MotionEvent::ACTION_POINTER_UP: |
| 1966 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", | 1966 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", |
| 1967 delta.InMicroseconds(), 1, 1000000, 50); | 1967 delta.InMicroseconds(), 1, 1000000, 50); |
| 1968 default: | 1968 default: |
| 1969 return; | 1969 return; |
| 1970 } | 1970 } |
| 1971 } | 1971 } |
| 1972 | 1972 |
| 1973 } // namespace content | 1973 } // namespace content |
| OLD | NEW |