1 files changed, 6 insertions, 14 deletions
diff --git a/Source/WebCore/loader/PolicyCallback.cpp b/Source/WebCore/loader/PolicyCallback.cpp
index 6ffa8a8cd..f1f633102 100644
--- a/Source/WebCore/loader/PolicyCallback.cpp
+++ b/Source/WebCore/loader/PolicyCallback.cpp
@@ -12,7 +12,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  *
@@ -38,14 +38,6 @@
 
 namespace WebCore {
 
-PolicyCallback::PolicyCallback()
-{
-}
-
-PolicyCallback::~PolicyCallback()
-{
-}
-
 void PolicyCallback::clear()
 {
     clearRequest();
@@ -54,19 +46,19 @@ void PolicyCallback::clear()
     m_contentFunction = nullptr;
 }
 
-void PolicyCallback::set(const ResourceRequest& request, PassRefPtr<FormState> formState,
+void PolicyCallback::set(const ResourceRequest& request, FormState* formState,
     NavigationPolicyDecisionFunction function)
 {
     m_request = request;
     m_formState = formState;
     m_frameName = String();
 
-    m_navigationFunction = std::move(function);
+    m_navigationFunction = WTFMove(function);
     m_newWindowFunction = nullptr;
     m_contentFunction = nullptr;
 }
 
-void PolicyCallback::set(const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, const NavigationAction& navigationAction, NewWindowPolicyDecisionFunction function)
+void PolicyCallback::set(const ResourceRequest& request, FormState* formState, const String& frameName, const NavigationAction& navigationAction, NewWindowPolicyDecisionFunction function)
 {
     m_request = request;
     m_formState = formState;
@@ -74,7 +66,7 @@ void PolicyCallback::set(const ResourceRequest& request, PassRefPtr<FormState> f
     m_navigationAction = navigationAction;
 
     m_navigationFunction = nullptr;
-    m_newWindowFunction = std::move(function);
+    m_newWindowFunction = WTFMove(function);
     m_contentFunction = nullptr;
 }
 
@@ -86,7 +78,7 @@ void PolicyCallback::set(ContentPolicyDecisionFunction function)
 
     m_navigationFunction = nullptr;
     m_newWindowFunction = nullptr;
-    m_contentFunction = std::move(function);
+    m_contentFunction = WTFMove(function);
 }
 
 void PolicyCallback::call(bool shouldContinue)