| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 } else { | 69 } else { |
| 70 m_pageClients.chromeClient = pageClients->chromeClient; | 70 m_pageClients.chromeClient = pageClients->chromeClient; |
| 71 m_pageClients.editorClient = pageClients->editorClient; | 71 m_pageClients.editorClient = pageClients->editorClient; |
| 72 m_pageClients.spellCheckerClient = pageClients->spellCheckerClient; | 72 m_pageClients.spellCheckerClient = pageClients->spellCheckerClient; |
| 73 } | 73 } |
| 74 m_page = adoptPtr(new Page(m_pageClients, serviceProvider)); | 74 m_page = adoptPtr(new Page(m_pageClients, serviceProvider)); |
| 75 | 75 |
| 76 // FIXME(sky): Delete the tests that use DummyPageHolder since | 76 // FIXME(sky): Delete the tests that use DummyPageHolder since |
| 77 // they no longer work and we're not running them. | 77 // they no longer work and we're not running them. |
| 78 | 78 |
| 79 // Settings& settings = m_page->settings(); | |
| 80 // FIXME: http://crbug.com/363843. This needs to find a better way to | |
| 81 // not create graphics layers. | |
| 82 // settings.setAcceleratedCompositingEnabled(false); | |
| 83 | |
| 84 m_frameLoaderClient = frameLoaderClient; | 79 m_frameLoaderClient = frameLoaderClient; |
| 85 if (!m_frameLoaderClient) | 80 if (!m_frameLoaderClient) |
| 86 m_frameLoaderClient = adoptPtr(new EmptyFrameLoaderClient); | 81 m_frameLoaderClient = adoptPtr(new EmptyFrameLoaderClient); |
| 87 | 82 |
| 88 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost()
); | 83 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost()
); |
| 89 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); | 84 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); |
| 90 } | 85 } |
| 91 | 86 |
| 92 DummyPageHolder::~DummyPageHolder() | 87 DummyPageHolder::~DummyPageHolder() |
| 93 { | 88 { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 113 { | 108 { |
| 114 return *m_frame->view(); | 109 return *m_frame->view(); |
| 115 } | 110 } |
| 116 | 111 |
| 117 Document& DummyPageHolder::document() const | 112 Document& DummyPageHolder::document() const |
| 118 { | 113 { |
| 119 return *m_frame->domWindow()->document(); | 114 return *m_frame->domWindow()->document(); |
| 120 } | 115 } |
| 121 | 116 |
| 122 } // namespace blink | 117 } // namespace blink |
| OLD | NEW |