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 "chrome/renderer/renderer_webkitclient_impl.h" | 5 #include "chrome/renderer/renderer_webkitclient_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 #include "chrome/common/render_messages.h" | 9 #include "chrome/common/render_messages.h" |
10 #include "chrome/plugin/npobject_util.h" | 10 #include "chrome/plugin/npobject_util.h" |
11 #include "chrome/renderer/net/render_dns_master.h" | 11 #include "chrome/renderer/net/render_dns_master.h" |
12 #include "chrome/renderer/render_thread.h" | 12 #include "chrome/renderer/render_thread.h" |
| 13 #include "chrome/renderer/renderer_webstoragenamespace_impl.h" |
13 #include "chrome/renderer/visitedlink_slave.h" | 14 #include "chrome/renderer/visitedlink_slave.h" |
14 #include "webkit/api/public/WebString.h" | 15 #include "webkit/api/public/WebString.h" |
15 #include "webkit/api/public/WebURL.h" | 16 #include "webkit/api/public/WebURL.h" |
16 #include "webkit/glue/glue_util.h" | 17 #include "webkit/glue/glue_util.h" |
17 #include "webkit/glue/webkit_glue.h" | 18 #include "webkit/glue/webkit_glue.h" |
18 | 19 |
19 #if defined(OS_LINUX) | 20 #if defined(OS_LINUX) |
20 #include "chrome/renderer/renderer_sandbox_support_linux.h" | 21 #include "chrome/renderer/renderer_sandbox_support_linux.h" |
21 #endif | 22 #endif |
22 | 23 |
| 24 using WebKit::WebStorageArea; |
| 25 using WebKit::WebStorageNamespace; |
23 using WebKit::WebString; | 26 using WebKit::WebString; |
24 using WebKit::WebURL; | 27 using WebKit::WebURL; |
25 | 28 |
26 //------------------------------------------------------------------------------ | 29 //------------------------------------------------------------------------------ |
27 | 30 |
28 WebKit::WebClipboard* RendererWebKitClientImpl::clipboard() { | 31 WebKit::WebClipboard* RendererWebKitClientImpl::clipboard() { |
29 return &clipboard_; | 32 return &clipboard_; |
30 } | 33 } |
31 | 34 |
32 WebKit::WebMimeRegistry* RendererWebKitClientImpl::mimeRegistry() { | 35 WebKit::WebMimeRegistry* RendererWebKitClientImpl::mimeRegistry() { |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 // TODO(darin): Eliminate this webkit_glue call. | 96 // TODO(darin): Eliminate this webkit_glue call. |
94 return WideToUTF16(webkit_glue::GetWebKitLocale()); | 97 return WideToUTF16(webkit_glue::GetWebKitLocale()); |
95 } | 98 } |
96 | 99 |
97 void RendererWebKitClientImpl::suddenTerminationChanged(bool enabled) { | 100 void RendererWebKitClientImpl::suddenTerminationChanged(bool enabled) { |
98 RenderThread* thread = RenderThread::current(); | 101 RenderThread* thread = RenderThread::current(); |
99 if (thread) // NULL in unittests. | 102 if (thread) // NULL in unittests. |
100 thread->Send(new ViewHostMsg_SuddenTerminationChanged(enabled)); | 103 thread->Send(new ViewHostMsg_SuddenTerminationChanged(enabled)); |
101 } | 104 } |
102 | 105 |
| 106 WebStorageNamespace* RendererWebKitClientImpl::createLocalStorageNamespace( |
| 107 const WebString& path) { |
| 108 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
| 109 return WebStorageNamespace::createLocalStorageNamespace(path); |
| 110 // The browser process decides the path, so ignore that param. |
| 111 return new RendererWebStorageNamespaceImpl(true); |
| 112 } |
| 113 |
| 114 WebStorageNamespace* RendererWebKitClientImpl::createSessionStorageNamespace() { |
| 115 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
| 116 return WebStorageNamespace::createSessionStorageNamespace(); |
| 117 return new RendererWebStorageNamespaceImpl(false); |
| 118 } |
| 119 |
103 //------------------------------------------------------------------------------ | 120 //------------------------------------------------------------------------------ |
104 | 121 |
105 WebString RendererWebKitClientImpl::MimeRegistry::mimeTypeForExtension( | 122 WebString RendererWebKitClientImpl::MimeRegistry::mimeTypeForExtension( |
106 const WebString& file_extension) { | 123 const WebString& file_extension) { |
107 if (IsPluginProcess()) | 124 if (IsPluginProcess()) |
108 return SimpleWebMimeRegistryImpl::mimeTypeForExtension(file_extension); | 125 return SimpleWebMimeRegistryImpl::mimeTypeForExtension(file_extension); |
109 | 126 |
110 // The sandbox restricts our access to the registry, so we need to proxy | 127 // The sandbox restricts our access to the registry, so we need to proxy |
111 // these calls over to the browser process. | 128 // these calls over to the browser process. |
112 std::string mime_type; | 129 std::string mime_type; |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 return WebString::fromUTF8(iter->second.data(), iter->second.size()); | 185 return WebString::fromUTF8(iter->second.data(), iter->second.size()); |
169 | 186 |
170 const std::string family_name = | 187 const std::string family_name = |
171 renderer_sandbox_support::getFontFamilyForCharacters(characters, | 188 renderer_sandbox_support::getFontFamilyForCharacters(characters, |
172 num_characters); | 189 num_characters); |
173 unicode_font_families_.insert(make_pair(key, family_name)); | 190 unicode_font_families_.insert(make_pair(key, family_name)); |
174 return WebString::fromUTF8(family_name); | 191 return WebString::fromUTF8(family_name); |
175 } | 192 } |
176 | 193 |
177 #endif | 194 #endif |
OLD | NEW |