Oilpan: Change Persistent<> data members to Member<> in HitTestResult.

Source/web/WebHitTestResult.cpp

 /*
 * Copyright (C) 2012 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:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 19 matching lines @@
 #include "core/dom/Node.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderObject.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebURL.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebNode.h"
 
 using namespace blink;

[sof, 2014/07/24 07:18:14]

nit: can be removed.

 
 namespace blink {
 
+class WebHitTestResultPrivate : public RefCountedWillBeGarbageCollectedFinalized<WebHitTestResultPrivate> {
+public:
+    static PassRefPtrWillBeRawPtr<WebHitTestResultPrivate> create(const HitTestResult&);
+    static PassRefPtrWillBeRawPtr<WebHitTestResultPrivate> create(const WebHitTestResultPrivate&);
+    void trace(Visitor* visitor) { visitor->trace(m_result); }
+    const HitTestResult& result() const { return m_result; }
+
+private:
+    WebHitTestResultPrivate(const HitTestResult&);
+    WebHitTestResultPrivate(const WebHitTestResultPrivate&);
+
+    HitTestResult m_result;
+};
+
+inline WebHitTestResultPrivate::WebHitTestResultPrivate(const HitTestResult& result)
+    : m_result(result)
+{
+}
+
+inline WebHitTestResultPrivate::WebHitTestResultPrivate(const WebHitTestResultPrivate& result)
+    : m_result(result.m_result)
+{
+}
+
+PassRefPtrWillBeRawPtr<WebHitTestResultPrivate> WebHitTestResultPrivate::create(const HitTestResult& result)
+{
+    return adoptRefWillBeNoop(new WebHitTestResultPrivate(result));
+}
+
+PassRefPtrWillBeRawPtr<WebHitTestResultPrivate> WebHitTestResultPrivate::create(const WebHitTestResultPrivate& result)
+{
+    return adoptRefWillBeNoop(new WebHitTestResultPrivate(result));
+}
+
 WebNode WebHitTestResult::node() const
 {
-    return WebNode(m_private->innerNode());
+    return WebNode(m_private->result().innerNode());
 }
 
 WebPoint WebHitTestResult::localPoint() const
 {
-    return roundedIntPoint(m_private->localPoint());
+    return roundedIntPoint(m_private->result().localPoint());
 }
 
 WebElement WebHitTestResult::urlElement() const
 {
-    return WebElement(m_private->URLElement());
+    return WebElement(m_private->result().URLElement());
 }
 
 WebURL WebHitTestResult::absoluteImageURL() const
 {
-    return m_private->absoluteImageURL();
+    return m_private->result().absoluteImageURL();
 }
 
 WebURL WebHitTestResult::absoluteLinkURL() const
 {
-    return m_private->absoluteLinkURL();
+    return m_private->result().absoluteLinkURL();
 }
 
 bool WebHitTestResult::isContentEditable() const
 {
-    return m_private->isContentEditable();
+    return m_private->result().isContentEditable();
 }
 
 WebHitTestResult::WebHitTestResult(const HitTestResult& result)
+    : m_private(WebHitTestResultPrivate::create(result))
 {
-    m_private.reset(new HitTestResult(result));
 }
 
 WebHitTestResult& WebHitTestResult::operator=(const HitTestResult& result)
 {
-    m_private.reset(new HitTestResult(result));
+    m_private = WebHitTestResultPrivate::create(result);
     return *this;
 }
 
-WebHitTestResult::operator HitTestResult() const
-{
-    return *m_private.get();
-}
-
 bool WebHitTestResult::isNull() const
 {
     return !m_private.get();
 }
 
 void WebHitTestResult::assign(const WebHitTestResult& info)
 {
-    m_private.reset(new HitTestResult(info));
+    if (info.isNull())
+        m_private.reset();
+    else
+        m_private = WebHitTestResultPrivate::create(*info.m_private.get());
 }
 
 void WebHitTestResult::reset()
 {
-    m_private.reset(0);
+    m_private.reset();
 }
 
 } // namespace blink