1 files changed, 11 insertions, 16 deletions
diff --git a/chromium/third_party/WebKit/public/web/WebRange.h b/chromium/third_party/WebKit/public/web/WebRange.h
index 3eeeeb0d0c1..cd318a1cf1f 100644
--- a/chromium/third_party/WebKit/public/web/WebRange.h
+++ b/chromium/third_party/WebKit/public/web/WebRange.h
@@ -31,20 +31,17 @@
 #ifndef WebRange_h
 #define WebRange_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebVector.h"
+#include "WebFrame.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebVector.h"
 
-#if BLINK_IMPLEMENTATION
 namespace WebCore { class Range; }
-namespace WTF { template <typename T> class PassRefPtr; }
-#endif
 
 namespace blink {
 
 struct WebFloatQuad;
-class WebFrame;
 class WebNode;
-class WebRangePrivate;
 class WebString;
 
 // Provides readonly access to some properties of a DOM range.
@@ -52,8 +49,8 @@ class WebRange {
 public:
     ~WebRange() { reset(); }
 
-    WebRange() : m_private(0) { }
-    WebRange(const WebRange& r) : m_private(0) { assign(r); }
+    WebRange() { }
+    WebRange(const WebRange& r) { assign(r); }
     WebRange& operator=(const WebRange& r)
     {
         assign(r);
@@ -63,7 +60,7 @@ public:
     BLINK_EXPORT void reset();
     BLINK_EXPORT void assign(const WebRange&);
 
-    bool isNull() const { return !m_private; }
+    bool isNull() const { return m_private.isNull(); }
 
     BLINK_EXPORT int startOffset() const;
     BLINK_EXPORT int endOffset() const;
@@ -75,19 +72,17 @@ public:
 
     BLINK_EXPORT WebRange expandedToParagraph() const;
 
-    BLINK_EXPORT static WebRange fromDocumentRange(WebFrame*, int start, int length);
+    BLINK_EXPORT static WebRange fromDocumentRange(WebLocalFrame*, int start, int length);
 
     BLINK_EXPORT WebVector<WebFloatQuad> textQuads() const;
 
 #if BLINK_IMPLEMENTATION
-    WebRange(const WTF::PassRefPtr<WebCore::Range>&);
-    WebRange& operator=(const WTF::PassRefPtr<WebCore::Range>&);
-    operator WTF::PassRefPtr<WebCore::Range>() const;
+    WebRange(const PassRefPtrWillBeRawPtr<WebCore::Range>&);
+    operator PassRefPtrWillBeRawPtr<WebCore::Range>() const;
 #endif
 
 private:
-    void assign(WebRangePrivate*);
-    WebRangePrivate* m_private;
+    WebPrivatePtr<WebCore::Range> m_private;
 };
 
 } // namespace blink