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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 15002007: Delegate root layer scroll offset to android_webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on top of crrev.com/15875009 Created 7 years, 6 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 | Annotate | Revision Log
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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 #if defined(OS_ANDROID) 214 #if defined(OS_ANDROID)
215 #include <cpu-features.h> 215 #include <cpu-features.h>
216 216
217 #include "content/common/android/device_telephony_info.h" 217 #include "content/common/android/device_telephony_info.h"
218 #include "content/common/gpu/client/context_provider_command_buffer.h" 218 #include "content/common/gpu/client/context_provider_command_buffer.h"
219 #include "content/renderer/android/address_detector.h" 219 #include "content/renderer/android/address_detector.h"
220 #include "content/renderer/android/content_detector.h" 220 #include "content/renderer/android/content_detector.h"
221 #include "content/renderer/android/email_detector.h" 221 #include "content/renderer/android/email_detector.h"
222 #include "content/renderer/android/phone_number_detector.h" 222 #include "content/renderer/android/phone_number_detector.h"
223 #include "content/renderer/android/synchronous_compositor_impl.h"
223 #include "content/renderer/media/stream_texture_factory_impl_android.h" 224 #include "content/renderer/media/stream_texture_factory_impl_android.h"
224 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" 225 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
225 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" 226 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
226 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" 227 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
227 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" 228 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
228 #include "ui/gfx/rect_f.h" 229 #include "ui/gfx/rect_f.h"
229 #include "webkit/media/android/webmediaplayer_android.h" 230 #include "webkit/media/android/webmediaplayer_android.h"
230 #include "webkit/media/android/webmediaplayer_manager_android.h" 231 #include "webkit/media/android/webmediaplayer_manager_android.h"
231 #elif defined(OS_WIN) 232 #elif defined(OS_WIN)
232 // TODO(port): these files are currently Windows only because they concern: 233 // TODO(port): these files are currently Windows only because they concern:
(...skipping 2384 matching lines...) Expand 10 before | Expand all | Expand 10 after
2617 2618
2618 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { 2619 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
2619 #if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003 2620 #if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003
2620 InputHandlerManager* input_handler_manager = 2621 InputHandlerManager* input_handler_manager =
2621 RenderThreadImpl::current()->input_handler_manager(); 2622 RenderThreadImpl::current()->input_handler_manager();
2622 if (input_handler_manager) { 2623 if (input_handler_manager) {
2623 input_handler_manager->AddInputHandler( 2624 input_handler_manager->AddInputHandler(
2624 routing_id_, 2625 routing_id_,
2625 compositor_->GetInputHandler(), 2626 compositor_->GetInputHandler(),
2626 AsWeakPtr()); 2627 AsWeakPtr());
2628
2629 if (GetSynchronousCompositor()) {
2630 input_handler_manager->SetRootLayerScrollDelegate(
2631 routing_id_, GetSynchronousCompositor());
joth 2013/05/29 00:46:25 do you mean GetSynchronousCompositor() here, or so
mkosiba (inactive) 2013/05/29 13:18:24 This is fine. I just forgot to make SynchronousCom
2632 }
2627 } 2633 }
2628 #endif 2634 #endif
2629 2635
2630 RenderWidget::didActivateCompositor(input_handler_identifier); 2636 RenderWidget::didActivateCompositor(input_handler_identifier);
2631 } 2637 }
2632 2638
2633 void RenderViewImpl::didHandleGestureEvent( 2639 void RenderViewImpl::didHandleGestureEvent(
2634 const WebGestureEvent& event, 2640 const WebGestureEvent& event,
2635 bool event_cancelled) { 2641 bool event_cancelled) {
2636 RenderWidget::didHandleGestureEvent(event, event_cancelled); 2642 RenderWidget::didHandleGestureEvent(event, event_cancelled);
(...skipping 3928 matching lines...) Expand 10 before | Expand all | Expand 10 after
6565 WebURL url = icon_urls[i].iconURL(); 6571 WebURL url = icon_urls[i].iconURL();
6566 if (!url.isEmpty()) 6572 if (!url.isEmpty())
6567 urls.push_back(FaviconURL(url, 6573 urls.push_back(FaviconURL(url,
6568 ToFaviconType(icon_urls[i].iconType()))); 6574 ToFaviconType(icon_urls[i].iconType())));
6569 } 6575 }
6570 SendUpdateFaviconURL(urls); 6576 SendUpdateFaviconURL(urls);
6571 } 6577 }
6572 6578
6573 6579
6574 } // namespace content 6580 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698