Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Unified Diff: third_party/WebKit/Source/core/editing/EditingStyle.h

Issue 2685783004: Add EditingStyleUtitilies.{cpp,h} to BUILD.gn (Closed)
Patch Set: keep the original copyright comment Created 3 years, 10 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: third_party/WebKit/Source/core/editing/EditingStyle.h
diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.h b/third_party/WebKit/Source/core/editing/EditingStyle.h
index 336512a5713ab078684505d627b8a449ebb547c3..12bdc3f6264a77e43bd53924a41ea52f3c46c2da 100644
--- a/third_party/WebKit/Source/core/editing/EditingStyle.h
+++ b/third_party/WebKit/Source/core/editing/EditingStyle.h
@@ -148,6 +148,9 @@ class CORE_EXPORT EditingStyle final : public GarbageCollected<EditingStyle> {
void mergeInlineStyleOfElement(HTMLElement*,
CSSPropertyOverrideMode,
PropertiesToInclude = AllProperties);
+ void mergeInlineAndImplicitStyleOfElement(Element*,
+ CSSPropertyOverrideMode,
+ PropertiesToInclude);
static EditingStyle* wrappingStyleForAnnotatedSerialization(
ContainerNode* context);
static EditingStyle* wrappingStyleForSerialization(ContainerNode* context);
@@ -162,6 +165,8 @@ class CORE_EXPORT EditingStyle final : public GarbageCollected<EditingStyle> {
float fontSizeDelta() const { return m_fontSizeDelta; }
bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; }
+ void setProperty(CSSPropertyID, const String& value, bool important = false);
+
static EditingStyle* styleAtSelectionStart(
const VisibleSelection&,
bool shouldUseBackgroundColorInEffect = false,
@@ -185,7 +190,6 @@ class CORE_EXPORT EditingStyle final : public GarbageCollected<EditingStyle> {
EditingStyle(CSSPropertyID, const String& value);
void init(Node*, PropertiesToInclude);
void removeInheritedColorsIfNeeded(const ComputedStyle*);
- void setProperty(CSSPropertyID, const String& value, bool important = false);
void replaceFontSizeByKeywordIfPossible(const ComputedStyle*,
CSSComputedStyleDeclaration*);
void extractFontSizeDelta();
@@ -195,9 +199,6 @@ class CORE_EXPORT EditingStyle final : public GarbageCollected<EditingStyle> {
HTMLElement*,
EditingStyle* extractedStyle,
Vector<CSSPropertyID>* conflictingProperties) const;
- void mergeInlineAndImplicitStyleOfElement(Element*,
- CSSPropertyOverrideMode,
- PropertiesToInclude);
void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
Member<MutableStylePropertySet> m_mutableStyle;
« no previous file with comments | « third_party/WebKit/Source/core/editing/BUILD.gn ('k') | third_party/WebKit/Source/core/editing/EditingStyleUtilities.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698