| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R
ights Reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R
ights Reserved. |
| 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 float deviceScaleFactor(LocalFrame* frame) | 55 float deviceScaleFactor(LocalFrame* frame) |
| 56 { | 56 { |
| 57 if (!frame) | 57 if (!frame) |
| 58 return 1; | 58 return 1; |
| 59 Page* page = frame->page(); | 59 Page* page = frame->page(); |
| 60 if (!page) | 60 if (!page) |
| 61 return 1; | 61 return 1; |
| 62 return page->deviceScaleFactor(); | 62 return page->deviceScaleFactor(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 Page::Page(PageClients& pageClients, ServiceProvider& services) | 65 Page::Page(PageClients& pageClients, ServiceProvider* services) |
| 66 : SettingsDelegate(Settings::create()) | 66 : SettingsDelegate(Settings::create()) |
| 67 , m_animator(this) | 67 , m_animator(this) |
| 68 , m_chromeClient(pageClients.chromeClient) | 68 , m_chromeClient(pageClients.chromeClient) |
| 69 , m_dragCaretController(DragCaretController::create()) | 69 , m_dragCaretController(DragCaretController::create()) |
| 70 , m_focusController(FocusController::create(this)) | 70 , m_focusController(FocusController::create(this)) |
| 71 , m_undoStack(UndoStack::create()) | 71 , m_undoStack(UndoStack::create()) |
| 72 , m_mainFrame(0) | 72 , m_mainFrame(0) |
| 73 , m_editorClient(pageClients.editorClient) | 73 , m_editorClient(pageClients.editorClient) |
| 74 , m_spellCheckerClient(pageClients.spellCheckerClient) | 74 , m_spellCheckerClient(pageClients.spellCheckerClient) |
| 75 , m_deviceScaleFactor(1) | 75 , m_deviceScaleFactor(1) |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 , editorClient(0) | 347 , editorClient(0) |
| 348 , spellCheckerClient(0) | 348 , spellCheckerClient(0) |
| 349 { | 349 { |
| 350 } | 350 } |
| 351 | 351 |
| 352 Page::PageClients::~PageClients() | 352 Page::PageClients::~PageClients() |
| 353 { | 353 { |
| 354 } | 354 } |
| 355 | 355 |
| 356 } // namespace blink | 356 } // namespace blink |
| OLD | NEW |