| Index: third_party/WebKit/Source/core/editing/FrameSelection.h
|
| diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.h b/third_party/WebKit/Source/core/editing/FrameSelection.h
|
| index 12e06d1a06b7466a8f776189e843e1d3722d73e1..e53345ce6de1355ff100417fc09e7dc497208a30 100644
|
| --- a/third_party/WebKit/Source/core/editing/FrameSelection.h
|
| +++ b/third_party/WebKit/Source/core/editing/FrameSelection.h
|
| @@ -91,11 +91,6 @@ public:
|
| return static_cast<EUserTriggered>(options & UserTriggered);
|
| }
|
|
|
| - enum ResetCaretBlinkOption {
|
| - None,
|
| - ResetCaretBlink
|
| - };
|
| -
|
| LocalFrame* frame() const { return m_frame; }
|
| Element* rootEditableElement() const { return selection().rootEditableElement(); }
|
| Element* rootEditableElementOrDocumentElement() const;
|
| @@ -186,7 +181,7 @@ public:
|
|
|
| bool isAppearanceDirty() const;
|
| void commitAppearanceIfNeeded(LayoutView&);
|
| - void updateAppearance(ResetCaretBlinkOption = None);
|
| + void updateAppearance();
|
| void setCaretVisible(bool caretIsVisible) { setCaretVisibility(caretIsVisible ? Visible : Hidden); }
|
| bool isCaretBoundsDirty() const { return m_caretRectDirty; }
|
| void setCaretRectNeedsUpdate();
|
| @@ -281,6 +276,7 @@ private:
|
| void focusedOrActiveStateChanged();
|
|
|
| void caretBlinkTimerFired(Timer<FrameSelection>*);
|
| + void stopCaretBlinkTimer();
|
|
|
| void setUseSecureKeyboardEntry(bool);
|
|
|
|
|