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

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

Issue 288633002: Remove renderer-side tracking of accelerated compositing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on piman;danakj review Created 6 years, 7 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 | « content/renderer/render_widget.cc ('k') | 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_widget_fullscreen_pepper.h" 5 #include "content/renderer/render_widget_fullscreen_pepper.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 Release(); 317 Release();
318 } 318 }
319 319
320 void RenderWidgetFullscreenPepper::DidChangeCursor( 320 void RenderWidgetFullscreenPepper::DidChangeCursor(
321 const blink::WebCursorInfo& cursor) { 321 const blink::WebCursorInfo& cursor) {
322 didChangeCursor(cursor); 322 didChangeCursor(cursor);
323 } 323 }
324 324
325 void RenderWidgetFullscreenPepper::SetLayer(blink::WebLayer* layer) { 325 void RenderWidgetFullscreenPepper::SetLayer(blink::WebLayer* layer) {
326 layer_ = layer; 326 layer_ = layer;
327 bool compositing = !!layer_; 327 if (!layer_) {
328 if (compositing != is_accelerated_compositing_active_) { 328 compositor_->clearRootLayer();
329 if (compositing) { 329 return;
330 if (!layerTreeView())
331 initializeLayerTreeView();
332 if (!layerTreeView())
333 return;
334 layer_->setBounds(blink::WebSize(size()));
335 layer_->setDrawsContent(true);
336 compositor_->setDeviceScaleFactor(device_scale_factor_);
337 compositor_->setRootLayer(*layer_);
338 didActivateCompositor();
339 } else {
340 didDeactivateCompositor();
341 }
342 } 330 }
331 if (!layerTreeView())
332 initializeLayerTreeView();
333 layer_->setBounds(blink::WebSize(size()));
334 layer_->setDrawsContent(true);
335 compositor_->setDeviceScaleFactor(device_scale_factor_);
336 compositor_->setRootLayer(*layer_);
343 } 337 }
344 338
345 bool RenderWidgetFullscreenPepper::OnMessageReceived(const IPC::Message& msg) { 339 bool RenderWidgetFullscreenPepper::OnMessageReceived(const IPC::Message& msg) {
346 bool handled = true; 340 bool handled = true;
347 IPC_BEGIN_MESSAGE_MAP(RenderWidgetFullscreenPepper, msg) 341 IPC_BEGIN_MESSAGE_MAP(RenderWidgetFullscreenPepper, msg)
348 IPC_MESSAGE_FORWARD(ViewMsg_LockMouse_ACK, 342 IPC_MESSAGE_FORWARD(ViewMsg_LockMouse_ACK,
349 mouse_lock_dispatcher_.get(), 343 mouse_lock_dispatcher_.get(),
350 MouseLockDispatcher::OnLockMouseACK) 344 MouseLockDispatcher::OnLockMouseACK)
351 IPC_MESSAGE_FORWARD(ViewMsg_MouseLockLost, 345 IPC_MESSAGE_FORWARD(ViewMsg_MouseLockLost,
352 mouse_lock_dispatcher_.get(), 346 mouse_lock_dispatcher_.get(),
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 } 389 }
396 390
397 void RenderWidgetFullscreenPepper::SetDeviceScaleFactor( 391 void RenderWidgetFullscreenPepper::SetDeviceScaleFactor(
398 float device_scale_factor) { 392 float device_scale_factor) {
399 RenderWidget::SetDeviceScaleFactor(device_scale_factor); 393 RenderWidget::SetDeviceScaleFactor(device_scale_factor);
400 if (compositor_) 394 if (compositor_)
401 compositor_->setDeviceScaleFactor(device_scale_factor); 395 compositor_->setDeviceScaleFactor(device_scale_factor);
402 } 396 }
403 397
404 } // namespace content 398 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698