Merge 108724 - Don't clear IntentRequest callback pointers on stop()

Source/WebCore/Modules/intents/IntentRequest.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 34 matching lines @@
 }
 
 IntentRequest::IntentRequest(ScriptExecutionContext* context,
                              PassRefPtr<Intent> intent,
                              PassRefPtr<IntentResultCallback> successCallback,
                              PassRefPtr<IntentResultCallback> errorCallback)
     : ActiveDOMObject(context, this)
     , m_intent(intent)
     , m_successCallback(successCallback)
     , m_errorCallback(errorCallback)
+    , m_stopped(false)
 {
 }
 
 void IntentRequest::contextDestroyed()
 {
     ContextDestructionObserver::contextDestroyed();
-    m_successCallback.clear();
-    m_errorCallback.clear();
+    m_stopped = true;
 }
 
 void IntentRequest::stop()
 {
-    m_successCallback.clear();
-    m_errorCallback.clear();
+    m_stopped = true;
 }
 
 void IntentRequest::postResult(SerializedScriptValue* data)
 {
+    if (m_stopped)
+        return;
+
     // Callback could lead to deletion of this.
     RefPtr<IntentRequest> protector(this);
 
     if (!m_successCallback)
         return;
 
     m_successCallback->handleEvent(data);
 
     m_successCallback.clear();
     m_errorCallback.clear();
 }
 
 void IntentRequest::postFailure(SerializedScriptValue* data)
 {
+    if (m_stopped)
+        return;
+
     // Callback could lead to deletion of this.
     RefPtr<IntentRequest> protector(this);
 
     if (!m_errorCallback)
         return;
 
     m_errorCallback->handleEvent(data);
 
     m_successCallback.clear();
     m_errorCallback.clear();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_INTENTS)