| 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 20 matching lines...) Expand all Loading... |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/frame/FrameHost.h" | 32 #include "core/frame/FrameHost.h" |
| 33 | 33 |
| 34 #include "core/frame/EventHandlerRegistry.h" | 34 #include "core/frame/EventHandlerRegistry.h" |
| 35 #include "core/page/Chrome.h" | 35 #include "core/page/Chrome.h" |
| 36 #include "core/page/ChromeClient.h" | 36 #include "core/page/ChromeClient.h" |
| 37 #include "core/page/Page.h" | 37 #include "core/page/Page.h" |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 PassOwnPtr<FrameHost> FrameHost::create(Page& page) | 41 PassOwnPtr<FrameHost> FrameHost::create(Page& page, ServiceProvider* services) |
| 42 { | 42 { |
| 43 return adoptPtr(new FrameHost(page)); | 43 return adoptPtr(new FrameHost(page, services)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 FrameHost::FrameHost(Page& page) | 46 FrameHost::FrameHost(Page& page, ServiceProvider* services) |
| 47 : m_page(&page) | 47 : m_page(&page) |
| 48 , m_services(services) |
| 48 , m_eventHandlerRegistry(adoptPtr(new EventHandlerRegistry(*this))) | 49 , m_eventHandlerRegistry(adoptPtr(new EventHandlerRegistry(*this))) |
| 49 { | 50 { |
| 50 } | 51 } |
| 51 | 52 |
| 52 // Explicitly in the .cpp to avoid default constructor in .h | 53 // Explicitly in the .cpp to avoid default constructor in .h |
| 53 FrameHost::~FrameHost() | 54 FrameHost::~FrameHost() |
| 54 { | 55 { |
| 55 } | 56 } |
| 56 | 57 |
| 57 Settings& FrameHost::settings() const | 58 Settings& FrameHost::settings() const |
| (...skipping 21 matching lines...) Expand all Loading... |
| 79 return *m_eventHandlerRegistry; | 80 return *m_eventHandlerRegistry; |
| 80 } | 81 } |
| 81 | 82 |
| 82 void FrameHost::trace(Visitor* visitor) | 83 void FrameHost::trace(Visitor* visitor) |
| 83 { | 84 { |
| 84 visitor->trace(m_page); | 85 visitor->trace(m_page); |
| 85 visitor->trace(m_eventHandlerRegistry); | 86 visitor->trace(m_eventHandlerRegistry); |
| 86 } | 87 } |
| 87 | 88 |
| 88 } | 89 } |
| OLD | NEW |