third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.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/commands/ApplyStyleCommand.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/editing/EditingStyle.cpp ('k') | third_party/WebKit/Source/core/editing/serializers/Serialization.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp

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

index 539f625086cf713c4f4f142280fbae3ea95d69a6..10da9d445850691fd872d476701ec2b53b0d96ce 100644

--- a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp

+++ b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp

@@ -429,7 +429,7 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(EditingStyle* style, Editin

MutableStylePropertySet* inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());

float currentFontSize = computedFontSize(node);

float desiredFontSize = max(MinimumFontSize, startingFontSizes.get(node) + style->fontSizeDelta());

- CSSValue* value = inlineStyle->getPropertyCSSValue(CSSPropertyFontSize);

+ const CSSValue* value = inlineStyle->getPropertyCSSValue(CSSPropertyFontSize);

if (value) {

element->removeInlineStyleProperty(CSSPropertyFontSize);

currentFontSize = computedFontSize(node);