Merge 77563

Source/WebCore/workers/WorkerScriptLoader.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- * Copyright (C) 2009 Google Inc. All Rights Reserved.
+ * Copyright (C) 2009, 2011 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
@@ skipping 66 matching lines @@
         return;
 
     ThreadableLoaderOptions options;
     options.allowCredentials = true;
     options.crossOriginRequestPolicy = crossOriginRequestPolicy;
     options.sendLoadCallbacks = true;
 
     m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, *request, options);
 }
 
+const KURL& WorkerScriptLoader::responseURL() const
+{
+    ASSERT(!failed());
+    return m_responseURL;
+}
+
 PassOwnPtr<ResourceRequest> WorkerScriptLoader::createResourceRequest()
 {
     OwnPtr<ResourceRequest> request(new ResourceRequest(m_url));
     request->setHTTPMethod("GET");
     request->setTargetType(m_targetType);
     return request.release();
 }
     
 void WorkerScriptLoader::didReceiveResponse(const ResourceResponse& response)
 {
     if (response.httpStatusCode() / 100 != 2 && response.httpStatusCode()) {
         m_failed = true;
         return;
     }
+    m_responseURL = response.url();
     m_responseEncoding = response.textEncodingName();
     if (m_client)
         m_client->didReceiveResponse(response);
 }
 
 void WorkerScriptLoader::didReceiveData(const char* data, int len)
 {
     if (m_failed)
         return;
 
@@ skipping 48 matching lines @@
     
 void WorkerScriptLoader::notifyFinished()
 {
     if (m_client)
         m_client->notifyFinished();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)