| 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 22 matching lines...) Expand all Loading... |
| 33 #include "core/frame/EventHandlerRegistry.h" | 33 #include "core/frame/EventHandlerRegistry.h" |
| 34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
| 35 #include "core/frame/TopControls.h" | 35 #include "core/frame/TopControls.h" |
| 36 #include "core/inspector/ConsoleMessageStorage.h" | 36 #include "core/inspector/ConsoleMessageStorage.h" |
| 37 #include "core/page/Page.h" | 37 #include "core/page/Page.h" |
| 38 #include "public/platform/Platform.h" | 38 #include "public/platform/Platform.h" |
| 39 #include "public/platform/WebScheduler.h" | 39 #include "public/platform/WebScheduler.h" |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 PassOwnPtrWillBeRawPtr<FrameHost> FrameHost::create(Page& page) | 43 RawPtr<FrameHost> FrameHost::create(Page& page) |
| 44 { | 44 { |
| 45 return adoptPtrWillBeNoop(new FrameHost(page)); | 45 return new FrameHost(page); |
| 46 } | 46 } |
| 47 | 47 |
| 48 FrameHost::FrameHost(Page& page) | 48 FrameHost::FrameHost(Page& page) |
| 49 : m_page(&page) | 49 : m_page(&page) |
| 50 , m_topControls(TopControls::create(*this)) | 50 , m_topControls(TopControls::create(*this)) |
| 51 , m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()) | 51 , m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()) |
| 52 , m_visualViewport(VisualViewport::create(*this)) | 52 , m_visualViewport(VisualViewport::create(*this)) |
| 53 , m_eventHandlerRegistry(adoptPtrWillBeNoop(new EventHandlerRegistry(*this))
) | 53 , m_eventHandlerRegistry(new EventHandlerRegistry(*this)) |
| 54 , m_consoleMessageStorage(ConsoleMessageStorage::create()) | 54 , m_consoleMessageStorage(ConsoleMessageStorage::create()) |
| 55 , m_subframeCount(0) | 55 , m_subframeCount(0) |
| 56 { | 56 { |
| 57 } | 57 } |
| 58 | 58 |
| 59 // Explicitly in the .cpp to avoid default constructor in .h | 59 // Explicitly in the .cpp to avoid default constructor in .h |
| 60 FrameHost::~FrameHost() | 60 FrameHost::~FrameHost() |
| 61 { | 61 { |
| 62 } | 62 } |
| 63 | 63 |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 177 |
| 178 FrameView* rootView = page().deprecatedLocalMainFrame()->view(); | 178 FrameView* rootView = page().deprecatedLocalMainFrame()->view(); |
| 179 | 179 |
| 180 if (!rootView) | 180 if (!rootView) |
| 181 return; | 181 return; |
| 182 | 182 |
| 183 rootView->setNeedsLayout(); | 183 rootView->setNeedsLayout(); |
| 184 } | 184 } |
| 185 | 185 |
| 186 } // namespace blink | 186 } // namespace blink |
| OLD | NEW |