diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/editing/ApplyStyleCommand.h | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/editing/ApplyStyleCommand.h')
-rw-r--r-- | Source/WebCore/editing/ApplyStyleCommand.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/WebCore/editing/ApplyStyleCommand.h b/Source/WebCore/editing/ApplyStyleCommand.h index 05af85c..1b2c2ef 100644 --- a/Source/WebCore/editing/ApplyStyleCommand.h +++ b/Source/WebCore/editing/ApplyStyleCommand.h @@ -28,6 +28,7 @@ #include "CompositeEditCommand.h" #include "HTMLElement.h" +#include "WritingDirection.h" namespace WebCore { @@ -90,9 +91,9 @@ private: bool nodeFullyUnselected(Node*, const Position& start, const Position& end) const; // style-application helpers - void applyBlockStyle(CSSMutableStyleDeclaration*); + void applyBlockStyle(EditingStyle*); void applyRelativeFontStyleChange(EditingStyle*); - void applyInlineStyle(CSSMutableStyleDeclaration*); + void applyInlineStyle(EditingStyle*); void fixRangeAndApplyInlineStyle(CSSMutableStyleDeclaration*, const Position& start, const Position& end); void applyInlineStyleToNodeRange(CSSMutableStyleDeclaration*, Node* startNode, Node* pastEndNode); void addBlockStyle(const StyleChange&, HTMLElement*); @@ -111,7 +112,7 @@ private: float computedFontSize(Node*); void joinChildTextNodes(Node*, const Position& start, const Position& end); - HTMLElement* splitAncestorsWithUnicodeBidi(Node*, bool before, int allowedDirection); + HTMLElement* splitAncestorsWithUnicodeBidi(Node*, bool before, WritingDirection allowedDirection); void removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsplitAncestor); void updateStartEnd(const Position& newStart, const Position& newEnd); @@ -129,6 +130,8 @@ private: IsInlineElementToRemoveFunction m_isInlineElementToRemoveFunction; }; +enum LegacyFontSizeMode { AlwaysUseLegacyFontSize, UseLegacyFontSizeOnlyIfPixelValuesMatch }; +int legacyFontSizeFromCSSValue(Document*, CSSPrimitiveValue*, bool shouldUseFixedFontDefaultSize, LegacyFontSizeMode); bool isStyleSpan(const Node*); PassRefPtr<HTMLElement> createStyleSpanElement(Document*); RefPtr<CSSMutableStyleDeclaration> getPropertiesNotIn(CSSStyleDeclaration* styleWithRedundantProperties, CSSStyleDeclaration* baseStyle); |