| 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) 2009, 2011 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2009, 2011 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 return m_messageStorage.get(); | 338 return m_messageStorage.get(); |
| 339 } | 339 } |
| 340 | 340 |
| 341 void WorkerGlobalScope::exceptionHandled(int exceptionId, bool isHandled) | 341 void WorkerGlobalScope::exceptionHandled(int exceptionId, bool isHandled) |
| 342 { | 342 { |
| 343 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = m_pendingMessages.take(e
xceptionId); | 343 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = m_pendingMessages.take(e
xceptionId); |
| 344 if (!isHandled) | 344 if (!isHandled) |
| 345 addConsoleMessage(consoleMessage.release()); | 345 addConsoleMessage(consoleMessage.release()); |
| 346 } | 346 } |
| 347 | 347 |
| 348 bool WorkerGlobalScope::isPrivilegedContext(String& errorMessage, const Privileg
eContextCheck privilegeContextCheck) | 348 bool WorkerGlobalScope::isPrivilegedContext(String& errorMessage, const Privileg
eContextCheck privilegeContextCheck) const |
| 349 { | 349 { |
| 350 // Until there are APIs that are available in workers and that | 350 // Until there are APIs that are available in workers and that |
| 351 // require a privileged context test that checks ancestors, just do | 351 // require a privileged context test that checks ancestors, just do |
| 352 // a simple check here. Once we have a need for a real | 352 // a simple check here. Once we have a need for a real |
| 353 // |isPrivilegedContext| check here, we can check the responsible | 353 // |isPrivilegedContext| check here, we can check the responsible |
| 354 // document for a privileged context at worker creation time, pass | 354 // document for a privileged context at worker creation time, pass |
| 355 // it in via WorkerThreadStartupData, and check it here. | 355 // it in via WorkerThreadStartupData, and check it here. |
| 356 return securityOrigin()->isPotentiallyTrustworthy(errorMessage); | 356 return securityOrigin()->isPotentiallyTrustworthy(errorMessage); |
| 357 } | 357 } |
| 358 | 358 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 visitor->trace(m_timers); | 392 visitor->trace(m_timers); |
| 393 visitor->trace(m_messageStorage); | 393 visitor->trace(m_messageStorage); |
| 394 visitor->trace(m_pendingMessages); | 394 visitor->trace(m_pendingMessages); |
| 395 HeapSupplementable<WorkerGlobalScope>::trace(visitor); | 395 HeapSupplementable<WorkerGlobalScope>::trace(visitor); |
| 396 #endif | 396 #endif |
| 397 ExecutionContext::trace(visitor); | 397 ExecutionContext::trace(visitor); |
| 398 EventTargetWithInlineData::trace(visitor); | 398 EventTargetWithInlineData::trace(visitor); |
| 399 } | 399 } |
| 400 | 400 |
| 401 } // namespace blink | 401 } // namespace blink |
| OLD | NEW |