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

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: type_name Created 4 years, 10 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/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 46907d76c540cfcae783a9ae927eda03576dc3a7..f21c8e04dcf16ee7d742e155f193c47bbb93bf2a 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -1580,7 +1580,7 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
didRecalcDocumentElement = true;
}
- WritingMode rootWritingMode = documentElementStyle->writingMode();
+ WritingMode rootWritingMode = documentElementStyle->getWritingMode();
TextDirection rootDirection = documentElementStyle->direction();
HTMLElement* body = this->body();
@@ -1592,7 +1592,7 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
body->clearAnimationStyleChange();
if (!bodyStyle || body->needsStyleRecalc() || didRecalcDocumentElement)
bodyStyle = ensureStyleResolver().styleForElement(body, documentElementStyle.get());
- rootWritingMode = bodyStyle->writingMode();
+ rootWritingMode = bodyStyle->getWritingMode();
rootDirection = bodyStyle->direction();
}
@@ -1662,7 +1662,7 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
}
RefPtr<ComputedStyle> documentStyle = layoutView()->mutableStyle();
- if (documentStyle->writingMode() != rootWritingMode
+ if (documentStyle->getWritingMode() != rootWritingMode
|| documentStyle->direction() != rootDirection
|| documentStyle->visitedDependentColor(CSSPropertyBackgroundColor) != backgroundColor
|| documentStyle->backgroundLayers() != backgroundLayers
@@ -1685,13 +1685,13 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
if (body) {
if (const ComputedStyle* style = body->computedStyle()) {
- if (style->direction() != rootDirection || style->writingMode() != rootWritingMode)
+ if (style->direction() != rootDirection || style->getWritingMode() != rootWritingMode)
body->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::WritingModeChange));
}
}
if (const ComputedStyle* style = documentElement()->computedStyle()) {
- if (style->direction() != rootDirection || style->writingMode() != rootWritingMode)
+ if (style->direction() != rootDirection || style->getWritingMode() != rootWritingMode)
documentElement()->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::WritingModeChange));
}
}
@@ -2057,7 +2057,7 @@ void Document::pageSizeAndMarginsInPixels(int pageIndex, IntSize& pageSize, int&
int width = pageSize.width();
int height = pageSize.height();
- switch (style->pageSizeType()) {
+ switch (style->getPageSizeType()) {
case PAGE_SIZE_AUTO:
break;
case PAGE_SIZE_AUTO_LANDSCAPE:

Powered by Google App Engine
This is Rietveld 408576698