third_party/WebKit/Source/core/editing/EditingStyle.cpp - Issue 2035373002: Made StylePropertySet::getPropertyCSSValue return a const CSSValue*

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: third_party/WebKit/Source/core/editing/EditingStyle.cpp

Issue 2035373002: Made StylePropertySet::getPropertyCSSValue return a const CSSValue* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_fix_cssparser_font_face_descriptor_to_return_const

Patch Set: Rebase Created 4 years, 5 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 | « third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp ('k') | third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/EditingStyle.cpp

diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.cpp b/third_party/WebKit/Source/core/editing/EditingStyle.cpp

index a1d63ab59c3d66ae7010e7ac142e02f293ea43f4..5106669b4c8fa1eb162075618f55af49dd171ad1 100644

--- a/third_party/WebKit/Source/core/editing/EditingStyle.cpp

+++ b/third_party/WebKit/Source/core/editing/EditingStyle.cpp

@@ -1668,7 +1668,7 @@ MutableStylePropertySet* getPropertiesNotIn(StylePropertySet* styleWithRedundant

diffTextDecorations(result, CSSPropertyWebkitTextDecorationsInEffect, baseTextDecorationsInEffect);

if (const CSSValue* baseFontWeight = baseStyle->getPropertyCSSValueInternal(CSSPropertyFontWeight)) {

- if (CSSValue* fontWeight = result->getPropertyCSSValue(CSSPropertyFontWeight)) {

+ if (const CSSValue* fontWeight = result->getPropertyCSSValue(CSSPropertyFontWeight)) {

if (!fontWeightNeedsResolving(fontWeight) && !fontWeightNeedsResolving(baseFontWeight)

&& (fontWeightIsBold(fontWeight) == fontWeightIsBold(baseFontWeight)))

result->removeProperty(CSSPropertyFontWeight);