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

Side by Side Diff: cc/layer_tree_host.cc

Issue 11967015: Hide location bar on WebKit programmatic scroll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't plumb through WebLayerTreeView 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/layer_tree_host.h" 5 #include "cc/layer_tree_host.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 464
465 if (LayerTreeDebugState::equal(m_debugState, newDebugState)) 465 if (LayerTreeDebugState::equal(m_debugState, newDebugState))
466 return; 466 return;
467 467
468 m_debugState = newDebugState; 468 m_debugState = newDebugState;
469 setNeedsCommit(); 469 setNeedsCommit();
470 } 470 }
471 471
472 void LayerTreeHost::setViewportSize(const gfx::Size& layoutViewportSize, const g fx::Size& deviceViewportSize) 472 void LayerTreeHost::setViewportSize(const gfx::Size& layoutViewportSize, const g fx::Size& deviceViewportSize)
473 { 473 {
474 if (layoutViewportSize == m_layoutViewportSize && deviceViewportSize == m_de viceViewportSize) 474 gfx::Size mutatedDeviceViewportSize(deviceViewportSize);
475 if (m_settings.calculateTopControlsPosition)
476 mutatedDeviceViewportSize.Enlarge(0, m_settings.topControlsHeightPx);
477
478 if (layoutViewportSize == m_layoutViewportSize && mutatedDeviceViewportSize == m_deviceViewportSize)
475 return; 479 return;
476 480
477 m_layoutViewportSize = layoutViewportSize; 481 m_layoutViewportSize = layoutViewportSize;
478 m_deviceViewportSize = deviceViewportSize; 482 m_deviceViewportSize = mutatedDeviceViewportSize;
479 483
480 setNeedsCommit(); 484 setNeedsCommit();
481 } 485 }
482 486
483 void LayerTreeHost::setPageScaleFactorAndLimits(float pageScaleFactor, float min PageScaleFactor, float maxPageScaleFactor) 487 void LayerTreeHost::setPageScaleFactorAndLimits(float pageScaleFactor, float min PageScaleFactor, float maxPageScaleFactor)
484 { 488 {
485 if (pageScaleFactor == m_pageScaleFactor && minPageScaleFactor == m_minPageS caleFactor && maxPageScaleFactor == m_maxPageScaleFactor) 489 if (pageScaleFactor == m_pageScaleFactor && minPageScaleFactor == m_minPageS caleFactor && maxPageScaleFactor == m_maxPageScaleFactor)
486 return; 490 return;
487 491
488 m_pageScaleFactor = pageScaleFactor; 492 m_pageScaleFactor = pageScaleFactor;
489 m_minPageScaleFactor = minPageScaleFactor; 493 m_minPageScaleFactor = minPageScaleFactor;
490 m_maxPageScaleFactor = maxPageScaleFactor; 494 m_maxPageScaleFactor = maxPageScaleFactor;
491 setNeedsCommit(); 495 setNeedsCommit();
492 } 496 }
493 497
498 void LayerTreeHost::programmaticScroll(gfx::Vector2d targetOffset)
499 {
500 m_proxy->programmaticScroll(targetOffset);
501 }
502
494 void LayerTreeHost::setVisible(bool visible) 503 void LayerTreeHost::setVisible(bool visible)
495 { 504 {
496 if (m_visible == visible) 505 if (m_visible == visible)
497 return; 506 return;
498 m_visible = visible; 507 m_visible = visible;
499 m_proxy->setVisible(visible); 508 m_proxy->setVisible(visible);
500 } 509 }
501 510
502 void LayerTreeHost::startPageScaleAnimation(gfx::Vector2d targetOffset, bool use Anchor, float scale, base::TimeDelta duration) 511 void LayerTreeHost::startPageScaleAnimation(gfx::Vector2d targetOffset, bool use Anchor, float scale, base::TimeDelta duration)
503 { 512 {
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex) 886 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex)
878 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime); 887 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
879 } 888 }
880 889
881 skia::RefPtr<SkPicture> LayerTreeHost::capturePicture() 890 skia::RefPtr<SkPicture> LayerTreeHost::capturePicture()
882 { 891 {
883 return m_proxy->capturePicture(); 892 return m_proxy->capturePicture();
884 } 893 }
885 894
886 } // namespace cc 895 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layer_tree_host.h ('k') | cc/layer_tree_host_impl.h » ('j') | cc/top_controls_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698