diff options
12 files changed, 1 insertions, 152 deletions
diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc index 7472599..65641d7 100644 --- a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc +++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc @@ -18,7 +18,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/common/frame_navigate_params.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandler.h" namespace android_webview { @@ -112,8 +111,6 @@ bool AwRenderViewHostExt::OnMessageReceived(const IPC::Message& message) { OnDocumentHasImagesResponse) IPC_MESSAGE_HANDLER(AwViewHostMsg_UpdateHitTestData, OnUpdateHitTestData) - IPC_MESSAGE_HANDLER(AwViewHostMsg_DidActivateAcceleratedCompositing, - OnDidActivateAcceleratedCompositing) IPC_MESSAGE_HANDLER(AwViewHostMsg_PageScaleFactorChanged, OnPageScaleFactorChanged) IPC_MESSAGE_UNHANDLED(handled = false) @@ -142,27 +139,6 @@ void AwRenderViewHostExt::OnUpdateHitTestData( has_new_hit_test_data_ = true; } -void AwRenderViewHostExt::OnDidActivateAcceleratedCompositing( - int input_handler_id) { - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kNoMergeUIAndRendererCompositorThreads)) { - return; - } - - // This call is only meaningful and thread-safe when the UI and renderer - // compositor share the same thread. Any other case will likely yield - // terrible, terrible damage. - WebKit::WebCompositorInputHandler* input_handler = - WebKit::WebCompositorInputHandler::fromIdentifier(input_handler_id); - if (!input_handler) - return; - - content::ContentViewCore* content_view_core - = content::ContentViewCore::FromWebContents(web_contents()); - if (content_view_core) - content_view_core->SetInputHandler(input_handler); -} - void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) { client_->OnPageScaleFactorChanged(page_scale_factor); } diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.h b/android_webview/browser/renderer_host/aw_render_view_host_ext.h index 8894793..24e6a43 100644 --- a/android_webview/browser/renderer_host/aw_render_view_host_ext.h +++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.h @@ -81,7 +81,6 @@ class AwRenderViewHostExt : public content::WebContentsObserver, void OnDocumentHasImagesResponse(int msg_id, bool has_images); void OnUpdateHitTestData(const AwHitTestData& hit_test_data); - void OnDidActivateAcceleratedCompositing(int input_handler_id); void OnPageScaleFactorChanged(float page_scale_factor); bool IsRenderViewReady() const; diff --git a/android_webview/common/render_view_messages.h b/android_webview/common/render_view_messages.h index 6d4ce7d..96e8c00 100644 --- a/android_webview/common/render_view_messages.h +++ b/android_webview/common/render_view_messages.h @@ -95,9 +95,3 @@ IPC_MESSAGE_ROUTED1(AwViewHostMsg_PageScaleFactorChanged, // AwViewMsg_EnableCapturePictureCallback was previously enabled. IPC_MESSAGE_ROUTED0(AwViewHostMsg_PictureUpdated) -// Sent by the renderer when accelerated compositing is enabled, allowing the -// browser to perform synchronous input event filtering. -IPC_MESSAGE_ROUTED1(AwViewHostMsg_DidActivateAcceleratedCompositing, - int /* input_handler_id */) - - diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index c72db2e..27a7242 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -192,11 +192,6 @@ void AwRenderViewExt::DidCommitProvisionalLoad(WebKit::WebFrame* frame, } } -void AwRenderViewExt::DidActivateCompositor(int input_handler_identifier) { - Send(new AwViewHostMsg_DidActivateAcceleratedCompositing( - routing_id(), input_handler_identifier)); -} - void AwRenderViewExt::DidCommitCompositorFrame() { UpdatePageScaleFactor(); } diff --git a/android_webview/renderer/aw_render_view_ext.h b/android_webview/renderer/aw_render_view_ext.h index 448c800..1379913 100644 --- a/android_webview/renderer/aw_render_view_ext.h +++ b/android_webview/renderer/aw_render_view_ext.h @@ -36,7 +36,6 @@ class AwRenderViewExt : public content::RenderViewObserver, virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, bool is_new_navigation) OVERRIDE; virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE; - virtual void DidActivateCompositor(int input_handler_identifier) OVERRIDE; virtual void DidCommitCompositorFrame() OVERRIDE; void OnDocumentHasImagesRequest(int id); diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index ea02ba3..abfe74e 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -863,14 +863,6 @@ float ContentViewCoreImpl::GetDpiScale() const { return dpi_scale_; } -void ContentViewCoreImpl::SetInputHandler( - WebKit::WebCompositorInputHandler* input_handler) { - if (!input_event_filter_) - input_event_filter_.reset(new SyncInputEventFilter); - - input_event_filter_->SetInputHandler(input_handler); -} - void ContentViewCoreImpl::RequestContentClipping( const gfx::Rect& clipping, const gfx::Size& content_size) { diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h index 11fc267..b9edb67 100644 --- a/content/browser/android/content_view_core_impl.h +++ b/content/browser/android/content_view_core_impl.h @@ -60,8 +60,6 @@ class ContentViewCoreImpl : public ContentViewCore, float scale, gfx::Size* out_size) OVERRIDE; virtual float GetDpiScale() const OVERRIDE; - virtual void SetInputHandler( - WebKit::WebCompositorInputHandler* input_handler) OVERRIDE; virtual void RequestContentClipping(const gfx::Rect& clipping, const gfx::Size& content_size) OVERRIDE; virtual void AddFrameInfoCallback( diff --git a/content/browser/android/sync_input_event_filter.cc b/content/browser/android/sync_input_event_filter.cc index ffeb9e6..fb252c36 100644 --- a/content/browser/android/sync_input_event_filter.cc +++ b/content/browser/android/sync_input_event_filter.cc @@ -4,77 +4,12 @@ #include "base/debug/trace_event.h" #include "content/browser/android/sync_input_event_filter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandler.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" using WebKit::WebInputEvent; namespace content { -class SyncInputEventFilter::InputHandlerWrapper - : public WebKit::WebCompositorInputHandlerClient { - public: - InputHandlerWrapper(SyncInputEventFilter* event_filter, - WebKit::WebCompositorInputHandler* input_handler) - : event_result_(INPUT_EVENT_ACK_STATE_UNKNOWN), - event_filter_(event_filter), - input_handler_(input_handler) { - input_handler_->setClient(this); - } - - virtual ~InputHandlerWrapper() { - input_handler_->setClient(NULL); - } - - InputEventAckState HandleInputEvent( - const WebKit::WebInputEvent& input_event) { - - // Clear the result for the (unexpected) case that callbacks to - // did/didNotHandleInputEvent are not made synchronously. - event_result_ = INPUT_EVENT_ACK_STATE_UNKNOWN; - - // It is expected that input_handler_ makes an appropriate synchronous - // callback to did/didNotHandleInputEvent. event_result_ is then assigned in - // those callbacks. - input_handler_->handleInputEvent(input_event); - - DCHECK(event_result_ != INPUT_EVENT_ACK_STATE_UNKNOWN); - - return event_result_; - } - - WebKit::WebCompositorInputHandler* input_handler() const { - return input_handler_; - } - - // WebCompositorInputHandlerClient methods: - - virtual void willShutdown() { - event_filter_->ClearInputHandler(); - } - - virtual void didHandleInputEvent() { - event_result_ = INPUT_EVENT_ACK_STATE_CONSUMED; - } - - virtual void didNotHandleInputEvent(bool send_to_widget) { - event_result_ = send_to_widget ? INPUT_EVENT_ACK_STATE_NOT_CONSUMED - : INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; - } - - private: - // This acts as a temporary result, storing the result of the - // did/didNotHandleInputEvent callbacks. We use it to avoid creating a - // closure or reference to a stack variable. - InputEventAckState event_result_; - - SyncInputEventFilter* event_filter_; - WebKit::WebCompositorInputHandler* input_handler_; - - DISALLOW_COPY_AND_ASSIGN(InputHandlerWrapper); -}; - //------------------------------------------------------------------------------ SyncInputEventFilter::SyncInputEventFilter() { @@ -86,35 +21,11 @@ SyncInputEventFilter::~SyncInputEventFilter() { InputEventAckState SyncInputEventFilter::HandleInputEvent( const WebInputEvent& event) { - if (!input_handler_) - return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; - - return input_handler_->HandleInputEvent(event); -} - -void SyncInputEventFilter::SetInputHandler( - WebKit::WebCompositorInputHandler* new_input_handler) { - DCHECK(thread_checker_.CalledOnValidThread()); - - if (!new_input_handler) { - return; - } - - if (input_handler_) { - // It's valid to call SetInputHandler() with the same input_handler many - // times, but it's not valid to change the input_handler once it's been set. - DCHECK_EQ(input_handler_->input_handler(), new_input_handler); - return; - } - - TRACE_EVENT0("cc", "SyncInputEventFilter::SetInputHandler"); - input_handler_.reset(new InputHandlerWrapper(this, new_input_handler)); + return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; } void SyncInputEventFilter::ClearInputHandler() { DCHECK(thread_checker_.CalledOnValidThread()); - TRACE_EVENT0("cc", "SyncInputEventFilter::ClearInputHandler"); - input_handler_.reset(); } } // namespace content diff --git a/content/browser/android/sync_input_event_filter.h b/content/browser/android/sync_input_event_filter.h index dea7524..e2ce90b 100644 --- a/content/browser/android/sync_input_event_filter.h +++ b/content/browser/android/sync_input_event_filter.h @@ -10,7 +10,6 @@ #include "content/port/common/input_event_ack_state.h" namespace WebKit { -class WebCompositorInputHandler; class WebInputEvent; } @@ -26,16 +25,12 @@ class SyncInputEventFilter { ~SyncInputEventFilter(); InputEventAckState HandleInputEvent(const WebKit::WebInputEvent& input_event); - void SetInputHandler(WebKit::WebCompositorInputHandler* input_handler); void ClearInputHandler(); private: // Used to DCHECK that input_handler_ changes are made on the correct thread. base::ThreadChecker thread_checker_; - class InputHandlerWrapper; - scoped_ptr<InputHandlerWrapper> input_handler_; - DISALLOW_COPY_AND_ASSIGN(SyncInputEventFilter); }; diff --git a/content/public/browser/android/content_view_core.h b/content/public/browser/android/content_view_core.h index 6ba7e4b..1797a04 100644 --- a/content/public/browser/android/content_view_core.h +++ b/content/public/browser/android/content_view_core.h @@ -28,10 +28,6 @@ class ViewAndroid; class WindowAndroid; } -namespace WebKit { -class WebCompositorInputHandler; -} - namespace content { class WebContents; @@ -56,8 +52,6 @@ class CONTENT_EXPORT ContentViewCore { float scale, gfx::Size* out_size) = 0; virtual float GetDpiScale() const = 0; - virtual void SetInputHandler( - WebKit::WebCompositorInputHandler* input_handler) = 0; virtual void RequestContentClipping(const gfx::Rect& clipping, const gfx::Size& content_size) = 0; diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h index a96a574..c6bd608 100644 --- a/content/public/renderer/render_view_observer.h +++ b/content/public/renderer/render_view_observer.h @@ -85,7 +85,6 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Listener, virtual void DidRequestShowContextMenu( WebKit::WebFrame* frame, const WebKit::WebContextMenuData& data) {} - virtual void DidActivateCompositor(int input_handler_id) {} virtual void DidCommitCompositorFrame() {} // These match the RenderView methods. diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index b4bf77c..1030477 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2628,9 +2628,6 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { #endif RenderWidget::didActivateCompositor(input_handler_identifier); - - FOR_EACH_OBSERVER(RenderViewObserver, observers_, - DidActivateCompositor(input_handler_identifier)); } void RenderViewImpl::didHandleGestureEvent( |