| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 settings.setAcceleratedCompositingEnabled(false); | 75 settings.setAcceleratedCompositingEnabled(false); |
| 76 if (settingOverrider) | 76 if (settingOverrider) |
| 77 (*settingOverrider)(settings); | 77 (*settingOverrider)(settings); |
| 78 | 78 |
| 79 m_frameLoaderClient = frameLoaderClient; | 79 m_frameLoaderClient = frameLoaderClient; |
| 80 if (!m_frameLoaderClient) | 80 if (!m_frameLoaderClient) |
| 81 m_frameLoaderClient = EmptyFrameLoaderClient::create(); | 81 m_frameLoaderClient = EmptyFrameLoaderClient::create(); |
| 82 | 82 |
| 83 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost(), | 83 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost(), |
| 84 nullptr, interfaceProvider); | 84 nullptr, interfaceProvider); |
| 85 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); | 85 m_frame->setView(FrameView::create(*m_frame, initialViewSize)); |
| 86 m_frame->view()->page()->frameHost().visualViewport().setSize( | 86 m_frame->view()->page()->frameHost().visualViewport().setSize( |
| 87 initialViewSize); | 87 initialViewSize); |
| 88 m_frame->init(); | 88 m_frame->init(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 DummyPageHolder::~DummyPageHolder() { | 91 DummyPageHolder::~DummyPageHolder() { |
| 92 m_page->willBeDestroyed(); | 92 m_page->willBeDestroyed(); |
| 93 m_page.clear(); | 93 m_page.clear(); |
| 94 m_frame.clear(); | 94 m_frame.clear(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 Page& DummyPageHolder::page() const { | 97 Page& DummyPageHolder::page() const { |
| 98 return *m_page; | 98 return *m_page; |
| 99 } | 99 } |
| 100 | 100 |
| 101 LocalFrame& DummyPageHolder::frame() const { | 101 LocalFrame& DummyPageHolder::frame() const { |
| 102 ASSERT(m_frame); | 102 ASSERT(m_frame); |
| 103 return *m_frame; | 103 return *m_frame; |
| 104 } | 104 } |
| 105 | 105 |
| 106 FrameView& DummyPageHolder::frameView() const { | 106 FrameView& DummyPageHolder::frameView() const { |
| 107 return *m_frame->view(); | 107 return *m_frame->view(); |
| 108 } | 108 } |
| 109 | 109 |
| 110 Document& DummyPageHolder::document() const { | 110 Document& DummyPageHolder::document() const { |
| 111 return *m_frame->domWindow()->document(); | 111 return *m_frame->domWindow()->document(); |
| 112 } | 112 } |
| 113 | 113 |
| 114 } // namespace blink | 114 } // namespace blink |
| OLD | NEW |