Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2263043002: android_webview: Let AwContents manage TouchHandleDrawable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use SynchronousCompositorClient Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #include "ui/accessibility/ax_tree_combiner.h" 127 #include "ui/accessibility/ax_tree_combiner.h"
128 #include "ui/base/layout.h" 128 #include "ui/base/layout.h"
129 #include "ui/events/blink/web_input_event_traits.h" 129 #include "ui/events/blink/web_input_event_traits.h"
130 #include "ui/gl/gl_switches.h" 130 #include "ui/gl/gl_switches.h"
131 131
132 #if defined(OS_ANDROID) 132 #if defined(OS_ANDROID)
133 #include "content/browser/android/content_video_view.h" 133 #include "content/browser/android/content_video_view.h"
134 #include "content/browser/android/date_time_chooser_android.h" 134 #include "content/browser/android/date_time_chooser_android.h"
135 #include "content/browser/media/android/media_web_contents_observer_android.h" 135 #include "content/browser/media/android/media_web_contents_observer_android.h"
136 #include "content/browser/web_contents/web_contents_android.h" 136 #include "content/browser/web_contents/web_contents_android.h"
137 #include "content/public/browser/android/synchronous_compositor_client.h"
137 #endif // OS_ANDROID 138 #endif // OS_ANDROID
138 139
139 #if defined(OS_MACOSX) 140 #if defined(OS_MACOSX)
140 #include "base/mac/foundation_util.h" 141 #include "base/mac/foundation_util.h"
141 #endif 142 #endif
142 143
143 #if defined(USE_AURA) 144 #if defined(USE_AURA)
144 #include "content/browser/web_contents/web_contents_view_mus.h" 145 #include "content/browser/web_contents/web_contents_view_mus.h"
145 #include "content/public/common/mojo_shell_connection.h" 146 #include "content/public/common/mojo_shell_connection.h"
146 #include "ui/aura/mus/mus_util.h" 147 #include "ui/aura/mus/mus_util.h"
(...skipping 4805 matching lines...) Expand 10 before | Expand all | Expand 10 after
4952 void WebContentsImpl::RequestFindMatchRects(int current_version) { 4953 void WebContentsImpl::RequestFindMatchRects(int current_version) {
4953 GetOrCreateFindRequestManager()->RequestFindMatchRects(current_version); 4954 GetOrCreateFindRequestManager()->RequestFindMatchRects(current_version);
4954 } 4955 }
4955 4956
4956 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() { 4957 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() {
4957 return CreateRenderViewForRenderManager( 4958 return CreateRenderViewForRenderManager(
4958 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, 4959 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE,
4959 frame_tree_.root()->current_replication_state()); 4960 frame_tree_.root()->current_replication_state());
4960 } 4961 }
4961 4962
4963 ui::TouchHandleDrawable* WebContentsImpl::CreateDrawable() {
4964 return GetWebContentsAndroid()->
4965 synchronous_compositor_client()->CreateDrawable();
4966 }
4967
4962 #elif defined(OS_MACOSX) 4968 #elif defined(OS_MACOSX)
4963 4969
4964 void WebContentsImpl::SetAllowOtherViews(bool allow) { 4970 void WebContentsImpl::SetAllowOtherViews(bool allow) {
4965 view_->SetAllowOtherViews(allow); 4971 view_->SetAllowOtherViews(allow);
4966 } 4972 }
4967 4973
4968 bool WebContentsImpl::GetAllowOtherViews() { 4974 bool WebContentsImpl::GetAllowOtherViews() {
4969 return view_->GetAllowOtherViews(); 4975 return view_->GetAllowOtherViews();
4970 } 4976 }
4971 4977
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
5206 for (RenderViewHost* render_view_host : render_view_host_set) 5212 for (RenderViewHost* render_view_host : render_view_host_set)
5207 render_view_host->OnWebkitPreferencesChanged(); 5213 render_view_host->OnWebkitPreferencesChanged();
5208 } 5214 }
5209 5215
5210 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5216 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5211 JavaScriptDialogManager* dialog_manager) { 5217 JavaScriptDialogManager* dialog_manager) {
5212 dialog_manager_ = dialog_manager; 5218 dialog_manager_ = dialog_manager;
5213 } 5219 }
5214 5220
5215 } // namespace content 5221 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698