| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 5 * Copyright (C) 2011 Google Inc. All rights reserved. | 5 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * | 10 * |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 DeferredHistoryLoad m_deferredHistoryLoad; | 248 DeferredHistoryLoad m_deferredHistoryLoad; |
| 249 | 249 |
| 250 bool m_inStopAllLoaders; | 250 bool m_inStopAllLoaders; |
| 251 | 251 |
| 252 Timer<FrameLoader> m_checkTimer; | 252 Timer<FrameLoader> m_checkTimer; |
| 253 | 253 |
| 254 bool m_didAccessInitialDocument; | 254 bool m_didAccessInitialDocument; |
| 255 Timer<FrameLoader> m_didAccessInitialDocumentTimer; | 255 Timer<FrameLoader> m_didAccessInitialDocumentTimer; |
| 256 | 256 |
| 257 SandboxFlags m_forcedSandboxFlags; | 257 SandboxFlags m_forcedSandboxFlags; |
| 258 |
| 259 bool m_dispatchingDidClearWindowObjectInMainWorld; |
| 258 }; | 260 }; |
| 259 | 261 |
| 260 } // namespace blink | 262 } // namespace blink |
| 261 | 263 |
| 262 #endif // FrameLoader_h | 264 #endif // FrameLoader_h |
| OLD | NEW |