| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 Page::PageClients* pageClients, | 52 Page::PageClients* pageClients, |
| 53 PassOwnPtr<FrameLoaderClient> frameLoaderClient) | 53 PassOwnPtr<FrameLoaderClient> frameLoaderClient) |
| 54 { | 54 { |
| 55 if (!pageClients) { | 55 if (!pageClients) { |
| 56 fillWithEmptyClients(m_pageClients); | 56 fillWithEmptyClients(m_pageClients); |
| 57 } else { | 57 } else { |
| 58 m_pageClients.chromeClient = pageClients->chromeClient; | 58 m_pageClients.chromeClient = pageClients->chromeClient; |
| 59 m_pageClients.editorClient = pageClients->editorClient; | 59 m_pageClients.editorClient = pageClients->editorClient; |
| 60 m_pageClients.spellCheckerClient = pageClients->spellCheckerClient; | 60 m_pageClients.spellCheckerClient = pageClients->spellCheckerClient; |
| 61 } | 61 } |
| 62 m_page = adoptPtr(new Page(m_pageClients)); | 62 m_page = adoptPtr(new Page(m_pageClients, 0)); |
| 63 | 63 |
| 64 // FIXME(sky): Delete the tests that use DummyPageHolder since | 64 // FIXME(sky): Delete the tests that use DummyPageHolder since |
| 65 // they no longer work and we're not running them. | 65 // they no longer work and we're not running them. |
| 66 | 66 |
| 67 // Settings& settings = m_page->settings(); | 67 // Settings& settings = m_page->settings(); |
| 68 // FIXME: http://crbug.com/363843. This needs to find a better way to | 68 // FIXME: http://crbug.com/363843. This needs to find a better way to |
| 69 // not create graphics layers. | 69 // not create graphics layers. |
| 70 // settings.setAcceleratedCompositingEnabled(false); | 70 // settings.setAcceleratedCompositingEnabled(false); |
| 71 | 71 |
| 72 m_frameLoaderClient = frameLoaderClient; | 72 m_frameLoaderClient = frameLoaderClient; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 101 { | 101 { |
| 102 return *m_frame->view(); | 102 return *m_frame->view(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 Document& DummyPageHolder::document() const | 105 Document& DummyPageHolder::document() const |
| 106 { | 106 { |
| 107 return *m_frame->domWindow()->document(); | 107 return *m_frame->domWindow()->document(); |
| 108 } | 108 } |
| 109 | 109 |
| 110 } // namespace blink | 110 } // namespace blink |
| OLD | NEW |