| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 #include "sky/engine/core/editing/InputMethodController.h" | 37 #include "sky/engine/core/editing/InputMethodController.h" |
| 38 #include "sky/engine/core/editing/SpellChecker.h" | 38 #include "sky/engine/core/editing/SpellChecker.h" |
| 39 #include "sky/engine/core/editing/htmlediting.h" | 39 #include "sky/engine/core/editing/htmlediting.h" |
| 40 #include "sky/engine/core/events/Event.h" | 40 #include "sky/engine/core/events/Event.h" |
| 41 #include "sky/engine/core/fetch/ResourceFetcher.h" | 41 #include "sky/engine/core/fetch/ResourceFetcher.h" |
| 42 #include "sky/engine/core/frame/FrameConsole.h" | 42 #include "sky/engine/core/frame/FrameConsole.h" |
| 43 #include "sky/engine/core/frame/FrameDestructionObserver.h" | 43 #include "sky/engine/core/frame/FrameDestructionObserver.h" |
| 44 #include "sky/engine/core/frame/FrameHost.h" | 44 #include "sky/engine/core/frame/FrameHost.h" |
| 45 #include "sky/engine/core/frame/FrameView.h" | 45 #include "sky/engine/core/frame/FrameView.h" |
| 46 #include "sky/engine/core/frame/LocalDOMWindow.h" | 46 #include "sky/engine/core/frame/LocalDOMWindow.h" |
| 47 #include "sky/engine/core/frame/NewEventHandler.h" |
| 47 #include "sky/engine/core/frame/Settings.h" | 48 #include "sky/engine/core/frame/Settings.h" |
| 48 #include "sky/engine/core/inspector/ConsoleMessageStorage.h" | 49 #include "sky/engine/core/inspector/ConsoleMessageStorage.h" |
| 49 #include "sky/engine/core/loader/FrameLoaderClient.h" | 50 #include "sky/engine/core/loader/FrameLoaderClient.h" |
| 50 #include "sky/engine/core/loader/MojoLoader.h" | 51 #include "sky/engine/core/loader/MojoLoader.h" |
| 51 #include "sky/engine/core/page/Chrome.h" | 52 #include "sky/engine/core/page/Chrome.h" |
| 52 #include "sky/engine/core/page/EventHandler.h" | 53 #include "sky/engine/core/page/EventHandler.h" |
| 53 #include "sky/engine/core/page/FocusController.h" | 54 #include "sky/engine/core/page/FocusController.h" |
| 54 #include "sky/engine/core/page/Page.h" | 55 #include "sky/engine/core/page/Page.h" |
| 55 #include "sky/engine/core/rendering/HitTestResult.h" | 56 #include "sky/engine/core/rendering/HitTestResult.h" |
| 56 #include "sky/engine/core/rendering/RenderLayer.h" | 57 #include "sky/engine/core/rendering/RenderLayer.h" |
| 57 #include "sky/engine/core/rendering/RenderView.h" | 58 #include "sky/engine/core/rendering/RenderView.h" |
| 58 #include "sky/engine/platform/graphics/GraphicsContext.h" | 59 #include "sky/engine/platform/graphics/GraphicsContext.h" |
| 59 #include "sky/engine/platform/graphics/ImageBuffer.h" | 60 #include "sky/engine/platform/graphics/ImageBuffer.h" |
| 60 #include "sky/engine/platform/text/TextStream.h" | 61 #include "sky/engine/platform/text/TextStream.h" |
| 61 #include "sky/engine/wtf/PassOwnPtr.h" | 62 #include "sky/engine/wtf/PassOwnPtr.h" |
| 62 #include "sky/engine/wtf/StdLibExtras.h" | 63 #include "sky/engine/wtf/StdLibExtras.h" |
| 63 | 64 |
| 64 namespace blink { | 65 namespace blink { |
| 65 | 66 |
| 66 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host) | 67 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host) |
| 67 : Frame(client, host) | 68 : Frame(client, host) |
| 68 , m_deprecatedLoader(this) | 69 , m_deprecatedLoader(this) |
| 69 , m_mojoLoader(adoptPtr(new MojoLoader(*this))) | 70 , m_mojoLoader(adoptPtr(new MojoLoader(*this))) |
| 70 , m_script(adoptPtr(new ScriptController(this))) | 71 , m_script(adoptPtr(new ScriptController(this))) |
| 71 , m_editor(Editor::create(*this)) | 72 , m_editor(Editor::create(*this)) |
| 72 , m_spellChecker(SpellChecker::create(*this)) | 73 , m_spellChecker(SpellChecker::create(*this)) |
| 73 , m_selection(FrameSelection::create(this)) | 74 , m_selection(FrameSelection::create(this)) |
| 74 , m_eventHandler(adoptPtr(new EventHandler(this))) | 75 , m_eventHandler(adoptPtr(new EventHandler(this))) |
| 76 , m_newEventHandler(adoptPtr(new NewEventHandler(*this))) |
| 75 , m_console(FrameConsole::create(*this)) | 77 , m_console(FrameConsole::create(*this)) |
| 76 , m_inputMethodController(InputMethodController::create(*this)) | 78 , m_inputMethodController(InputMethodController::create(*this)) |
| 77 { | 79 { |
| 78 page()->setMainFrame(this); | 80 page()->setMainFrame(this); |
| 79 } | 81 } |
| 80 | 82 |
| 81 PassRefPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost*
host) | 83 PassRefPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost*
host) |
| 82 { | 84 { |
| 83 return adoptRef(new LocalFrame(client, host)); | 85 return adoptRef(new LocalFrame(client, host)); |
| 84 } | 86 } |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 } | 315 } |
| 314 | 316 |
| 315 double LocalFrame::devicePixelRatio() const | 317 double LocalFrame::devicePixelRatio() const |
| 316 { | 318 { |
| 317 if (!m_host) | 319 if (!m_host) |
| 318 return 0; | 320 return 0; |
| 319 return m_host->deviceScaleFactor(); | 321 return m_host->deviceScaleFactor(); |
| 320 } | 322 } |
| 321 | 323 |
| 322 } // namespace blink | 324 } // namespace blink |
| OLD | NEW |