Source/core/editing/ApplyStyleCommand.cpp - Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer

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/editing/ApplyStyleCommand.cpp

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 7 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

« Source/core/css/resolver/ElementStyleResources.h ('K') | « Source/core/dom/TextLinkColors.cpp ('k') | Source/core/editing/EditingStyle.cpp » ('j') | Source/core/editing/EditorCommand.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/editing/ApplyStyleCommand.cpp

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

index e9a151cf0ee1ba190d8f9c65209dbbb5a4c6d8be..bf037b9b05ce10665bbcd2b46dc3e321ceb88caf 100644

--- a/Source/core/editing/ApplyStyleCommand.cpp

+++ b/Source/core/editing/ApplyStyleCommand.cpp

@@ -414,7 +414,7 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(EditingStyle* style)

RefPtrWillBeRawPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());

float currentFontSize = computedFontSize(node);

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

- RefPtrWillBeRawPtr<CSSValue> value = inlineStyle->getPropertyCSSValue(CSSPropertyFontSize);

+ NullableCSSValue value = inlineStyle->getPropertyCSSValue(CSSPropertyFontSize);

if (value) {

element->removeInlineStyleProperty(CSSPropertyFontSize);

currentFontSize = computedFontSize(node);

@@ -1544,7 +1544,7 @@ float ApplyStyleCommand::computedFontSize(Node* node)

if (!style)

return 0;

- RefPtrWillBeRawPtr<CSSPrimitiveValue> value = static_pointer_cast<CSSPrimitiveValue>(style->getPropertyCSSValue(CSSPropertyFontSize));

+ RefPtrWillBeRawPtr<CSSPrimitiveValue> value = toCSSPrimitiveValue(style->getPropertyCSSValue(CSSPropertyFontSize));

if (!value)

return 0;