Unify GeometryPropertyTreeState and PropertyTreeState

Unify GeometryPropertyTreeState and PropertyTreeState

This patch unifies the two property tree state classes so just
PropertyTreeState is used. The majority of this patch is a mechanical
refactor.

There are three real changes in this patch:
1) GeometryPropertyTreeState has been replaced by PropertyTreeState.
2) Comments in ObjectPaintProperties.h have been updated.
3) ObjectPaintProperties's localBorderBoxProperties and
   contentsProperties have been refactored to both return a
   PropertyTreeStateWithOffset. This was needed because
   PropertyTreeState does not permit the reference out-param approach
   that was previously used for getContentsPropertyTreeState.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Committed: https://crrev.com/3186773510907edfda53bf8fef382a087f61c6f4
Cr-Commit-Position: refs/heads/master@{#422626}

[pdr., 2016-10-01 00:52:03]

Description was changed from

==========
Unify GeometryPropertyTreeState and PropertyTreeState

This patch unifies the two property tree state classes so just
PropertyTreeState is used. The majority of this patch is a mechanical
refactor.

There are three real changes in this patch:
1) GeometryPropertyTreeState has been replaced by PropertyTreeState.
2) Comments in ObjectPaintProperties.h have been updated.
3) ObjectPaintPropertie's localBorderBoxProperties and
   contentsProperties have been refactored to both return a
   PropertyTreeStateWithOffset. This was needed because
   PropertyTreeState does not permit the reference out-param approach
   that was previously used for getContentsPropertyTreeState.
==========

to

==========
Unify GeometryPropertyTreeState and PropertyTreeState

This patch unifies the two property tree state classes so just
PropertyTreeState is used. The majority of this patch is a mechanical
refactor.

There are three real changes in this patch:
1) GeometryPropertyTreeState has been replaced by PropertyTreeState.
2) Comments in ObjectPaintProperties.h have been updated.
3) ObjectPaintPropertie's localBorderBoxProperties and
   contentsProperties have been refactored to both return a
   PropertyTreeStateWithOffset. This was needed because
   PropertyTreeState does not permit the reference out-param approach
   that was previously used for getContentsPropertyTreeState.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

[pdr., 2016-10-01 02:08:01]

pdr@chromium.org changed reviewers:
+ chrishtr@chromium.org, wangxianzhu@chromium.org

[pdr., 2016-10-01 02:11:15]

pdr@chromium.org changed reviewers:
+ trchen@chromium.org

[pdr., 2016-10-01 02:11:15]

No rush on this patch, lets get it right. Please nitpick the comments and
function names.

[Xianzhu, 2016-10-03 16:17:50]

lgtm

[chrishtr, 2016-10-03 16:50:52]

Description was changed from

==========
Unify GeometryPropertyTreeState and PropertyTreeState

This patch unifies the two property tree state classes so just
PropertyTreeState is used. The majority of this patch is a mechanical
refactor.

There are three real changes in this patch:
1) GeometryPropertyTreeState has been replaced by PropertyTreeState.
2) Comments in ObjectPaintProperties.h have been updated.
3) ObjectPaintPropertie's localBorderBoxProperties and
   contentsProperties have been refactored to both return a
   PropertyTreeStateWithOffset. This was needed because
   PropertyTreeState does not permit the reference out-param approach
   that was previously used for getContentsPropertyTreeState.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

to

==========
Unify GeometryPropertyTreeState and PropertyTreeState

This patch unifies the two property tree state classes so just
PropertyTreeState is used. The majority of this patch is a mechanical
refactor.

There are three real changes in this patch:
1) GeometryPropertyTreeState has been replaced by PropertyTreeState.
2) Comments in ObjectPaintProperties.h have been updated.
3) ObjectPaintProperties's localBorderBoxProperties and
   contentsProperties have been refactored to both return a
   PropertyTreeStateWithOffset. This was needed because
   PropertyTreeState does not permit the reference out-param approach
   that was previously used for getContentsPropertyTreeState.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

[chrishtr, 2016-10-03 16:54:19]

lgtm

[pdr., 2016-10-03 17:14:04]

The CQ bit was checked by pdr@chromium.org

[commit-bot: I haz the power, 2016-10-03 17:14:26]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-03 18:39:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-03 18:39:13]

Failed to apply patch for third_party/WebKit/Source/platform/BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: third_party/WebKit/Source/platform/BUILD.gn:980
  Falling back to three-way merge...
  Applied patch to 'third_party/WebKit/Source/platform/BUILD.gn' with conflicts.
  U third_party/WebKit/Source/platform/BUILD.gn

Patch:       third_party/WebKit/Source/platform/BUILD.gn
Index: third_party/WebKit/Source/platform/BUILD.gn
diff --git a/third_party/WebKit/Source/platform/BUILD.gn
b/third_party/WebKit/Source/platform/BUILD.gn
index
82114107b5dab0af83f4c89dea9177442b5dad3f..111cbc9245e4d641b93166d962648f808df47090
100644
--- a/third_party/WebKit/Source/platform/BUILD.gn
+++ b/third_party/WebKit/Source/platform/BUILD.gn
@@ -969,7 +969,6 @@ component("platform") {
     "graphics/paint/ForeignLayerDisplayItem.h",
     "graphics/paint/GeometryMapper.cpp",
     "graphics/paint/GeometryMapper.h",
-    "graphics/paint/GeometryPropertyTreeState.h",
     "graphics/paint/PaintArtifact.cpp",
     "graphics/paint/PaintArtifact.h",
     "graphics/paint/PaintArtifactToSkCanvas.cpp",
@@ -980,6 +979,7 @@ component("platform") {
     "graphics/paint/PaintChunker.h",
     "graphics/paint/PaintController.cpp",
     "graphics/paint/PaintController.h",
+    "graphics/paint/PropertyTreeState.h",
     "graphics/paint/ScopedPaintChunkProperties.h",
     "graphics/paint/ScrollDisplayItem.cpp",
     "graphics/paint/ScrollDisplayItem.h",

[pdr., 2016-10-03 19:44:26]

The CQ bit was checked by pdr@chromium.org

[pdr., 2016-10-03 19:44:27]

The patchset sent to the CQ was uploaded after l-g-t-m from
chrishtr@chromium.org, wangxianzhu@chromium.org
Link to the patchset: https://codereview.chromium.org/2390443002/#ps40001
(title: "Rebase")

[commit-bot: I haz the power, 2016-10-03 19:44:58]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-03 19:47:38]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-03 19:47:39]

Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[pdr., 2016-10-03 19:58:11]

The CQ bit was checked by pdr@chromium.org

[pdr., 2016-10-03 19:58:11]

The patchset sent to the CQ was uploaded after l-g-t-m from
chrishtr@chromium.org, wangxianzhu@chromium.org
Link to the patchset: https://codereview.chromium.org/2390443002/#ps60001
(title: "rebase x2")

[commit-bot: I haz the power, 2016-10-03 19:58:54]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-04 00:29:08]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-10-04 00:32:04]

Description was changed from

==========
Unify GeometryPropertyTreeState and PropertyTreeState

This patch unifies the two property tree state classes so just
PropertyTreeState is used. The majority of this patch is a mechanical
refactor.

There are three real changes in this patch:
1) GeometryPropertyTreeState has been replaced by PropertyTreeState.
2) Comments in ObjectPaintProperties.h have been updated.
3) ObjectPaintProperties's localBorderBoxProperties and
   contentsProperties have been refactored to both return a
   PropertyTreeStateWithOffset. This was needed because
   PropertyTreeState does not permit the reference out-param approach
   that was previously used for getContentsPropertyTreeState.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

to

==========
Unify GeometryPropertyTreeState and PropertyTreeState

This patch unifies the two property tree state classes so just
PropertyTreeState is used. The majority of this patch is a mechanical
refactor.

There are three real changes in this patch:
1) GeometryPropertyTreeState has been replaced by PropertyTreeState.
2) Comments in ObjectPaintProperties.h have been updated.
3) ObjectPaintProperties's localBorderBoxProperties and
   contentsProperties have been refactored to both return a
   PropertyTreeStateWithOffset. This was needed because
   PropertyTreeState does not permit the reference out-param approach
   that was previously used for getContentsPropertyTreeState.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Committed: https://crrev.com/3186773510907edfda53bf8fef382a087f61c6f4
Cr-Commit-Position: refs/heads/master@{#422626}
==========

[commit-bot: I haz the power, 2016-10-04 00:32:05]

Patchset 4 (id:??) landed as
https://crrev.com/3186773510907edfda53bf8fef382a087f61c6f4
Cr-Commit-Position: refs/heads/master@{#422626}