| 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 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef FrameHost_h | 31 #ifndef FrameHost_h |
| 32 #define FrameHost_h | 32 #define FrameHost_h |
| 33 | 33 |
| 34 #include "core/CoreExport.h" | 34 #include "core/CoreExport.h" |
| 35 #include "platform/heap/Handle.h" | 35 #include "platform/heap/Handle.h" |
| 36 #include "wtf/Allocator.h" | 36 #include "wtf/Allocator.h" |
| 37 #include "wtf/Noncopyable.h" | 37 #include "wtf/Noncopyable.h" |
| 38 #include "wtf/OwnPtr.h" | |
| 39 #include "wtf/PassOwnPtr.h" | |
| 40 #include "wtf/text/AtomicString.h" | 38 #include "wtf/text/AtomicString.h" |
| 39 #include <memory> |
| 41 | 40 |
| 42 namespace blink { | 41 namespace blink { |
| 43 | 42 |
| 44 class ChromeClient; | 43 class ChromeClient; |
| 45 class ConsoleMessageStorage; | 44 class ConsoleMessageStorage; |
| 46 class CustomElementReactionStack; | 45 class CustomElementReactionStack; |
| 47 class Deprecation; | 46 class Deprecation; |
| 48 class EventHandlerRegistry; | 47 class EventHandlerRegistry; |
| 49 class OverscrollController; | 48 class OverscrollController; |
| 50 class Page; | 49 class Page; |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 int subframeCount() const; | 132 int subframeCount() const; |
| 134 | 133 |
| 135 void setDefaultPageScaleLimits(float minScale, float maxScale); | 134 void setDefaultPageScaleLimits(float minScale, float maxScale); |
| 136 void setUserAgentPageScaleConstraints(const PageScaleConstraints& newConstra
ints); | 135 void setUserAgentPageScaleConstraints(const PageScaleConstraints& newConstra
ints); |
| 137 | 136 |
| 138 private: | 137 private: |
| 139 explicit FrameHost(Page&); | 138 explicit FrameHost(Page&); |
| 140 | 139 |
| 141 const Member<Page> m_page; | 140 const Member<Page> m_page; |
| 142 const Member<TopControls> m_topControls; | 141 const Member<TopControls> m_topControls; |
| 143 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; | 142 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; |
| 144 const Member<VisualViewport> m_visualViewport; | 143 const Member<VisualViewport> m_visualViewport; |
| 145 const Member<OverscrollController> m_overscrollController; | 144 const Member<OverscrollController> m_overscrollController; |
| 146 const Member<EventHandlerRegistry> m_eventHandlerRegistry; | 145 const Member<EventHandlerRegistry> m_eventHandlerRegistry; |
| 147 const Member<ConsoleMessageStorage> m_consoleMessageStorage; | 146 const Member<ConsoleMessageStorage> m_consoleMessageStorage; |
| 148 const Member<CustomElementReactionStack> m_customElementReactionStack; | 147 const Member<CustomElementReactionStack> m_customElementReactionStack; |
| 149 | 148 |
| 150 AtomicString m_overrideEncoding; | 149 AtomicString m_overrideEncoding; |
| 151 int m_subframeCount; | 150 int m_subframeCount; |
| 152 }; | 151 }; |
| 153 | 152 |
| 154 } // namespace blink | 153 } // namespace blink |
| 155 | 154 |
| 156 #endif // FrameHost_h | 155 #endif // FrameHost_h |
| OLD | NEW |