cc: Remove cc::settings, move them to LayerTreeSettings.

cc: Remove cc::settings, move them to LayerTreeSettings.

For now, we don't want to make plumbing through the WebKit API for all these
settings. So they are marked with a TODO to move into chromium. When we are
no longer going through the WebKit API from chromium, we can set these settings
in chromium, instead of reading the command-line parameters in cc.

Depends on: https://bugs.webkit.org/show_bug.cgi?id=102146

R=jamesr
BUG=160771
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167750

[danakj, 2012-11-12 19:06:16]

I don't really like this CL as it is, because of the SchedulerStateMachine
change. Soliciting advice on how to do that cleaner.

[enne (OOO), 2012-11-12 19:10:24]

Make it a constructor arg, rather than a per-function arg?

[danakj, 2012-11-12 19:56:54]

This makes a setter on the statemachine, which reduced the diff size a fair bit.

[danakj, 2012-11-12 21:37:43]

@jamesr can you take a look please, along with
https://bugs.webkit.org/show_bug.cgi?id=101968

Updated this to move some settings out of cc/ into chromium.

Settings that DRT wants to be able to set are moved into WebLayerTreeSettings
here: https://bugs.webkit.org/show_bug.cgi?id=101968

Those same settings can now be set in chromium, then. So add them to
WebPreferences, and remove the command line reading from cc/.

Things that WebKit doesn't care to set don't make much sense on
WebLayerTreeHost, so they stayed in cc/ for now.

[jamesr, 2012-11-12 23:38:35]

lgtm

jank-instead-of-checkerboard is going away so if you end up landing after that
be sure to rip that out

[danakj, 2012-11-13 02:33:08]

https://codereview.chromium.org/11361223/diff/13001/cc/layer_tree_host.cc
File cc/layer_tree_host.cc (right):

https://codereview.chromium.org/11361223/diff/13001/cc/layer_tree_host.cc#new...
cc/layer_tree_host.cc:62: // TODO(danakj): Move these to chromium after we stop
going through the WebKit API.
Should I move these over to web_layer_tree_view_impl.cc so that they are only
set on the renderer?

[danakj, 2012-11-13 02:35:12]

https://codereview.chromium.org/11361223/diff/13001/cc/layer_tree_host.cc
File cc/layer_tree_host.cc (right):

https://codereview.chromium.org/11361223/diff/13001/cc/layer_tree_host.cc#new...
cc/layer_tree_host.cc:62: // TODO(danakj): Move these to chromium after we stop
going through the WebKit API.
On 2012/11/13 02:33:08, danakj wrote:
> Should I move these over to web_layer_tree_view_impl.cc so that they are only
> set on the renderer?

Oh, nevermind. I see that the UI also creates its LTH via that interface.

[danakj, 2012-11-13 19:13:46]

+dmichael for ppapi/

[danakj, 2012-11-13 19:14:43]

+jam for chrome/ and content/

[danakj, 2012-11-13 19:15:34]

+cdn for view_messages.h

[yzshen1, 2012-11-13 21:05:10]

LGTM for .*ppapi.* and .*pepper.*

[Cris Neckar, 2012-11-13 21:10:25]

lgtm for view_messages.h

[jam, 2012-11-13 22:18:47]

lgtm

[danakj, 2012-11-14 00:18:41]

Ok I stopped removing the WebCompositorSupport::setFoo() methods, just made them
no-ops here.

1. The webkit side will start using both these methods and the layer tree
settings.
2. This will make these methods no-ops and only use the layer tree settings.
3. Another webkit side patch will stop calling these methods.
4. Another chromium side patch will remove these methods.
5. Another webkit side patch will remove the methods from the base class.

Phew.

[slavi, 2012-11-14 00:54:58]

https://codereview.chromium.org/11361223/diff/11003/cc/layer_tree_host.cc
File cc/layer_tree_host.cc (right):

https://codereview.chromium.org/11361223/diff/11003/cc/layer_tree_host.cc#new...
cc/layer_tree_host.cc:53: , jankInsteadOfCheckerboard(false)
Wasn't jank-instead-of-checkerboard removed a couple days ago?

[danakj, 2012-11-14 00:56:35]

https://codereview.chromium.org/11361223/diff/11003/cc/layer_tree_host.cc
File cc/layer_tree_host.cc (right):

https://codereview.chromium.org/11361223/diff/11003/cc/layer_tree_host.cc#new...
cc/layer_tree_host.cc:53: , jankInsteadOfCheckerboard(false)
On 2012/11/14 00:54:58, slavi wrote:
> Wasn't jank-instead-of-checkerboard removed a couple days ago?

it's in the process of dying in the CQ.

[commit-bot: I haz the power, 2012-11-14 05:05:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11361223/11003

[commit-bot: I haz the power, 2012-11-14 05:25:35]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-11-14 16:43:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11361223/11003

[commit-bot: I haz the power, 2012-11-14 16:43:27]

Failed to apply patch for cc/layer_tree_host_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layer_tree_host_impl.cc
  Hunk #4 FAILED at 305.
  1 out of 14 hunks FAILED -- saving rejects to file
cc/layer_tree_host_impl.cc.rej

Patch:       cc/layer_tree_host_impl.cc
Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index
01afc00f5ce1147c2ee63b3574c2a64fc0d37e54..3d6119d54c28744dc9f121ff17b969d13232887c
100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -28,7 +28,6 @@
 #include "cc/rendering_stats.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "cc/scrollbar_layer_impl.h"
-#include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/software_renderer.h"
 #include "cc/texture_uploader.h"
@@ -133,14 +132,14 @@ gfx::Vector2dF PinchZoomViewport::applyScroll(const
gfx::Vector2dF& delta)
     return overflow;
 }
 
-WebTransformationMatrix PinchZoomViewport::implTransform() const
+WebTransformationMatrix PinchZoomViewport::implTransform(bool
pageScalePinchZoomEnabled) const
 {
     WebTransformationMatrix transform;
     transform.scale(m_pageScaleDelta);
 
     // If the pinch state is applied in the impl, then push it to the
     // impl transform, otherwise the scale is handled by WebCore.
-    if (Settings::pageScalePinchZoomEnabled()) {
+    if (pageScalePinchZoomEnabled) {
         transform.scale(m_pageScaleFactor);
         transform.translate(-m_pinchViewportScrollDelta.x(),
                             -m_pinchViewportScrollDelta.y());
@@ -295,7 +294,7 @@ void
LayerTreeHostImpl::startPageScaleAnimation(gfx::Vector2d targetPosition, bo
 
     gfx::Vector2dF scrollTotal = m_rootScrollLayerImpl->scrollOffset() +
m_rootScrollLayerImpl->scrollDelta();
     gfx::SizeF scaledContentSize = contentSize();
-    if (!Settings::pageScalePinchZoomEnabled()) {
+    if (!m_settings.pageScalePinchZoomEnabled) {
         scrollTotal.Scale(1 / m_pinchZoomViewport.pageScaleFactor());
         scaledContentSize.Scale(1 / m_pinchZoomViewport.pageScaleFactor());
     }
@@ -306,12 +305,12 @@ void
LayerTreeHostImpl::startPageScaleAnimation(gfx::Vector2d targetPosition, bo
 
     if (anchorPoint) {
         gfx::Vector2dF anchor(targetPosition);
-        if (!Settings::pageScalePinchZoomEnabled())
+        if (!m_settings.pageScalePinchZoomEnabled)
             anchor.Scale(1 / pageScale);
         m_pageScaleAnimation->zoomWithAnchor(anchor, pageScale,
duration.InSecondsF());
     } else {
         gfx::Vector2dF scaledTargetPosition = targetPosition;
-        if (!Settings::pageScalePinchZoomEnabled())
+        if (!m_settings.pageScalePinchZoomEnabled)
             scaledTargetPosition.Scale(1 / pageScale);
         m_pageScaleAnimation->zoomTo(scaledTargetPosition, pageScale,
duration.InSecondsF());
     }
@@ -384,7 +383,7 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData&
frame)
         renderSurfaceLayer->renderSurface()->appendRenderPasses(frame);
     }
 
-    bool recordMetricsForFrame = Settings::traceOverdraw() &&
base::debug::TraceLog::GetInstance() &&
base::debug::TraceLog::GetInstance()->IsEnabled();
+    bool recordMetricsForFrame = m_settings.showOverdrawInTracing &&
base::debug::TraceLog::GetInstance() &&
base::debug::TraceLog::GetInstance()->IsEnabled();
     OcclusionTrackerImpl
occlusionTracker(m_rootLayerImpl->renderSurface()->contentRect(),
recordMetricsForFrame);
    
occlusionTracker.setMinimumTrackingSize(m_settings.minimumOcclusionTrackingSize);
 
@@ -442,7 +441,7 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData&
frame)
 
         if (appendQuadsData.hadMissingTiles) {
             bool layerHasAnimatingTransform =
it->screenSpaceTransformIsAnimating() || it->drawTransformIsAnimating();
-            if (layerHasAnimatingTransform ||
Settings::jankInsteadOfCheckerboard())
+            if (layerHasAnimatingTransform ||
m_settings.jankInsteadOfCheckerboard)
                 drawFrame = false;
         }
 
@@ -957,7 +956,7 @@ void LayerTreeHostImpl::setPageScaleFactorAndLimits(float
pageScaleFactor, float
     float pageScaleChange = pageScaleFactor /
m_pinchZoomViewport.pageScaleFactor();
     m_pinchZoomViewport.setPageScaleFactorAndLimits(pageScaleFactor,
minPageScaleFactor, maxPageScaleFactor);
 
-    if (!Settings::pageScalePinchZoomEnabled()) {
+    if (!m_settings.pageScalePinchZoomEnabled) {
         if (pageScaleChange != 1)
             adjustScrollsForPageScaleChange(m_rootScrollLayerImpl,
pageScaleChange);
     }
@@ -987,7 +986,7 @@ void LayerTreeHostImpl::updateMaxScrollOffset()
     }
 
     gfx::Size contentBounds = contentSize();
-    if (Settings::pageScalePinchZoomEnabled()) {
+    if (m_settings.pageScalePinchZoomEnabled) {
         // Pinch with pageScale scrolls entirely in layout space.  contentSize
         // returns the bounds including the page scale factor, so calculate the
         // pre page-scale layout size here.
@@ -1234,12 +1233,12 @@ void LayerTreeHostImpl::pinchGestureUpdate(float
magnifyDelta, gfx::Point anchor
 
     m_previousPinchAnchor = anchor;
 
-    if (Settings::pageScalePinchZoomEnabled()) {
+    if (m_settings.pageScalePinchZoomEnabled) {
         // Compute the application of the delta with respect to the current
page zoom of the page.
         move.Scale(1 / (m_pinchZoomViewport.pageScaleFactor() *
m_deviceScaleFactor));
     }
 
-    gfx::Vector2dF scrollOverflow = Settings::pageScalePinchZoomEnabled() ?
m_pinchZoomViewport.applyScroll(move) : move;
+    gfx::Vector2dF scrollOverflow = m_settings.pageScalePinchZoomEnabled ?
m_pinchZoomViewport.applyScroll(move) : move;
     m_rootScrollLayerImpl->scrollBy(scrollOverflow);
 
     if (m_rootScrollLayerImpl->scrollbarAnimationController())
@@ -1262,7 +1261,7 @@ void LayerTreeHostImpl::pinchGestureEnd()
 void LayerTreeHostImpl::computeDoubleTapZoomDeltas(ScrollAndScaleSet*
scrollInfo)
 {
     gfx::Vector2dF scaledScrollOffset =
m_pageScaleAnimation->targetScrollOffset();
-    if (!Settings::pageScalePinchZoomEnabled())
+    if (!m_settings.pageScalePinchZoomEnabled)
         scaledScrollOffset.Scale(m_pinchZoomViewport.pageScaleFactor());
     makeScrollAndScaleSet(scrollInfo, ToFlooredVector2d(scaledScrollOffset),
m_pageScaleAnimation->targetPageScaleFactor());
 }
@@ -1340,7 +1339,7 @@ scoped_ptr<ScrollAndScaleSet>
LayerTreeHostImpl::processScrollDeltas()
         m_pinchZoomViewport.setSentPageScaleDelta(1);
         // FIXME(aelias): Make pinch-zoom painting optimization compatible with
         // compositor-side scaling.
-        if (!Settings::pageScalePinchZoomEnabled() && m_pinchGestureActive)
+        if (!m_settings.pageScalePinchZoomEnabled && m_pinchGestureActive)
             computePinchZoomDeltas(scrollInfo.get());
         else if (m_pageScaleAnimation.get())
             computeDoubleTapZoomDeltas(scrollInfo.get());
@@ -1356,7 +1355,7 @@ scoped_ptr<ScrollAndScaleSet>
LayerTreeHostImpl::processScrollDeltas()
 
 WebTransformationMatrix LayerTreeHostImpl::implTransform() const
 {
-    return m_pinchZoomViewport.implTransform();
+    return
m_pinchZoomViewport.implTransform(m_settings.pageScalePinchZoomEnabled);
 }
 
 void LayerTreeHostImpl::setFullRootLayerDamage()
@@ -1379,7 +1378,7 @@ void LayerTreeHostImpl::animatePageScale(base::TimeTicks
time)
    
setPageScaleDelta(m_pageScaleAnimation->pageScaleFactorAtTime(monotonicTime) /
m_pinchZoomViewport.pageScaleFactor());
     gfx::Vector2dF nextScroll =
m_pageScaleAnimation->scrollOffsetAtTime(monotonicTime);
 
-    if (!Settings::pageScalePinchZoomEnabled())
+    if (!m_settings.pageScalePinchZoomEnabled)
         nextScroll.Scale(m_pinchZoomViewport.pageScaleFactor());
     m_rootScrollLayerImpl->scrollBy(nextScroll - scrollTotal);
     m_client->setNeedsRedrawOnImplThread();
@@ -1392,7 +1391,7 @@ void LayerTreeHostImpl::animatePageScale(base::TimeTicks
time)
 
 void LayerTreeHostImpl::animateLayers(base::TimeTicks monotonicTime, base::Time
wallClockTime)
 {
-    if (!Settings::acceleratedAnimationEnabled() || !m_needsAnimateLayers ||
!m_rootLayerImpl)
+    if (!m_settings.acceleratedAnimationEnabled || !m_needsAnimateLayers ||
!m_rootLayerImpl)
         return;
 
     TRACE_EVENT0("cc", "LayerTreeHostImpl::animateLayers");

[commit-bot: I haz the power, 2012-11-14 16:46:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11361223/7003

[commit-bot: I haz the power, 2012-11-14 19:15:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11361223/14009

[commit-bot: I haz the power, 2012-11-14 21:24:28]

Change committed as 167750