Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameHost.h

Issue 2443613002: Rename classes related to top controls (Closed)
Patch Set: fix test Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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/text/AtomicString.h" 38 #include "wtf/text/AtomicString.h"
39 #include <memory> 39 #include <memory>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 class BrowserControls;
43 class ChromeClient; 44 class ChromeClient;
44 class ConsoleMessageStorage; 45 class ConsoleMessageStorage;
45 class Deprecation; 46 class Deprecation;
46 class EventHandlerRegistry; 47 class EventHandlerRegistry;
47 class OverscrollController; 48 class OverscrollController;
48 class Page; 49 class Page;
49 struct PageScaleConstraints; 50 struct PageScaleConstraints;
50 class PageScaleConstraintsSet; 51 class PageScaleConstraintsSet;
51 class Settings; 52 class Settings;
52 class TopControls;
53 class TopDocumentRootScrollerController; 53 class TopDocumentRootScrollerController;
54 class UseCounter; 54 class UseCounter;
55 class Visitor; 55 class Visitor;
56 class VisualViewport; 56 class VisualViewport;
57 57
58 // FrameHost is the set of global data shared between multiple frames 58 // FrameHost is the set of global data shared between multiple frames
59 // and is provided by the embedder to each frame when created. 59 // and is provided by the embedder to each frame when created.
60 // FrameHost currently corresponds to the Page object in core/page 60 // FrameHost currently corresponds to the Page object in core/page
61 // however the concept of a Page is moving up out of Blink. 61 // however the concept of a Page is moving up out of Blink.
62 // In an out-of-process iframe world, a single Page may have 62 // In an out-of-process iframe world, a single Page may have
(...skipping 30 matching lines...) Expand all
93 // This value does not account for Page zoom, use LocalFrame::devicePixelRatio 93 // This value does not account for Page zoom, use LocalFrame::devicePixelRatio
94 // instead. This is to be deprecated. Use this with caution. 94 // instead. This is to be deprecated. Use this with caution.
95 // 1) If you need to scale the content per device scale factor, this is still 95 // 1) If you need to scale the content per device scale factor, this is still
96 // valid. In use-zoom-for-dsf mode, this is always 1, and will be remove 96 // valid. In use-zoom-for-dsf mode, this is always 1, and will be remove
97 // when transition is complete. 97 // when transition is complete.
98 // 2) If you want to compute the device related measure (such as device pixel 98 // 2) If you want to compute the device related measure (such as device pixel
99 // height, or the scale factor for drag image), use 99 // height, or the scale factor for drag image), use
100 // ChromeClient::screenInfo() instead. 100 // ChromeClient::screenInfo() instead.
101 float deviceScaleFactorDeprecated() const; 101 float deviceScaleFactorDeprecated() const;
102 102
103 TopControls& topControls(); 103 BrowserControls& browserControls();
104 const TopControls& topControls() const; 104 const BrowserControls& browserControls() const;
105 105
106 OverscrollController& overscrollController(); 106 OverscrollController& overscrollController();
107 const OverscrollController& overscrollController() const; 107 const OverscrollController& overscrollController() const;
108 108
109 VisualViewport& visualViewport(); 109 VisualViewport& visualViewport();
110 const VisualViewport& visualViewport() const; 110 const VisualViewport& visualViewport() const;
111 111
112 PageScaleConstraintsSet& pageScaleConstraintsSet(); 112 PageScaleConstraintsSet& pageScaleConstraintsSet();
113 const PageScaleConstraintsSet& pageScaleConstraintsSet() const; 113 const PageScaleConstraintsSet& pageScaleConstraintsSet() const;
114 114
(...skipping 20 matching lines...) Expand all
135 int subframeCount() const; 135 int subframeCount() const;
136 136
137 void setDefaultPageScaleLimits(float minScale, float maxScale); 137 void setDefaultPageScaleLimits(float minScale, float maxScale);
138 void setUserAgentPageScaleConstraints( 138 void setUserAgentPageScaleConstraints(
139 const PageScaleConstraints& newConstraints); 139 const PageScaleConstraints& newConstraints);
140 140
141 private: 141 private:
142 explicit FrameHost(Page&); 142 explicit FrameHost(Page&);
143 143
144 const Member<Page> m_page; 144 const Member<Page> m_page;
145 const Member<TopControls> m_topControls; 145 const Member<BrowserControls> m_browserControls;
146 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 146 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
147 const Member<VisualViewport> m_visualViewport; 147 const Member<VisualViewport> m_visualViewport;
148 const Member<OverscrollController> m_overscrollController; 148 const Member<OverscrollController> m_overscrollController;
149 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 149 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
150 const Member<ConsoleMessageStorage> m_consoleMessageStorage; 150 const Member<ConsoleMessageStorage> m_consoleMessageStorage;
151 const Member<TopDocumentRootScrollerController> 151 const Member<TopDocumentRootScrollerController>
152 m_globalRootScrollerController; 152 m_globalRootScrollerController;
153 153
154 AtomicString m_overrideEncoding; 154 AtomicString m_overrideEncoding;
155 int m_subframeCount; 155 int m_subframeCount;
156 }; 156 };
157 157
158 } // namespace blink 158 } // namespace blink
159 159
160 #endif // FrameHost_h 160 #endif // FrameHost_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/BrowserControls.cpp ('k') | third_party/WebKit/Source/core/frame/FrameHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698