WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/loader/ThreadableLoader.cpp

Index: third_party/WebKit/WebCore/loader/ThreadableLoader.cpp
===================================================================
--- third_party/WebKit/WebCore/loader/ThreadableLoader.cpp	(revision 9118)
+++ third_party/WebKit/WebCore/loader/ThreadableLoader.cpp	(working copy)
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -36,6 +36,8 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "ScriptExecutionContext.h"
+#include "WorkerContext.h"
+#include "WorkerThreadableLoader.h"
 
 namespace WebCore {
 
@@ -43,8 +45,13 @@
 {
     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);
 }