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 23 matching lines...) Expand all Loading... |
34 #include "core/frame/PinchViewport.h" | 34 #include "core/frame/PinchViewport.h" |
35 #include "platform/heap/Handle.h" | 35 #include "platform/heap/Handle.h" |
36 #include "wtf/FastAllocBase.h" | 36 #include "wtf/FastAllocBase.h" |
37 #include "wtf/Noncopyable.h" | 37 #include "wtf/Noncopyable.h" |
38 #include "wtf/OwnPtr.h" | 38 #include "wtf/OwnPtr.h" |
39 #include "wtf/PassOwnPtr.h" | 39 #include "wtf/PassOwnPtr.h" |
40 | 40 |
41 namespace blink { | 41 namespace blink { |
42 | 42 |
43 class Chrome; | 43 class Chrome; |
| 44 class ConsoleMessageStorage; |
44 class EventHandlerRegistry; | 45 class EventHandlerRegistry; |
45 class Page; | 46 class Page; |
46 class PinchViewport; | 47 class PinchViewport; |
47 class Settings; | 48 class Settings; |
48 class UseCounter; | 49 class UseCounter; |
49 class Visitor; | 50 class Visitor; |
50 | 51 |
51 // FrameHost is the set of global data shared between multiple frames | 52 // FrameHost is the set of global data shared between multiple frames |
52 // and is provided by the embedder to each frame when created. | 53 // and is provided by the embedder to each frame when created. |
53 // FrameHost currently corresponds to the Page object in core/page | 54 // FrameHost currently corresponds to the Page object in core/page |
(...skipping 19 matching lines...) Expand all Loading... |
73 // being displayed. In multi-monitor setups this can vary between pages. | 74 // being displayed. In multi-monitor setups this can vary between pages. |
74 // This value does not account for Page zoom, use LocalFrame::devicePixelRat
io instead. | 75 // This value does not account for Page zoom, use LocalFrame::devicePixelRat
io instead. |
75 float deviceScaleFactor() const; | 76 float deviceScaleFactor() const; |
76 | 77 |
77 PinchViewport& pinchViewport() const; | 78 PinchViewport& pinchViewport() const; |
78 EventHandlerRegistry& eventHandlerRegistry() const; | 79 EventHandlerRegistry& eventHandlerRegistry() const; |
79 | 80 |
80 const AtomicString& overrideEncoding() const { return m_overrideEncoding; } | 81 const AtomicString& overrideEncoding() const { return m_overrideEncoding; } |
81 void setOverrideEncoding(const AtomicString& encoding) { m_overrideEncoding
= encoding; } | 82 void setOverrideEncoding(const AtomicString& encoding) { m_overrideEncoding
= encoding; } |
82 | 83 |
| 84 ConsoleMessageStorage& consoleMessageStorage() const; |
| 85 |
83 void trace(Visitor*); | 86 void trace(Visitor*); |
84 | 87 |
85 private: | 88 private: |
86 explicit FrameHost(Page&); | 89 explicit FrameHost(Page&); |
87 | 90 |
88 RawPtrWillBeMember<Page> m_page; | 91 RawPtrWillBeMember<Page> m_page; |
89 const OwnPtrWillBeMember<PinchViewport> m_pinchViewport; | 92 const OwnPtrWillBeMember<PinchViewport> m_pinchViewport; |
90 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry; | 93 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry; |
| 94 const OwnPtrWillBeMember<ConsoleMessageStorage> m_consoleMessageStorage; |
91 | 95 |
92 AtomicString m_overrideEncoding; | 96 AtomicString m_overrideEncoding; |
93 }; | 97 }; |
94 | 98 |
95 } | 99 } |
96 | 100 |
97 #endif // FrameHost_h | 101 #endif // FrameHost_h |
OLD | NEW |