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

Issue 11465007: Move LayerSorter to exist locally only in layer_tree_host_common (Closed)

Created:
8 years ago by shawnsingh
Modified:
8 years ago
Reviewers:
nduca, enne (OOO)
CC:
chromium-reviews, cc-bugs_chromium.org
Visibility:
Public.

Description

Move LayerSorter to exist locally only in layer_tree_host_common At this time, LayerSorter does not need to be owned by the layer_tree_host_impl and passed into calculateDrawProperties. This patch moves it to layer_tree_host_common.cpp, and removes any leftovers from other files. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171658

Patch Set 1 #

Patch Set 2 : rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+51 lines, -53 lines) Patch
M cc/damage_tracker_unittest.cc View 3 chunks +2 lines, -3 lines 0 comments Download
M cc/layer_impl.h View 2 chunks +0 lines, -3 lines 0 comments Download
M cc/layer_impl.cc View 2 chunks +0 lines, -7 lines 0 comments Download
M cc/layer_tree_host_common.h View 2 chunks +1 line, -2 lines 0 comments Download
M cc/layer_tree_host_common.cc View 8 chunks +24 lines, -10 lines 0 comments Download
M cc/layer_tree_host_common_unittest.cc View 20 chunks +20 lines, -22 lines 0 comments Download
M cc/layer_tree_host_impl.h View 2 chunks +0 lines, -3 lines 0 comments Download
M cc/layer_tree_host_impl.cc View 1 chunk +1 line, -1 line 0 comments Download
M cc/layer_tree_host_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
M cc/occlusion_tracker_unittest.cc View 1 chunk +1 line, -2 lines 0 comments Download
M cc/picture_layer_impl.cc View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 5 (0 generated)
shawnsingh
你们可不可以看这个? Thanks in advance =)
8 years ago (2012-12-06 19:01:29 UTC) #1
nduca
lgtm and ty
8 years ago (2012-12-06 19:02:33 UTC) #2
enne (OOO)
lgtm2, thanks!
8 years ago (2012-12-06 19:06:16 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/shawnsingh@chromium.org/11465007/5001
8 years ago (2012-12-06 23:38:25 UTC) #4
commit-bot: I haz the power
8 years ago (2012-12-06 23:38:33 UTC) #5
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 #1 FAILED at 381.
  1 out of 1 hunk 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
4a1cb713a26c28666807aca089c982595504163a..014f445723b9bea0b6c7c826bb1d96f4e8562ec2
100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -381,7 +381,7 @@ void
LayerTreeHostImpl::calculateRenderSurfaceLayerList(LayerList& renderSurface
 
         TRACE_EVENT0("cc", "LayerTreeHostImpl::calcDrawEtc");
         float pageScaleFactor = m_pinchZoomViewport.pageScaleFactor();
-        LayerTreeHostCommon::calculateDrawProperties(m_rootLayerImpl.get(),
deviceViewportSize(), m_deviceScaleFactor, pageScaleFactor, &m_layerSorter,
rendererCapabilities().maxTextureSize, renderSurfaceLayerList);
+        LayerTreeHostCommon::calculateDrawProperties(m_rootLayerImpl.get(),
deviceViewportSize(), m_deviceScaleFactor, pageScaleFactor,
rendererCapabilities().maxTextureSize, renderSurfaceLayerList);
 
         trackDamageForAllSurfaces(m_rootLayerImpl.get(),
renderSurfaceLayerList);
     }

Powered by Google App Engine
This is Rietveld 408576698