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

Unified Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 470633002: Rename repaint to paintInvalidation in rendering/style. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/SVGRenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/RenderStyle.cpp
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
index 733681ea37b182a68a9883edd378e1e0e18dbc67..34e4ed3e184ababd55bf2333b2065c6fa404de84 100644
--- a/Source/core/rendering/style/RenderStyle.cpp
+++ b/Source/core/rendering/style/RenderStyle.cpp
@@ -376,9 +376,9 @@ StyleDifference RenderStyle::visualInvalidationDiff(const RenderStyle& other) co
if (m_svgStyle.get() != other.m_svgStyle.get())
diff = m_svgStyle->diff(other.m_svgStyle.get());
- if ((!diff.needsFullLayout() || !diff.needsRepaint()) && diffNeedsFullLayoutAndRepaint(other)) {
+ if ((!diff.needsFullLayout() || !diff.needsPaintInvalidation()) && diffNeedsFullLayoutAndPaintInvalidation(other)) {
diff.setNeedsFullLayout();
- diff.setNeedsRepaintObject();
+ diff.setNeedsPaintInvalidationObject();
}
if (!diff.needsFullLayout() && diffNeedsFullLayout(other))
@@ -397,15 +397,15 @@ StyleDifference RenderStyle::visualInvalidationDiff(const RenderStyle& other) co
}
}
- if (diffNeedsRepaintLayer(other))
- diff.setNeedsRepaintLayer();
- else if (diffNeedsRepaintObject(other))
- diff.setNeedsRepaintObject();
+ if (diffNeedsPaintInvalidationLayer(other))
+ diff.setNeedsPaintInvalidationLayer();
+ else if (diffNeedsPaintInvalidationObject(other))
+ diff.setNeedsPaintInvalidationObject();
updatePropertySpecificDifferences(other, diff);
// Cursors are not checked, since they will be set appropriately in response to mouse events,
- // so they don't need to cause any repaint or layout.
+ // so they don't need to cause any paint invalidation or layout.
// Animations don't need to be checked either. We always set the new style on the RenderObject, so we will get a chance to fire off
// the resulting transition properly.
@@ -413,16 +413,16 @@ StyleDifference RenderStyle::visualInvalidationDiff(const RenderStyle& other) co
return diff;
}
-bool RenderStyle::diffNeedsFullLayoutAndRepaint(const RenderStyle& other) const
+bool RenderStyle::diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& other) const
{
- // FIXME: Not all cases in this method need both full layout and repaint.
+ // FIXME: Not all cases in this method need both full layout and paint invalidation.
// Should move cases into diffNeedsFullLayout() if
- // - don't need repaint at all;
- // - or the renderer knows how to exactly repaint caused by the layout change
- // instead of forced full repaint.
+ // - don't need paint invalidation at all;
+ // - or the renderer knows how to exactly invalidate paints caused by the layout change
+ // instead of forced full paint invalidation.
if (surround.get() != other.surround.get()) {
- // If our border widths change, then we need to layout. Other changes to borders only necessitate a repaint.
+ // If our border widths change, then we need to layout. Other changes to borders only necessitate a paint invalidation.
if (borderLeftWidth() != other.borderLeftWidth()
|| borderTopWidth() != other.borderTopWidth()
|| borderBottomWidth() != other.borderBottomWidth()
@@ -620,7 +620,7 @@ bool RenderStyle::diffNeedsFullLayout(const RenderStyle& other) const
return false;
}
-bool RenderStyle::diffNeedsRepaintLayer(const RenderStyle& other) const
+bool RenderStyle::diffNeedsPaintInvalidationLayer(const RenderStyle& other) const
{
if (position() != StaticPosition && (visual->clip != other.visual->clip || visual->hasClip != other.visual->hasClip))
return true;
@@ -639,7 +639,7 @@ bool RenderStyle::diffNeedsRepaintLayer(const RenderStyle& other) const
return false;
}
-bool RenderStyle::diffNeedsRepaintObject(const RenderStyle& other) const
+bool RenderStyle::diffNeedsPaintInvalidationObject(const RenderStyle& other) const
{
if (inherited_flags._visibility != other.inherited_flags._visibility
|| inherited_flags.m_printColorAdjust != other.inherited_flags.m_printColorAdjust
@@ -685,7 +685,7 @@ void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
diff.setFilterChanged();
}
- if (!diff.needsRepaint()) {
+ if (!diff.needsPaintInvalidation()) {
if (inherited->color != other.inherited->color
|| inherited_flags.m_textUnderline != other.inherited_flags.m_textUnderline
|| visual->textDecoration != other.visual->textDecoration) {
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/SVGRenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698