OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
3 // LICENSE file. | 3 // LICENSE file. |
4 | 4 |
5 #include <math.h> | 5 #include <math.h> |
6 #include "config.h" | 6 #include "config.h" |
7 | 7 |
8 #include "FrameView.h" | 8 #include "FrameView.h" |
9 #include "ScrollView.h" | 9 #include "ScrollView.h" |
10 #include <wtf/Assertions.h> | 10 #include <wtf/Assertions.h> |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "grit/webkit_resources.h" | 22 #include "grit/webkit_resources.h" |
23 #include "grit/webkit_strings.h" | 23 #include "grit/webkit_strings.h" |
24 #include "net/base/net_util.h" | 24 #include "net/base/net_util.h" |
25 #include "webkit/api/public/WebCursorInfo.h" | 25 #include "webkit/api/public/WebCursorInfo.h" |
26 #include "webkit/api/public/WebData.h" | 26 #include "webkit/api/public/WebData.h" |
27 #include "webkit/api/public/WebFrameClient.h" | 27 #include "webkit/api/public/WebFrameClient.h" |
28 #include "webkit/api/public/WebPluginListBuilder.h" | 28 #include "webkit/api/public/WebPluginListBuilder.h" |
29 #include "webkit/api/public/WebScreenInfo.h" | 29 #include "webkit/api/public/WebScreenInfo.h" |
30 #include "webkit/api/public/WebString.h" | 30 #include "webkit/api/public/WebString.h" |
31 #include "webkit/api/public/WebViewClient.h" | 31 #include "webkit/api/public/WebViewClient.h" |
| 32 #include "webkit/api/src/WebWorkerClientImpl.h" |
32 #include "webkit/glue/chrome_client_impl.h" | 33 #include "webkit/glue/chrome_client_impl.h" |
33 #include "webkit/glue/glue_util.h" | 34 #include "webkit/glue/glue_util.h" |
34 #include "webkit/glue/plugins/plugin_instance.h" | 35 #include "webkit/glue/plugins/plugin_instance.h" |
35 #include "webkit/glue/webkit_glue.h" | 36 #include "webkit/glue/webkit_glue.h" |
36 #include "webkit/glue/webplugininfo.h" | 37 #include "webkit/glue/webplugininfo.h" |
37 #include "webkit/glue/websocketstreamhandle_impl.h" | 38 #include "webkit/glue/websocketstreamhandle_impl.h" |
38 #include "webkit/glue/weburlloader_impl.h" | 39 #include "webkit/glue/weburlloader_impl.h" |
39 #include "webkit/glue/webview_impl.h" | 40 #include "webkit/glue/webview_impl.h" |
40 #include "webkit/glue/webworkerclient_impl.h" | |
41 | 41 |
42 using WebKit::WebApplicationCacheHost; | 42 using WebKit::WebApplicationCacheHost; |
43 using WebKit::WebApplicationCacheHostClient; | 43 using WebKit::WebApplicationCacheHostClient; |
44 using WebKit::WebCursorInfo; | 44 using WebKit::WebCursorInfo; |
45 using WebKit::WebData; | 45 using WebKit::WebData; |
46 using WebKit::WebLocalizedString; | 46 using WebKit::WebLocalizedString; |
47 using WebKit::WebPluginListBuilder; | 47 using WebKit::WebPluginListBuilder; |
48 using WebKit::WebStorageNamespace; | 48 using WebKit::WebStorageNamespace; |
49 using WebKit::WebString; | 49 using WebKit::WebString; |
50 using WebKit::WebSocketStreamHandle; | 50 using WebKit::WebSocketStreamHandle; |
51 using WebKit::WebThemeEngine; | 51 using WebKit::WebThemeEngine; |
52 using WebKit::WebURLLoader; | 52 using WebKit::WebURLLoader; |
53 using WebKit::WebWidgetClient; | 53 using WebKit::WebWidgetClient; |
| 54 using WebKit::WebWorkerClientImpl; |
54 | 55 |
55 namespace { | 56 namespace { |
56 | 57 |
57 ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) { | 58 ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) { |
58 WebCore::FrameView* view; | 59 WebCore::FrameView* view; |
59 if (widget->isFrameView()) { | 60 if (widget->isFrameView()) { |
60 view = static_cast<WebCore::FrameView*>(widget); | 61 view = static_cast<WebCore::FrameView*>(widget); |
61 } else if (widget->parent() && widget->parent()->isFrameView()) { | 62 } else if (widget->parent() && widget->parent()->isFrameView()) { |
62 view = static_cast<WebCore::FrameView*>(widget->parent()); | 63 view = static_cast<WebCore::FrameView*>(widget->parent()); |
63 } else { | 64 } else { |
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
521 return file_util::DirectoryExists(file_path); | 522 return file_util::DirectoryExists(file_path); |
522 } | 523 } |
523 | 524 |
524 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { | 525 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { |
525 FilePath file_path(webkit_glue::WebStringToFilePathString(path)); | 526 FilePath file_path(webkit_glue::WebStringToFilePathString(path)); |
526 GURL file_url = net::FilePathToFileURL(file_path); | 527 GURL file_url = net::FilePathToFileURL(file_path); |
527 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); | 528 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); |
528 } | 529 } |
529 | 530 |
530 } // namespace webkit_glue | 531 } // namespace webkit_glue |
OLD | NEW |