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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 2181953004: Changed ComputedStyle's EVisibility to be an enum class and fixed naming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_move_computedstyle_around
Patch Set: Rebase Created 4 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
Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index 41dba4ef9b60ad6c8700410bd6eb1b2720df4d7f..bb6aa272dd6789646ec8b49c3e3e1565ea49783d 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -2663,7 +2663,7 @@ void LayoutObject::insertedIntoTree()
// If |this| is visible but this object was not, tell the layer it has some visible content
// that needs to be drawn and layer visibility optimization can't be used
- if (parent()->style()->visibility() != VISIBLE && style()->visibility() == VISIBLE && !hasLayer()) {
+ if (parent()->style()->visibility() != EVisibility::Visible && style()->visibility() == EVisibility::Visible && !hasLayer()) {
if (!layer)
layer = parent()->enclosingLayer();
if (layer)
@@ -2720,7 +2720,7 @@ void LayoutObject::willBeRemovedFromTree()
// If we remove a visible child from an invisible parent, we don't know the layer visibility any more.
PaintLayer* layer = nullptr;
- if (parent()->style()->visibility() != VISIBLE && style()->visibility() == VISIBLE && !hasLayer()) {
+ if (parent()->style()->visibility() != EVisibility::Visible && style()->visibility() == EVisibility::Visible && !hasLayer()) {
layer = parent()->enclosingLayer();
if (layer)
layer->dirtyVisibleContentStatus();
@@ -3113,7 +3113,7 @@ void LayoutObject::getTextDecorations(unsigned decorations, AppliedTextDecoratio
void LayoutObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
{
// Convert the style regions to absolute coordinates.
- if (style()->visibility() != VISIBLE || !isBox())
+ if (style()->visibility() != EVisibility::Visible || !isBox())
return;
if (style()->getDraggableRegionMode() == DraggableRegionNone)
@@ -3132,7 +3132,7 @@ void LayoutObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
bool LayoutObject::willRenderImage()
{
// Without visibility we won't render (and therefore don't care about animation).
- if (style()->visibility() != VISIBLE)
+ if (style()->visibility() != EVisibility::Visible)
return false;
// We will not render a new image when Active DOM is suspended

Powered by Google App Engine
This is Rietveld 408576698