Source/core/css/resolver/StyleAdjuster.cpp - Issue 1274263003: Revert of Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1274263003: Revert of Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 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: Source/core/css/resolver/StyleAdjuster.cpp

diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp

index 4d2c58d997dced2fa1e17cb82a27ca1793f308ea..be3d89497722be5bfc7d69786a6c39b3ebb2b8a3 100644

--- a/Source/core/css/resolver/StyleAdjuster.cpp

+++ b/Source/core/css/resolver/StyleAdjuster.cpp

@@ -157,7 +157,7 @@

return false;

}

-void StyleAdjuster::adjustComputedStyle(ComputedStyle& style, const ComputedStyle& parentStyle, Element *e)

+void StyleAdjuster::adjustComputedStyle(ComputedStyle& style, const ComputedStyle& parentStyle, Element *e, const AuthorStyleInfo& authorStyle)

{

if (style.display() != NONE) {

if (e && e->isHTMLElement())

@@ -224,7 +224,7 @@

// Let the theme also have a crack at adjusting the style.

if (style.hasAppearance())

- LayoutTheme::theme().adjustStyle(style, e);

+ 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 »