Source/WebCore/editing/EditingStyle.cpp - Issue 7973008: Revert 93001 - Apple-style-span class seems unnecessary

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

Issue 7973008: Revert 93001 - Apple-style-span class seems unnecessary (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/

Patch Set: Created 9 years, 3 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/WebCore/editing/EditingStyle.cpp

===================================================================

--- Source/WebCore/editing/EditingStyle.cpp (revision 95747)

+++ Source/WebCore/editing/EditingStyle.cpp (working copy)

@@ -963,7 +963,7 @@

// 3. If this element is a span and has display: inline or float: none, remove them unless they are overriden by rules.

// These rules are added by serialization code to wrap text nodes.

- if (isStyleSpanOrSpanWithOnlyStyleAttribute(element)) {

+ if (isStyleSpan(element)) {

if (!styleFromMatchedRules->getPropertyCSSValue(CSSPropertyDisplay) && getIdentifierValue(m_mutableStyle.get(), CSSPropertyDisplay) == CSSValueInline)

m_mutableStyle->removeProperty(CSSPropertyDisplay);

if (!styleFromMatchedRules->getPropertyCSSValue(CSSPropertyFloat) && getIdentifierValue(m_mutableStyle.get(), CSSPropertyFloat) == CSSValueNone)

« no previous file with comments | « Source/WebCore/editing/ApplyStyleCommand.cpp ('k') | Source/WebCore/editing/ReplaceSelectionCommand.cpp » ('j') | no next file with comments »