| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 return m_client->securityContext().contentSecurityPolicy(); | 247 return m_client->securityContext().contentSecurityPolicy(); |
| 248 } | 248 } |
| 249 | 249 |
| 250 const KURL& ExecutionContext::url() const | 250 const KURL& ExecutionContext::url() const |
| 251 { | 251 { |
| 252 if (!m_client) { | 252 if (!m_client) { |
| 253 DEFINE_STATIC_LOCAL(KURL, emptyURL, ()); | 253 DEFINE_STATIC_LOCAL(KURL, emptyURL, ()); |
| 254 return emptyURL; | 254 return emptyURL; |
| 255 } | 255 } |
| 256 | 256 |
| 257 return m_client->virtualURL(); | 257 return virtualURL(); |
| 258 } | 258 } |
| 259 | 259 |
| 260 KURL ExecutionContext::completeURL(const String& url) const | 260 KURL ExecutionContext::completeURL(const String& url) const |
| 261 { | 261 { |
| 262 | 262 |
| 263 if (!m_client) { | 263 if (!m_client) { |
| 264 DEFINE_STATIC_LOCAL(KURL, emptyURL, ()); | 264 DEFINE_STATIC_LOCAL(KURL, emptyURL, ()); |
| 265 return emptyURL; | 265 return emptyURL; |
| 266 } | 266 } |
| 267 | 267 |
| 268 return m_client->virtualCompleteURL(url); | 268 return virtualCompleteURL(url); |
| 269 } | 269 } |
| 270 | 270 |
| 271 void ExecutionContext::disableEval(const String& errorMessage) | 271 void ExecutionContext::disableEval(const String& errorMessage) |
| 272 { | 272 { |
| 273 if (!m_client) | 273 if (!m_client) |
| 274 return; | 274 return; |
| 275 return m_client->disableEval(errorMessage); | 275 return m_client->disableEval(errorMessage); |
| 276 } | 276 } |
| 277 | 277 |
| 278 DOMWindow* ExecutionContext::executingWindow() const | 278 DOMWindow* ExecutionContext::executingWindow() const |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 | 338 |
| 339 void ExecutionContext::trace(Visitor* visitor) | 339 void ExecutionContext::trace(Visitor* visitor) |
| 340 { | 340 { |
| 341 #if ENABLE(OILPAN) | 341 #if ENABLE(OILPAN) |
| 342 visitor->trace(m_pendingExceptions); | 342 visitor->trace(m_pendingExceptions); |
| 343 #endif | 343 #endif |
| 344 Supplementable<WebCore::ExecutionContext>::trace(visitor); | 344 Supplementable<WebCore::ExecutionContext>::trace(visitor); |
| 345 } | 345 } |
| 346 | 346 |
| 347 } // namespace WebCore | 347 } // namespace WebCore |
| OLD | NEW |