WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/loader/ThreadableLoader.cpp

 /*
- * Copyright (c) 2009, Google Inc. All rights reserved.
+ * 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
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
@@ skipping 16 matching lines @@
  */
 
 #include "config.h"
 #include "ThreadableLoader.h"
 
 #include "DocumentThreadableLoader.h"
 #include "Document.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "ScriptExecutionContext.h"
+#include "WorkerContext.h"
+#include "WorkerThreadableLoader.h"
 
 namespace WebCore {
 
 PassRefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, const ResourceRequest& request, LoadCallbacks callbacksSetting, ContentSniff contentSniff) 
 {
     ASSERT(client);
     ASSERT(context);
+
+#if ENABLE(WORKERS)
+    if (context->isWorkerContext())
+        return WorkerThreadableLoader::create(static_cast<WorkerContext*>(context), client, request, callbacksSetting, contentSniff);
+#endif // ENABLE(WORKERS)
+
     ASSERT(context->isDocument());
-
     return DocumentThreadableLoader::create(static_cast<Document*>(context), client, request, callbacksSetting, contentSniff);
 }
 
 unsigned long ThreadableLoader::loadResourceSynchronously(ScriptExecutionContext* context, const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data)
 {
     ASSERT(context);
     ASSERT(context->isDocument());
 
     Document* document = static_cast<Document*>(context);
     if (!document->frame())
         return std::numeric_limits<unsigned long>::max();
     return document->frame()->loader()->loadResourceSynchronously(request, error, response, data);
 }
 
 } // namespace WebCore