| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 // FIXME: http://crbug.com/363843. This needs to find a better way to | 73 // FIXME: http://crbug.com/363843. This needs to find a better way to |
| 74 // not create graphics layers. | 74 // not create graphics layers. |
| 75 settings.setAcceleratedCompositingEnabled(false); | 75 settings.setAcceleratedCompositingEnabled(false); |
| 76 if (settingOverrider) | 76 if (settingOverrider) |
| 77 (*settingOverrider)(settings); | 77 (*settingOverrider)(settings); |
| 78 | 78 |
| 79 m_localFrameClient = localFrameClient; | 79 m_localFrameClient = localFrameClient; |
| 80 if (!m_localFrameClient) | 80 if (!m_localFrameClient) |
| 81 m_localFrameClient = EmptyLocalFrameClient::create(); | 81 m_localFrameClient = EmptyLocalFrameClient::create(); |
| 82 | 82 |
| 83 m_frame = LocalFrame::create(m_localFrameClient.get(), m_page, nullptr, | 83 m_frame = LocalFrame::create(m_localFrameClient.get(), *m_page, nullptr, |
| 84 interfaceProvider); | 84 interfaceProvider); |
| 85 m_frame->setView(FrameView::create(*m_frame, initialViewSize)); | 85 m_frame->setView(FrameView::create(*m_frame, initialViewSize)); |
| 86 m_frame->view()->page()->visualViewport().setSize(initialViewSize); | 86 m_frame->view()->page()->visualViewport().setSize(initialViewSize); |
| 87 m_frame->init(); | 87 m_frame->init(); |
| 88 } | 88 } |
| 89 | 89 |
| 90 DummyPageHolder::~DummyPageHolder() { | 90 DummyPageHolder::~DummyPageHolder() { |
| 91 m_page->willBeDestroyed(); | 91 m_page->willBeDestroyed(); |
| 92 m_page.clear(); | 92 m_page.clear(); |
| 93 m_frame.clear(); | 93 m_frame.clear(); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 104 | 104 |
| 105 FrameView& DummyPageHolder::frameView() const { | 105 FrameView& DummyPageHolder::frameView() const { |
| 106 return *m_frame->view(); | 106 return *m_frame->view(); |
| 107 } | 107 } |
| 108 | 108 |
| 109 Document& DummyPageHolder::document() const { | 109 Document& DummyPageHolder::document() const { |
| 110 return *m_frame->domWindow()->document(); | 110 return *m_frame->domWindow()->document(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // namespace blink | 113 } // namespace blink |
| OLD | NEW |