Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / editing / Editor.h

diff --git a/src/third_party/WebKit/Source/core/editing/Editor.h b/src/third_party/WebKit/Source/core/editing/Editor.h
index 28d45d5..64bf215 100644 (file)
--- a/src/third_party/WebKit/Source/core/editing/Editor.h
+++ b/src/third_party/WebKit/Source/core/editing/Editor.h
@@ -37,6 +37,7 @@
 #include "core/editing/WritingDirection.h"
 #include "core/frame/FrameDestructionObserver.h"
 #include "platform/PasteMode.h"
+#include "platform/heap/Handle.h"
 
 namespace WebCore {
 
@@ -148,6 +149,8 @@ public:
 
         bool isTextInsertion() const;
 
+        // Returns 0 if this Command is not supported.
+        int idForHistogram() const;
     private:
         const EditorInternalCommand* m_command;
         EditorCommandSource m_source;
@@ -188,7 +191,7 @@ public:
 
     EditingBehavior behavior() const;
 
-    PassRefPtr<Range> selectedRange();
+    PassRefPtrWillBeRawPtr<Range> selectedRange();
 
     void addToKillRing(Range*, bool prepend);
 
@@ -201,7 +204,7 @@ public:
     // FIXME: Switch callers over to the FindOptions version and retire this one.
     bool findString(const String&, bool forward, bool caseFlag, bool wrapFlag, bool startInSelection);
 
-    PassRefPtr<Range> findStringAndScrollToVisible(const String&, Range*, FindOptions);
+    PassRefPtrWillBeRawPtr<Range> findStringAndScrollToVisible(const String&, Range*, FindOptions);
 
     const VisibleSelection& mark() const; // Mark, to be used as emacs uses it.
     void setMark(const VisibleSelection&);
@@ -265,7 +268,7 @@ private:
 
     Node* findEventTargetFromSelection() const;
 
-    PassRefPtr<Range> rangeOfString(const String&, Range*, FindOptions);
+    PassRefPtrWillBeRawPtr<Range> rangeOfString(const String&, Range*, FindOptions);
 
     SpellChecker& spellChecker() const;