OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
122 #include "media/filters/audio_renderer_impl.h" | 122 #include "media/filters/audio_renderer_impl.h" |
123 #include "media/filters/gpu_video_decoder.h" | 123 #include "media/filters/gpu_video_decoder.h" |
124 #include "net/base/data_url.h" | 124 #include "net/base/data_url.h" |
125 #include "net/base/escape.h" | 125 #include "net/base/escape.h" |
126 #include "net/base/net_errors.h" | 126 #include "net/base/net_errors.h" |
127 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 127 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
128 #include "net/http/http_util.h" | 128 #include "net/http/http_util.h" |
129 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" | 129 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" |
130 #include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" | 130 #include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" |
131 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h " | 131 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h " |
132 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" | |
132 #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" | 133 #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" |
133 #include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" | 134 #include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" |
134 #include "third_party/WebKit/Source/Platform/chromium/public/WebMessagePortChann el.h" | 135 #include "third_party/WebKit/Source/Platform/chromium/public/WebMessagePortChann el.h" |
135 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" | 136 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" |
136 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" | 137 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" |
137 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 138 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
138 #include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHand le.h" | 139 #include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHand le.h" |
139 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 140 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
140 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 141 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
141 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" | 142 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" |
(...skipping 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2197 // seems safest to not execute the rest. | 2198 // seems safest to not execute the rest. |
2198 if (!frame->executeCommand(WebString::fromUTF8(it->name), | 2199 if (!frame->executeCommand(WebString::fromUTF8(it->name), |
2199 WebString::fromUTF8(it->value))) | 2200 WebString::fromUTF8(it->value))) |
2200 break; | 2201 break; |
2201 did_execute_command = true; | 2202 did_execute_command = true; |
2202 } | 2203 } |
2203 | 2204 |
2204 return did_execute_command; | 2205 return did_execute_command; |
2205 } | 2206 } |
2206 | 2207 |
2208 void RenderViewImpl::didScrollWithKeyboard(const WebKit::WebFloatSize& delta) { | |
2209 if (delta.height != 0.f) | |
Ted C
2013/06/03 17:43:42
Hmm...this behavior isn't really consistent with h
Jinsuk Kim
2013/06/05 08:21:07
Thanks for spotting it. The transition does look d
| |
2210 compositor_->ShowTopControls(delta.height < 0.f); | |
2211 } | |
2212 | |
2207 WebKit::WebColorChooser* RenderViewImpl::createColorChooser( | 2213 WebKit::WebColorChooser* RenderViewImpl::createColorChooser( |
2208 WebKit::WebColorChooserClient* client, | 2214 WebKit::WebColorChooserClient* client, |
2209 const WebKit::WebColor& initial_color) { | 2215 const WebKit::WebColor& initial_color) { |
2210 RendererWebColorChooserImpl* color_chooser = | 2216 RendererWebColorChooserImpl* color_chooser = |
2211 new RendererWebColorChooserImpl(this, client); | 2217 new RendererWebColorChooserImpl(this, client); |
2212 color_chooser->Open(static_cast<SkColor>(initial_color)); | 2218 color_chooser->Open(static_cast<SkColor>(initial_color)); |
2213 return color_chooser; | 2219 return color_chooser; |
2214 } | 2220 } |
2215 | 2221 |
2216 bool RenderViewImpl::runFileChooser( | 2222 bool RenderViewImpl::runFileChooser( |
(...skipping 4338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6555 WebURL url = icon_urls[i].iconURL(); | 6561 WebURL url = icon_urls[i].iconURL(); |
6556 if (!url.isEmpty()) | 6562 if (!url.isEmpty()) |
6557 urls.push_back(FaviconURL(url, | 6563 urls.push_back(FaviconURL(url, |
6558 ToFaviconType(icon_urls[i].iconType()))); | 6564 ToFaviconType(icon_urls[i].iconType()))); |
6559 } | 6565 } |
6560 SendUpdateFaviconURL(urls); | 6566 SendUpdateFaviconURL(urls); |
6561 } | 6567 } |
6562 | 6568 |
6563 | 6569 |
6564 } // namespace content | 6570 } // namespace content |
OLD | NEW |