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

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

Issue 11946019: Disable compositor thread input handling on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/bind.h" 10 #include "base/bind.h"
(...skipping 2509 matching lines...) Expand 10 before | Expand all | Expand 10 after
2520 void RenderViewImpl::requestPointerUnlock() { 2520 void RenderViewImpl::requestPointerUnlock() {
2521 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); 2521 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get());
2522 } 2522 }
2523 2523
2524 bool RenderViewImpl::isPointerLocked() { 2524 bool RenderViewImpl::isPointerLocked() {
2525 return mouse_lock_dispatcher_->IsMouseLockedTo( 2525 return mouse_lock_dispatcher_->IsMouseLockedTo(
2526 webwidget_mouse_lock_target_.get()); 2526 webwidget_mouse_lock_target_.get());
2527 } 2527 }
2528 2528
2529 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { 2529 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
2530 #if !defined(OS_WIN) // http://crbug.com/160122
2530 CompositorThread* compositor_thread = 2531 CompositorThread* compositor_thread =
2531 RenderThreadImpl::current()->compositor_thread(); 2532 RenderThreadImpl::current()->compositor_thread();
2532 if (compositor_thread) 2533 if (compositor_thread)
2533 compositor_thread->AddInputHandler( 2534 compositor_thread->AddInputHandler(
2534 routing_id_, input_handler_identifier, AsWeakPtr()); 2535 routing_id_, input_handler_identifier, AsWeakPtr());
2536 #endif
2535 2537
2536 RenderWidget::didActivateCompositor(input_handler_identifier); 2538 RenderWidget::didActivateCompositor(input_handler_identifier);
2537 2539
2538 ProcessAcceleratedPinchZoomFlags(*CommandLine::ForCurrentProcess()); 2540 ProcessAcceleratedPinchZoomFlags(*CommandLine::ForCurrentProcess());
2539 } 2541 }
2540 2542
2541 // WebKit::WebFrameClient ----------------------------------------------------- 2543 // WebKit::WebFrameClient -----------------------------------------------------
2542 2544
2543 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, 2545 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
2544 const WebPluginParams& params) { 2546 const WebPluginParams& params) {
(...skipping 4027 matching lines...) Expand 10 before | Expand all | Expand 10 after
6572 } 6574 }
6573 #endif 6575 #endif
6574 6576
6575 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6577 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6576 TransportDIB::Handle dib_handle) { 6578 TransportDIB::Handle dib_handle) {
6577 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6579 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6578 RenderProcess::current()->ReleaseTransportDIB(dib); 6580 RenderProcess::current()->ReleaseTransportDIB(dib);
6579 } 6581 }
6580 6582
6581 } // namespace content 6583 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698