diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/editing/visible_units.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/editing/visible_units.h')
-rw-r--r-- | Source/WebCore/editing/visible_units.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebCore/editing/visible_units.h b/Source/WebCore/editing/visible_units.h index 167bd2c..18b9665 100644 --- a/Source/WebCore/editing/visible_units.h +++ b/Source/WebCore/editing/visible_units.h @@ -32,6 +32,7 @@ namespace WebCore { +class RootInlineBox; class VisiblePosition; enum EWordSide { RightWordIfOnBoundary = false, LeftWordIfOnBoundary = true }; @@ -70,11 +71,11 @@ VisiblePosition previousParagraphPosition(const VisiblePosition &, int x); VisiblePosition nextParagraphPosition(const VisiblePosition &, int x); bool isStartOfParagraph(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary); bool isEndOfParagraph(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary); -bool inSameParagraph(const VisiblePosition &, const VisiblePosition &); +bool inSameParagraph(const VisiblePosition &, const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary); // blocks (true paragraphs; line break elements don't break blocks) -VisiblePosition startOfBlock(const VisiblePosition &); -VisiblePosition endOfBlock(const VisiblePosition &); +VisiblePosition startOfBlock(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary); +VisiblePosition endOfBlock(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary); bool inSameBlock(const VisiblePosition &, const VisiblePosition &); bool isStartOfBlock(const VisiblePosition &); bool isEndOfBlock(const VisiblePosition &); |