| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 #include "ScriptExecutionContext.h" | 41 #include "ScriptExecutionContext.h" |
| 42 #include "SecurityOrigin.h" | 42 #include "SecurityOrigin.h" |
| 43 #include "SerializedScriptValue.h" | 43 #include "SerializedScriptValue.h" |
| 44 #include "SubstituteData.h" | 44 #include "SubstituteData.h" |
| 45 #include <wtf/MainThread.h> | 45 #include <wtf/MainThread.h> |
| 46 #include <wtf/Threading.h> | 46 #include <wtf/Threading.h> |
| 47 | 47 |
| 48 #include "PlatformMessagePortChannel.h" | 48 #include "PlatformMessagePortChannel.h" |
| 49 #include "WebDataSourceImpl.h" | 49 #include "WebDataSourceImpl.h" |
| 50 #include "WebFrameClient.h" | 50 #include "WebFrameClient.h" |
| 51 #include "WebFrameImpl.h" |
| 51 #include "WebMessagePortChannel.h" | 52 #include "WebMessagePortChannel.h" |
| 52 #include "WebScreenInfo.h" | 53 #include "WebScreenInfo.h" |
| 53 #include "WebString.h" | 54 #include "WebString.h" |
| 54 #include "WebURL.h" | 55 #include "WebURL.h" |
| 55 #include "WebView.h" | 56 #include "WebView.h" |
| 56 #include "WebWorkerClient.h" | 57 #include "WebWorkerClient.h" |
| 57 // FIXME: webframe should eventually move to api/src too. | |
| 58 #include "webkit/glue/webframe_impl.h" | |
| 59 | 58 |
| 60 using namespace WebCore; | 59 using namespace WebCore; |
| 61 | 60 |
| 62 namespace WebKit { | 61 namespace WebKit { |
| 63 | 62 |
| 64 #if ENABLE(WORKERS) | 63 #if ENABLE(WORKERS) |
| 65 | 64 |
| 66 // Dummy WebViewDelegate - we only need it in Worker process to load a | 65 // Dummy WebViewDelegate - we only need it in Worker process to load a |
| 67 // 'shadow page' which will initialize WebCore loader. | 66 // 'shadow page' which will initialize WebCore loader. |
| 68 class WorkerWebFrameClient : public WebKit::WebFrameClient { | 67 class WorkerWebFrameClient : public WebKit::WebFrameClient { |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 #else | 371 #else |
| 373 | 372 |
| 374 WebWorker* WebWorker::create(WebWorkerClient* client) | 373 WebWorker* WebWorker::create(WebWorkerClient* client) |
| 375 { | 374 { |
| 376 return 0; | 375 return 0; |
| 377 } | 376 } |
| 378 | 377 |
| 379 #endif // ENABLE(WORKERS) | 378 #endif // ENABLE(WORKERS) |
| 380 | 379 |
| 381 } // namespace WebKit | 380 } // namespace WebKit |
| OLD | NEW |