| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 Document& document() const; | 81 Document& document() const; |
| 82 | 82 |
| 83 private: | 83 private: |
| 84 DummyPageHolder(const IntSize& initialViewSize, | 84 DummyPageHolder(const IntSize& initialViewSize, |
| 85 Page::PageClients*, | 85 Page::PageClients*, |
| 86 FrameLoaderClient*, | 86 FrameLoaderClient*, |
| 87 FrameSettingOverrideFunction settingOverrider, | 87 FrameSettingOverrideFunction settingOverrider, |
| 88 InterfaceProvider* = nullptr); | 88 InterfaceProvider* = nullptr); |
| 89 | 89 |
| 90 Persistent<Page> m_page; | 90 Persistent<Page> m_page; |
| 91 Persistent<LocalFrame> m_frame; | 91 |
| 92 // The LocalFrame is accessed from worker threads by unit tests |
| 93 // (WorkerThreadableLoaderTest), hence we need to allow cross-thread |
| 94 // usage of |m_frame|. |
| 95 // |
| 96 // TODO: rework the tests to not require cross-thread access. |
| 97 CrossThreadPersistent<LocalFrame> m_frame; |
| 92 | 98 |
| 93 Persistent<FrameLoaderClient> m_frameLoaderClient; | 99 Persistent<FrameLoaderClient> m_frameLoaderClient; |
| 94 }; | 100 }; |
| 95 | 101 |
| 96 } // namespace blink | 102 } // namespace blink |
| 97 | 103 |
| 98 #endif // DummyPageHolder_h | 104 #endif // DummyPageHolder_h |
| OLD | NEW |