| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * Copyright (C) 2012 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2012 Google Inc. All Rights Reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 void ExecutionContext::ConsumeWindowInteraction() { | 182 void ExecutionContext::ConsumeWindowInteraction() { |
| 183 if (window_interaction_tokens_ == 0) | 183 if (window_interaction_tokens_ == 0) |
| 184 return; | 184 return; |
| 185 --window_interaction_tokens_; | 185 --window_interaction_tokens_; |
| 186 } | 186 } |
| 187 | 187 |
| 188 bool ExecutionContext::IsWindowInteractionAllowed() const { | 188 bool ExecutionContext::IsWindowInteractionAllowed() const { |
| 189 return window_interaction_tokens_ > 0; | 189 return window_interaction_tokens_ > 0; |
| 190 } | 190 } |
| 191 | 191 |
| 192 bool ExecutionContext::IsSecureContext( | 192 bool ExecutionContext::IsSecureContext() const { |
| 193 const SecureContextCheck privilege_context_check) const { | |
| 194 String unused_error_message; | 193 String unused_error_message; |
| 195 return IsSecureContext(unused_error_message, privilege_context_check); | 194 return IsSecureContext(unused_error_message); |
| 196 } | 195 } |
| 197 | 196 |
| 198 String ExecutionContext::OutgoingReferrer() const { | 197 String ExecutionContext::OutgoingReferrer() const { |
| 199 return Url().StrippedForUseAsReferrer(); | 198 return Url().StrippedForUseAsReferrer(); |
| 200 } | 199 } |
| 201 | 200 |
| 202 void ExecutionContext::ParseAndSetReferrerPolicy(const String& policies, | 201 void ExecutionContext::ParseAndSetReferrerPolicy(const String& policies, |
| 203 bool support_legacy_keywords) { | 202 bool support_legacy_keywords) { |
| 204 ReferrerPolicy referrer_policy; | 203 ReferrerPolicy referrer_policy; |
| 205 | 204 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 } | 238 } |
| 240 | 239 |
| 241 DEFINE_TRACE(ExecutionContext) { | 240 DEFINE_TRACE(ExecutionContext) { |
| 242 visitor->Trace(public_url_manager_); | 241 visitor->Trace(public_url_manager_); |
| 243 visitor->Trace(pending_exceptions_); | 242 visitor->Trace(pending_exceptions_); |
| 244 ContextLifecycleNotifier::Trace(visitor); | 243 ContextLifecycleNotifier::Trace(visitor); |
| 245 Supplementable<ExecutionContext>::Trace(visitor); | 244 Supplementable<ExecutionContext>::Trace(visitor); |
| 246 } | 245 } |
| 247 | 246 |
| 248 } // namespace blink | 247 } // namespace blink |
| OLD | NEW |