OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "WebIconURL.h" | 43 #include "WebIconURL.h" |
44 #include "WebNavigationPolicy.h" | 44 #include "WebNavigationPolicy.h" |
45 #include "WebNavigationType.h" | 45 #include "WebNavigationType.h" |
46 #include "WebNavigatorContentUtilsClient.h" | 46 #include "WebNavigatorContentUtilsClient.h" |
47 #include "WebSandboxFlags.h" | 47 #include "WebSandboxFlags.h" |
48 #include "WebSourceLocation.h" | 48 #include "WebSourceLocation.h" |
49 #include "WebTextDirection.h" | 49 #include "WebTextDirection.h" |
50 #include "public/platform/BlameContext.h" | 50 #include "public/platform/BlameContext.h" |
51 #include "public/platform/WebColor.h" | 51 #include "public/platform/WebColor.h" |
52 #include "public/platform/WebCommon.h" | 52 #include "public/platform/WebCommon.h" |
| 53 #include "public/platform/WebContentSecurityPolicy.h" |
53 #include "public/platform/WebContentSecurityPolicyStruct.h" | 54 #include "public/platform/WebContentSecurityPolicyStruct.h" |
54 #include "public/platform/WebEffectiveConnectionType.h" | 55 #include "public/platform/WebEffectiveConnectionType.h" |
55 #include "public/platform/WebFeaturePolicy.h" | 56 #include "public/platform/WebFeaturePolicy.h" |
56 #include "public/platform/WebFileSystem.h" | 57 #include "public/platform/WebFileSystem.h" |
57 #include "public/platform/WebFileSystemType.h" | 58 #include "public/platform/WebFileSystemType.h" |
58 #include "public/platform/WebInsecureRequestPolicy.h" | 59 #include "public/platform/WebInsecureRequestPolicy.h" |
59 #include "public/platform/WebLoadingBehaviorFlag.h" | 60 #include "public/platform/WebLoadingBehaviorFlag.h" |
60 #include "public/platform/WebPageVisibilityState.h" | 61 #include "public/platform/WebPageVisibilityState.h" |
61 #include "public/platform/WebSecurityOrigin.h" | 62 #include "public/platform/WebSecurityOrigin.h" |
62 #include "public/platform/WebSetSinkIdCallbacks.h" | 63 #include "public/platform/WebSetSinkIdCallbacks.h" |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 // be modified. | 296 // be modified. |
296 WebURLRequest& urlRequest; | 297 WebURLRequest& urlRequest; |
297 WebNavigationType navigationType; | 298 WebNavigationType navigationType; |
298 WebNavigationPolicy defaultPolicy; | 299 WebNavigationPolicy defaultPolicy; |
299 bool replacesCurrentHistoryItem; | 300 bool replacesCurrentHistoryItem; |
300 bool isHistoryNavigationInNewChildFrame; | 301 bool isHistoryNavigationInNewChildFrame; |
301 bool isClientRedirect; | 302 bool isClientRedirect; |
302 WebFormElement form; | 303 WebFormElement form; |
303 bool isCacheDisabled; | 304 bool isCacheDisabled; |
304 WebSourceLocation sourceLocation; | 305 WebSourceLocation sourceLocation; |
| 306 WebContentSecurityPolicyDisposition |
| 307 shouldCheckMainWorldContentSecurityPolicy; |
305 | 308 |
306 NavigationPolicyInfo(WebURLRequest& urlRequest) | 309 NavigationPolicyInfo(WebURLRequest& urlRequest) |
307 : extraData(nullptr), | 310 : extraData(nullptr), |
308 urlRequest(urlRequest), | 311 urlRequest(urlRequest), |
309 navigationType(WebNavigationTypeOther), | 312 navigationType(WebNavigationTypeOther), |
310 defaultPolicy(WebNavigationPolicyIgnore), | 313 defaultPolicy(WebNavigationPolicyIgnore), |
311 replacesCurrentHistoryItem(false), | 314 replacesCurrentHistoryItem(false), |
312 isHistoryNavigationInNewChildFrame(false), | 315 isHistoryNavigationInNewChildFrame(false), |
313 isClientRedirect(false), | 316 isClientRedirect(false), |
314 isCacheDisabled(false) {} | 317 isCacheDisabled(false), |
| 318 shouldCheckMainWorldContentSecurityPolicy( |
| 319 WebContentSecurityPolicyDispositionCheck) {} |
315 }; | 320 }; |
316 | 321 |
317 virtual WebNavigationPolicy decidePolicyForNavigation( | 322 virtual WebNavigationPolicy decidePolicyForNavigation( |
318 const NavigationPolicyInfo& info) { | 323 const NavigationPolicyInfo& info) { |
319 return info.defaultPolicy; | 324 return info.defaultPolicy; |
320 } | 325 } |
321 | 326 |
322 // During a history navigation, we may choose to load new subframes from | 327 // During a history navigation, we may choose to load new subframes from |
323 // history as well. This returns such a history item if appropriate. | 328 // history as well. This returns such a history item if appropriate. |
324 virtual WebHistoryItem historyItemForNewChildFrame() { | 329 virtual WebHistoryItem historyItemForNewChildFrame() { |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
751 // Overwrites the given URL to use an HTML5 embed if possible. | 756 // Overwrites the given URL to use an HTML5 embed if possible. |
752 // An empty URL is returned if the URL is not overriden. | 757 // An empty URL is returned if the URL is not overriden. |
753 virtual WebURL overrideFlashEmbedWithHTML(const WebURL& url) { | 758 virtual WebURL overrideFlashEmbedWithHTML(const WebURL& url) { |
754 return WebURL(); | 759 return WebURL(); |
755 } | 760 } |
756 }; | 761 }; |
757 | 762 |
758 } // namespace blink | 763 } // namespace blink |
759 | 764 |
760 #endif | 765 #endif |
OLD | NEW |