OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
139 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" | 139 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" |
140 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" | 140 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" |
141 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginDocument.h" | 141 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginDocument.h" |
142 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" | 142 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" |
143 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" | 143 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" |
144 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" | 144 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" |
145 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" | 145 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" |
146 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" | 146 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" |
147 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSearchableFormData .h" | 147 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSearchableFormData .h" |
148 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" | 148 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" |
149 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" | |
149 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" | 150 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" |
150 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" | 151 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" |
151 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h " | 152 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h " |
152 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" | 153 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" |
153 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" | 154 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" |
154 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" | 155 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" |
155 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" | 156 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" |
156 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" | 157 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" |
157 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" | 158 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" |
158 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 159 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
251 using WebKit::WebPluginContainer; | 252 using WebKit::WebPluginContainer; |
252 using WebKit::WebPluginDocument; | 253 using WebKit::WebPluginDocument; |
253 using WebKit::WebPluginParams; | 254 using WebKit::WebPluginParams; |
254 using WebKit::WebPoint; | 255 using WebKit::WebPoint; |
255 using WebKit::WebPopupMenuInfo; | 256 using WebKit::WebPopupMenuInfo; |
256 using WebKit::WebRange; | 257 using WebKit::WebRange; |
257 using WebKit::WebRect; | 258 using WebKit::WebRect; |
258 using WebKit::WebScriptSource; | 259 using WebKit::WebScriptSource; |
259 using WebKit::WebSearchableFormData; | 260 using WebKit::WebSearchableFormData; |
260 using WebKit::WebSecurityOrigin; | 261 using WebKit::WebSecurityOrigin; |
262 using WebKit::WebSecurityPolicy; | |
261 using WebKit::WebSettings; | 263 using WebKit::WebSettings; |
262 using WebKit::WebSharedWorker; | 264 using WebKit::WebSharedWorker; |
263 using WebKit::WebSize; | 265 using WebKit::WebSize; |
264 using WebKit::WebStorageNamespace; | 266 using WebKit::WebStorageNamespace; |
265 using WebKit::WebString; | 267 using WebKit::WebString; |
266 using WebKit::WebTextAffinity; | 268 using WebKit::WebTextAffinity; |
267 using WebKit::WebTextDirection; | 269 using WebKit::WebTextDirection; |
268 using WebKit::WebURL; | 270 using WebKit::WebURL; |
269 using WebKit::WebURLError; | 271 using WebKit::WebURLError; |
270 using WebKit::WebURLRequest; | 272 using WebKit::WebURLRequest; |
(...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1400 } else { | 1402 } else { |
1401 // Navigate to the given URL. | 1403 // Navigate to the given URL. |
1402 WebURLRequest request(params.url); | 1404 WebURLRequest request(params.url); |
1403 | 1405 |
1404 // A session history navigation should have been accompanied by state. | 1406 // A session history navigation should have been accompanied by state. |
1405 DCHECK_EQ(params.page_id, -1); | 1407 DCHECK_EQ(params.page_id, -1); |
1406 | 1408 |
1407 if (main_frame->isViewSourceModeEnabled()) | 1409 if (main_frame->isViewSourceModeEnabled()) |
1408 request.setCachePolicy(WebURLRequest::ReturnCacheDataElseLoad); | 1410 request.setCachePolicy(WebURLRequest::ReturnCacheDataElseLoad); |
1409 | 1411 |
1412 | |
1410 if (params.referrer.is_valid()) { | 1413 if (params.referrer.is_valid()) { |
1414 bool hide_referrer = WebSecurityPolicy::shouldHideReferrer( | |
1415 params.url, | |
brettw
2011/04/18 22:24:32
These should be indented to only 4 spaces rather t
| |
1416 WebString::fromUTF8(params.referrer.spec())); | |
1417 if (!hide_referrer) | |
1411 request.setHTTPHeaderField(WebString::fromUTF8("Referer"), | 1418 request.setHTTPHeaderField(WebString::fromUTF8("Referer"), |
1412 WebString::fromUTF8(params.referrer.spec())); | 1419 WebString::fromUTF8(params.referrer.spec())); |
1413 } | 1420 } |
1414 | 1421 |
1415 if (!params.extra_headers.empty()) { | 1422 if (!params.extra_headers.empty()) { |
1416 for (net::HttpUtil::HeadersIterator i(params.extra_headers.begin(), | 1423 for (net::HttpUtil::HeadersIterator i(params.extra_headers.begin(), |
1417 params.extra_headers.end(), "\n"); | 1424 params.extra_headers.end(), "\n"); |
1418 i.GetNext(); ) { | 1425 i.GetNext(); ) { |
1419 request.addHTTPHeaderField(WebString::fromUTF8(i.name()), | 1426 request.addHTTPHeaderField(WebString::fromUTF8(i.name()), |
1420 WebString::fromUTF8(i.values())); | 1427 WebString::fromUTF8(i.values())); |
(...skipping 4269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5690 } | 5697 } |
5691 } | 5698 } |
5692 | 5699 |
5693 void RenderView::OnContextMenuClosed( | 5700 void RenderView::OnContextMenuClosed( |
5694 const webkit_glue::CustomContextMenuContext& custom_context) { | 5701 const webkit_glue::CustomContextMenuContext& custom_context) { |
5695 if (custom_context.is_pepper_menu) | 5702 if (custom_context.is_pepper_menu) |
5696 pepper_delegate_.OnContextMenuClosed(custom_context); | 5703 pepper_delegate_.OnContextMenuClosed(custom_context); |
5697 else | 5704 else |
5698 context_menu_node_.reset(); | 5705 context_menu_node_.reset(); |
5699 } | 5706 } |
OLD | NEW |