Oilpan: move Range object to the oilpan heap.

public/web/WebRange.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 WebNode;
-class WebRangePrivate;
 class WebString;
 
 // Provides readonly access to some properties of a DOM range.
 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);
         return *this;
     }
 
     BLINK_EXPORT void reset();
     BLINK_EXPORT void assign(const WebRange&);
 
-    bool isNull() const { return !m_private; }
+    bool isNull() const { return m_private.isNull(); }

[haraken, 2014/04/04 02:30:19]

If we forget to change this, is there any way to notice the error?

[sof, 2014/04/04 07:33:23]

If I understand your question correctly, then yes - WebPrivatePtr<> cannot be
converted to a bool.

 
     BLINK_EXPORT int startOffset() const;
     BLINK_EXPORT int endOffset() const;
     BLINK_EXPORT WebNode startContainer(int& exceptionCode) const;
     BLINK_EXPORT WebNode endContainer(int& exceptionCode) const;
 
     BLINK_EXPORT WebString toHTMLText() const;
     BLINK_EXPORT WebString toPlainText() const;
 
     BLINK_EXPORT WebRange expandedToParagraph() const;
 
     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
 
 #endif