| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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.contextMenuClient = pageClients->contextMenuClient; | 59 m_pageClients.contextMenuClient = pageClients->contextMenuClient; |
| 60 m_pageClients.editorClient = pageClients->editorClient; | 60 m_pageClients.editorClient = pageClients->editorClient; |
| 61 m_pageClients.dragClient = pageClients->dragClient; | 61 m_pageClients.dragClient = pageClients->dragClient; |
| 62 m_pageClients.inspectorClient = pageClients->inspectorClient; | 62 m_pageClients.inspectorClient = pageClients->inspectorClient; |
| 63 m_pageClients.backForwardClient = pageClients->backForwardClient; | |
| 64 m_pageClients.spellCheckerClient = pageClients->spellCheckerClient; | 63 m_pageClients.spellCheckerClient = pageClients->spellCheckerClient; |
| 65 m_pageClients.storageClient = pageClients->storageClient; | 64 m_pageClients.storageClient = pageClients->storageClient; |
| 66 } | 65 } |
| 67 m_page = adoptPtrWillBeNoop(new Page(m_pageClients)); | 66 m_page = adoptPtrWillBeNoop(new Page(m_pageClients)); |
| 68 Settings& settings = m_page->settings(); | 67 Settings& settings = m_page->settings(); |
| 69 // 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 |
| 70 // not create graphics layers. | 69 // not create graphics layers. |
| 71 settings.setAcceleratedCompositingEnabled(false); | 70 settings.setAcceleratedCompositingEnabled(false); |
| 72 | 71 |
| 73 m_frameLoaderClient = frameLoaderClient; | 72 m_frameLoaderClient = frameLoaderClient; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 104 { | 103 { |
| 105 return *m_frame->view(); | 104 return *m_frame->view(); |
| 106 } | 105 } |
| 107 | 106 |
| 108 Document& DummyPageHolder::document() const | 107 Document& DummyPageHolder::document() const |
| 109 { | 108 { |
| 110 return *m_frame->domWindow()->document(); | 109 return *m_frame->domWindow()->document(); |
| 111 } | 110 } |
| 112 | 111 |
| 113 } // namespace blink | 112 } // namespace blink |
| OLD | NEW |