Moves webview_impl.cc, webframe_impl.cc and webframeloaderclient_impl.cc into...

webkit/api/src/WebWorkerClientImpl.cpp

 /*
  * 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
@@ skipping 29 matching lines @@
 #include "GenericWorkerTask.h"
 #include "MessageEvent.h"
 #include "MessagePort.h"
 #include "MessagePortChannel.h"
 #include "ScriptExecutionContext.h"
 #include "Worker.h"
 #include "WorkerContext.h"
 #include "WorkerContextExecutionProxy.h"
 #include "WorkerMessagingProxy.h"
 #include <wtf/Threading.h>
-#undef LOG
 
+#include "FrameLoaderClientImpl.h"
 #include "PlatformMessagePortChannel.h"
 #include "WebFrameClient.h"
+#include "WebFrameImpl.h"
 #include "WebKit.h"
 #include "WebKitClient.h"
 #include "WebMessagePortChannel.h"
 #include "WebString.h"
 #include "WebURL.h"
+#include "WebViewImpl.h"
 #include "WebWorker.h"
 #include "WebWorkerImpl.h"
-// FIXME: remove the includes below
-#include "webkit/glue/webframeloaderclient_impl.h"
-#include "webkit/glue/webframe_impl.h"
-#include "webkit/glue/webview_impl.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // When WebKit creates a WorkerContextProxy object, we check if we're in the
 // renderer or worker process.  If the latter, then we just use
 // WorkerMessagingProxy.
 //
 // If we're in the renderer process, then we need use the glue provided
@@ skipping 11 matching lines @@
     // FIXME: v8 doesn't support more than one workers per process.
     // if (!worker->scriptExecutionContext()->isDocument())
     //     return new WorkerMessagingProxy(worker);
 
     WebWorker* webWorker = 0;
     WebWorkerClientImpl* proxy = new WebWorkerClientImpl(worker);
 
     if (worker->scriptExecutionContext()->isDocument()) {
         Document* document = static_cast<Document*>(
             worker->scriptExecutionContext());
-        WebFrameImpl* webFrame = WebFrameImpl::FromFrame(document->frame());
+        WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
         webWorker = webFrame->client()->createWorker(webFrame, proxy);
     } else {
         WorkerContextExecutionProxy* currentContext =
         WorkerContextExecutionProxy::retrieve();
         if (!currentContext) {
             ASSERT_NOT_REACHED();
             return 0;
         }
 
         DedicatedWorkerThread* thread =
@@ skipping 298 matching lines @@
 void WebWorkerClientImpl::reportPendingActivityTask(ScriptExecutionContext* context,
                                                     WebWorkerClientImpl* thisPtr,
                                                     bool hasPendingActivity)
 {
     thisPtr->m_workerContextHadPendingActivity = hasPendingActivity;
 }
 
 } // namespace WebKit
 
 #endif