Commit a7461b2b authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot

[SPv175] Disable comparison of some paint property node fields

The fields are used for SPv2 only, so disable comparison of them
for SPv175.

Bug: 813577
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I09f808d7545e49edefdbffcff1bb4385563a47d9
Reviewed-on: https://chromium-review.googlesource.com/926911
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: default avatarStephen Chenney <schenney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537906}
parent 4084f503
...@@ -1024,6 +1024,9 @@ TEST_P(PaintPropertyTreeUpdateTest, WillTransformChangeAboveFixed) { ...@@ -1024,6 +1024,9 @@ TEST_P(PaintPropertyTreeUpdateTest, WillTransformChangeAboveFixed) {
} }
TEST_P(PaintPropertyTreeUpdateTest, CompositingReasonForAnimation) { TEST_P(PaintPropertyTreeUpdateTest, CompositingReasonForAnimation) {
if (!RuntimeEnabledFeatures::SlimmingPaintV2Enabled())
return;
SetBodyInnerHTML(R"HTML( SetBodyInnerHTML(R"HTML(
<style> <style>
#target { #target {
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "platform/graphics/paint/ClipPaintPropertyNode.h" #include "platform/graphics/paint/ClipPaintPropertyNode.h"
#include "platform/graphics/paint/PaintPropertyNode.h" #include "platform/graphics/paint/PaintPropertyNode.h"
#include "platform/graphics/paint/TransformPaintPropertyNode.h" #include "platform/graphics/paint/TransformPaintPropertyNode.h"
#include "platform/runtime_enabled_features.h"
#include "platform/wtf/text/WTFString.h" #include "platform/wtf/text/WTFString.h"
#include <iosfwd> #include <iosfwd>
...@@ -64,8 +65,9 @@ class PLATFORM_EXPORT EffectPaintPropertyNode ...@@ -64,8 +65,9 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
if (local_transform_space == local_transform_space_ && if (local_transform_space == local_transform_space_ &&
output_clip == output_clip_ && color_filter == color_filter_ && output_clip == output_clip_ && color_filter == color_filter_ &&
filter == filter_ && opacity == opacity_ && blend_mode == blend_mode_ && filter == filter_ && opacity == opacity_ && blend_mode == blend_mode_ &&
direct_compositing_reasons == direct_compositing_reasons_ && (!RuntimeEnabledFeatures::SlimmingPaintV2Enabled() ||
compositor_element_id == compositor_element_id_ && (direct_compositing_reasons == direct_compositing_reasons_ &&
compositor_element_id == compositor_element_id_)) &&
paint_offset == paint_offset_) paint_offset == paint_offset_)
return parent_changed; return parent_changed;
...@@ -121,8 +123,9 @@ class PLATFORM_EXPORT EffectPaintPropertyNode ...@@ -121,8 +123,9 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
output_clip_ == o.output_clip_ && color_filter_ == o.color_filter_ && output_clip_ == o.output_clip_ && color_filter_ == o.color_filter_ &&
filter_ == o.filter_ && opacity_ == o.opacity_ && filter_ == o.filter_ && opacity_ == o.opacity_ &&
blend_mode_ == o.blend_mode_ && blend_mode_ == o.blend_mode_ &&
direct_compositing_reasons_ == o.direct_compositing_reasons_ && (!RuntimeEnabledFeatures::SlimmingPaintV2Enabled() ||
compositor_element_id_ == o.compositor_element_id_ && (direct_compositing_reasons_ == o.direct_compositing_reasons_ &&
compositor_element_id_ == o.compositor_element_id_)) &&
paint_offset_ == o.paint_offset_; paint_offset_ == o.paint_offset_;
} }
#endif #endif
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "platform/graphics/paint/GeometryMapperTransformCache.h" #include "platform/graphics/paint/GeometryMapperTransformCache.h"
#include "platform/graphics/paint/PaintPropertyNode.h" #include "platform/graphics/paint/PaintPropertyNode.h"
#include "platform/graphics/paint/ScrollPaintPropertyNode.h" #include "platform/graphics/paint/ScrollPaintPropertyNode.h"
#include "platform/runtime_enabled_features.h"
#include "platform/transforms/TransformationMatrix.h" #include "platform/transforms/TransformationMatrix.h"
#include "platform/wtf/text/WTFString.h" #include "platform/wtf/text/WTFString.h"
...@@ -77,9 +78,11 @@ class PLATFORM_EXPORT TransformPaintPropertyNode ...@@ -77,9 +78,11 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
if (matrix == matrix_ && origin == origin_ && if (matrix == matrix_ && origin == origin_ &&
flattens_inherited_transform == flattens_inherited_transform_ && flattens_inherited_transform == flattens_inherited_transform_ &&
rendering_context_id == rendering_context_id_ && (!RuntimeEnabledFeatures::SlimmingPaintV2Enabled() ||
direct_compositing_reasons == direct_compositing_reasons_ && (rendering_context_id == rendering_context_id_ &&
compositor_element_id == compositor_element_id_ && scroll == scroll_) direct_compositing_reasons == direct_compositing_reasons_ &&
compositor_element_id == compositor_element_id_)) &&
scroll == scroll_)
return parent_changed; return parent_changed;
SetChanged(); SetChanged();
...@@ -145,9 +148,10 @@ class PLATFORM_EXPORT TransformPaintPropertyNode ...@@ -145,9 +148,10 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
return Parent() == o.Parent() && matrix_ == o.matrix_ && return Parent() == o.Parent() && matrix_ == o.matrix_ &&
origin_ == o.origin_ && origin_ == o.origin_ &&
flattens_inherited_transform_ == o.flattens_inherited_transform_ && flattens_inherited_transform_ == o.flattens_inherited_transform_ &&
rendering_context_id_ == o.rendering_context_id_ && (!RuntimeEnabledFeatures::SlimmingPaintV2Enabled() ||
direct_compositing_reasons_ == o.direct_compositing_reasons_ && (rendering_context_id_ == o.rendering_context_id_ &&
compositor_element_id_ == o.compositor_element_id_ && direct_compositing_reasons_ == o.direct_compositing_reasons_ &&
compositor_element_id_ == o.compositor_element_id_)) &&
scroll_ == o.scroll_; scroll_ == o.scroll_;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment