| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 public: | 46 public: |
| 47 PendingException(const String& errorMessage, int lineNumber, int columnNumbe
r, int scriptId, const String& sourceURL, PassRefPtrWillBeRawPtr<ScriptCallStack
> callStack) | 47 PendingException(const String& errorMessage, int lineNumber, int columnNumbe
r, int scriptId, const String& sourceURL, PassRefPtrWillBeRawPtr<ScriptCallStack
> callStack) |
| 48 : m_errorMessage(errorMessage) | 48 : m_errorMessage(errorMessage) |
| 49 , m_lineNumber(lineNumber) | 49 , m_lineNumber(lineNumber) |
| 50 , m_columnNumber(columnNumber) | 50 , m_columnNumber(columnNumber) |
| 51 , m_scriptId(scriptId) | 51 , m_scriptId(scriptId) |
| 52 , m_sourceURL(sourceURL) | 52 , m_sourceURL(sourceURL) |
| 53 , m_callStack(callStack) | 53 , m_callStack(callStack) |
| 54 { | 54 { |
| 55 } | 55 } |
| 56 void trace(Visitor* visitor) | 56 DEFINE_INLINE_TRACE() |
| 57 { | 57 { |
| 58 visitor->trace(m_callStack); | 58 visitor->trace(m_callStack); |
| 59 } | 59 } |
| 60 String m_errorMessage; | 60 String m_errorMessage; |
| 61 int m_lineNumber; | 61 int m_lineNumber; |
| 62 int m_columnNumber; | 62 int m_columnNumber; |
| 63 int m_scriptId; | 63 int m_scriptId; |
| 64 String m_sourceURL; | 64 String m_sourceURL; |
| 65 RefPtrWillBeMember<ScriptCallStack> m_callStack; | 65 RefPtrWillBeMember<ScriptCallStack> m_callStack; |
| 66 }; | 66 }; |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 } | 224 } |
| 225 | 225 |
| 226 bool ExecutionContext::isWindowInteractionAllowed() const | 226 bool ExecutionContext::isWindowInteractionAllowed() const |
| 227 { | 227 { |
| 228 // FIXME: WindowFocusAllowedIndicator::windowFocusAllowed() is temporary, | 228 // FIXME: WindowFocusAllowedIndicator::windowFocusAllowed() is temporary, |
| 229 // it will be removed as soon as WebScopedWindowFocusAllowedIndicator will | 229 // it will be removed as soon as WebScopedWindowFocusAllowedIndicator will |
| 230 // be updated to not use WindowFocusAllowedIndicator. | 230 // be updated to not use WindowFocusAllowedIndicator. |
| 231 return m_windowInteractionTokens > 0 || WindowFocusAllowedIndicator::windowF
ocusAllowed(); | 231 return m_windowInteractionTokens > 0 || WindowFocusAllowedIndicator::windowF
ocusAllowed(); |
| 232 } | 232 } |
| 233 | 233 |
| 234 void ExecutionContext::trace(Visitor* visitor) | 234 DEFINE_TRACE(ExecutionContext) |
| 235 { | 235 { |
| 236 #if ENABLE(OILPAN) | 236 #if ENABLE(OILPAN) |
| 237 visitor->trace(m_pendingExceptions); | 237 visitor->trace(m_pendingExceptions); |
| 238 visitor->trace(m_publicURLManager); | 238 visitor->trace(m_publicURLManager); |
| 239 HeapSupplementable<ExecutionContext>::trace(visitor); | 239 HeapSupplementable<ExecutionContext>::trace(visitor); |
| 240 #endif | 240 #endif |
| 241 ContextLifecycleNotifier::trace(visitor); | 241 ContextLifecycleNotifier::trace(visitor); |
| 242 } | 242 } |
| 243 | 243 |
| 244 } // namespace blink | 244 } // namespace blink |
| OLD | NEW |