From 5f1ab04193ad0130ca8204aadaceae083aca9881 Mon Sep 17 00:00:00 2001 From: Feng Qian Date: Wed, 17 Jun 2009 12:12:20 -0700 Subject: Get WebKit r44544. --- WebCore/editing/SelectionController.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'WebCore/editing/SelectionController.h') diff --git a/WebCore/editing/SelectionController.h b/WebCore/editing/SelectionController.h index 21e849d..bbd343c 100644 --- a/WebCore/editing/SelectionController.h +++ b/WebCore/editing/SelectionController.h @@ -102,6 +102,7 @@ public: bool isRange() const { return m_sel.isRange(); } bool isCaretOrRange() const { return m_sel.isCaretOrRange(); } bool isInPasswordField() const; + bool isAll(StayInEditableContent stayInEditableContent = MustStayInEditableContent) const { return m_sel.isAll(stayInEditableContent); } PassRefPtr toNormalizedRange() const { return m_sel.toNormalizedRange(); } @@ -119,6 +120,7 @@ public: // Focus void setFocused(bool); + bool isFocused() const { return m_focused; } bool isFocusedAndActive() const; void pageActivationChanged(); @@ -130,10 +132,14 @@ public: private: enum EPositionType { START, END, BASE, EXTENT }; - VisiblePosition modifyExtendingRightForward(TextGranularity); + TextDirection directionOfEnclosingBlock(); + + VisiblePosition modifyExtendingRight(TextGranularity); + VisiblePosition modifyExtendingForward(TextGranularity); VisiblePosition modifyMovingRight(TextGranularity); VisiblePosition modifyMovingForward(TextGranularity); - VisiblePosition modifyExtendingLeftBackward(TextGranularity); + VisiblePosition modifyExtendingLeft(TextGranularity); + VisiblePosition modifyExtendingBackward(TextGranularity); VisiblePosition modifyMovingLeft(TextGranularity); VisiblePosition modifyMovingBackward(TextGranularity); @@ -142,7 +148,7 @@ private: int xPosForVerticalArrowNavigation(EPositionType); -#if PLATFORM(MAC) +#if PLATFORM(MAC) || PLATFORM(GTK) void notifyAccessibilityForSelectionChange(); #else void notifyAccessibilityForSelectionChange() {}; @@ -150,6 +156,8 @@ private: void focusedOrActiveStateChanged(); bool caretRendersInsideNode(Node*) const; + + IntRect absoluteBoundsForLocalRect(const IntRect&) const; Frame* m_frame; int m_xPosForVerticalArrowNavigation; @@ -158,6 +166,7 @@ private: IntRect m_caretRect; // caret rect in coords local to the renderer responsible for painting the caret IntRect m_absCaretBounds; // absolute bounding rect for the caret + IntRect m_absoluteCaretRepaintBounds; bool m_needsLayout : 1; // true if the caret and expectedVisible rectangles need to be calculated bool m_absCaretBoundsDirty: 1; @@ -187,3 +196,4 @@ void showTree(const WebCore::SelectionController*); #endif #endif // SelectionController_h + -- cgit v1.1