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

Unified Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 895383002: Let StyleResolver figure out differences between UA style and resolved style. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: I mean *remove* assert. Created 5 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
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.h ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleAdjuster.cpp
diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp
index 02fc040749bb4e398e12d40cb91f50b32547669d..9d73512457b776894aa77a89df08d83a4020b18d 100644
--- a/Source/core/css/resolver/StyleAdjuster.cpp
+++ b/Source/core/css/resolver/StyleAdjuster.cpp
@@ -151,7 +151,7 @@ static bool hasWillChangeThatCreatesStackingContext(const LayoutStyle& style)
return false;
}
-void StyleAdjuster::adjustLayoutStyle(LayoutStyle& style, const LayoutStyle& parentStyle, Element *e, const CachedUAStyle* cachedUAStyle)
+void StyleAdjuster::adjustLayoutStyle(LayoutStyle& style, const LayoutStyle& parentStyle, Element *e, const AuthorStyleInfo& authorStyle)
{
if (style.display() != NONE) {
if (e && e->isHTMLElement())
@@ -216,7 +216,7 @@ void StyleAdjuster::adjustLayoutStyle(LayoutStyle& style, const LayoutStyle& par
// Let the theme also have a crack at adjusting the style.
if (style.hasAppearance())
- LayoutTheme::theme().adjustStyle(style, e, cachedUAStyle);
+ LayoutTheme::theme().adjustStyle(style, e, authorStyle);
// If we have first-letter pseudo style, transitions, or animations, do not share this style.
if (style.hasPseudoStyle(FIRST_LETTER) || style.transitions() || style.animations())
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.h ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698