| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 // FIXME: http://crbug.com/363843. This needs to find a better way to | 74 // FIXME: http://crbug.com/363843. This needs to find a better way to |
| 75 // not create graphics layers. | 75 // not create graphics layers. |
| 76 settings.setAcceleratedCompositingEnabled(false); | 76 settings.setAcceleratedCompositingEnabled(false); |
| 77 if (settingOverrider) | 77 if (settingOverrider) |
| 78 (*settingOverrider)(settings); | 78 (*settingOverrider)(settings); |
| 79 | 79 |
| 80 m_frameLoaderClient = frameLoaderClient; | 80 m_frameLoaderClient = frameLoaderClient; |
| 81 if (!m_frameLoaderClient) | 81 if (!m_frameLoaderClient) |
| 82 m_frameLoaderClient = EmptyFrameLoaderClient::create(); | 82 m_frameLoaderClient = EmptyFrameLoaderClient::create(); |
| 83 | 83 |
| 84 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost()
, 0); | 84 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost()
, 0, nullptr); |
| 85 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); | 85 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); |
| 86 m_frame->view()->page()->frameHost().visualViewport().setSize(initialViewSiz
e); | 86 m_frame->view()->page()->frameHost().visualViewport().setSize(initialViewSiz
e); |
| 87 m_frame->init(); | 87 m_frame->init(); |
| 88 } | 88 } |
| 89 | 89 |
| 90 DummyPageHolder::~DummyPageHolder() | 90 DummyPageHolder::~DummyPageHolder() |
| 91 { | 91 { |
| 92 m_page->willBeDestroyed(); | 92 m_page->willBeDestroyed(); |
| 93 m_page.clear(); | 93 m_page.clear(); |
| 94 m_frame.clear(); | 94 m_frame.clear(); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 109 { | 109 { |
| 110 return *m_frame->view(); | 110 return *m_frame->view(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 Document& DummyPageHolder::document() const | 113 Document& DummyPageHolder::document() const |
| 114 { | 114 { |
| 115 return *m_frame->domWindow()->document(); | 115 return *m_frame->domWindow()->document(); |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace blink | 118 } // namespace blink |
| OLD | NEW |