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