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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 Page::PageClients pageClients; | 61 Page::PageClients pageClients; |
62 if (!pageClientsArgument) { | 62 if (!pageClientsArgument) { |
63 fillWithEmptyClients(pageClients); | 63 fillWithEmptyClients(pageClients); |
64 } else { | 64 } else { |
65 pageClients.chromeClient = pageClientsArgument->chromeClient; | 65 pageClients.chromeClient = pageClientsArgument->chromeClient; |
66 pageClients.contextMenuClient = pageClientsArgument->contextMenuClient; | 66 pageClients.contextMenuClient = pageClientsArgument->contextMenuClient; |
67 pageClients.editorClient = pageClientsArgument->editorClient; | 67 pageClients.editorClient = pageClientsArgument->editorClient; |
68 pageClients.dragClient = pageClientsArgument->dragClient; | 68 pageClients.dragClient = pageClientsArgument->dragClient; |
69 pageClients.spellCheckerClient = pageClientsArgument->spellCheckerClient
; | 69 pageClients.spellCheckerClient = pageClientsArgument->spellCheckerClient
; |
70 } | 70 } |
71 m_page = adoptPtrWillBeNoop(new Page(pageClients)); | 71 m_page = Page::create(pageClients); |
72 Settings& settings = m_page->settings(); | 72 Settings& settings = m_page->settings(); |
73 // FIXME: http://crbug.com/363843. This needs to find a better way to | 73 // FIXME: http://crbug.com/363843. This needs to find a better way to |
74 // not create graphics layers. | 74 // not create graphics layers. |
75 settings.setAcceleratedCompositingEnabled(false); | 75 settings.setAcceleratedCompositingEnabled(false); |
76 if (settingOverrider) | 76 if (settingOverrider) |
77 (*settingOverrider)(settings); | 77 (*settingOverrider)(settings); |
78 | 78 |
79 m_frameLoaderClient = frameLoaderClient; | 79 m_frameLoaderClient = frameLoaderClient; |
80 if (!m_frameLoaderClient) | 80 if (!m_frameLoaderClient) |
81 m_frameLoaderClient = EmptyFrameLoaderClient::create(); | 81 m_frameLoaderClient = EmptyFrameLoaderClient::create(); |
(...skipping 25 matching lines...) Expand all Loading... |
107 { | 107 { |
108 return *m_frame->view(); | 108 return *m_frame->view(); |
109 } | 109 } |
110 | 110 |
111 Document& DummyPageHolder::document() const | 111 Document& DummyPageHolder::document() const |
112 { | 112 { |
113 return *m_frame->domWindow()->document(); | 113 return *m_frame->domWindow()->document(); |
114 } | 114 } |
115 | 115 |
116 } // namespace blink | 116 } // namespace blink |
OLD | NEW |