Source/core/editing/EditingStyle.cpp - Issue 960353002: Handle null baseStyle in getPropertiesNotIn

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/EditingStyle.cpp

Issue 960353002: Handle null baseStyle in getPropertiesNotIn (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Address review comments Created 5 years, 9 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:

Index: Source/core/editing/EditingStyle.cpp

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

index b8b2e18761285c9f1d642d38d4672c6cca26094d..70a3a2df2514783920b5fde3e3d7d9da9fb7645a 100644

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

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

@@ -1425,12 +1425,13 @@ StyleChange::StyleChange(EditingStyle* style, const Position& position)

, m_applySuperscript(false)

{

Document* document = position.document();

- if (!style || !style->style() || !document || !document->frame())

+ if (!style || !style->style() || !document || !document->frame() || !position.element())

return;

RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> computedStyle = position.computedStyle();

// FIXME: take care of background-color in effect

RefPtrWillBeRawPtr<MutableStylePropertySet> mutableStyle = getPropertiesNotIn(style->style(), computedStyle.get());

+ ASSERT(mutableStyle);

reconcileTextDecorationProperties(mutableStyle.get());

if (!document->frame()->editor().shouldStyleWithCSS())