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

Side by Side Diff: sky/engine/core/frame/LocalFrame.h

Issue 714013002: Remove some more zoom-related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 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
« no previous file with comments | « sky/engine/core/events/MouseRelatedEvent.cpp ('k') | sky/engine/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 // ======== All public functions below this point are candidates to move out of LocalFrame into another class. ======== 104 // ======== All public functions below this point are candidates to move out of LocalFrame into another class. ========
105 105
106 void countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& t otalObjects, bool& isPartial); 106 void countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& t otalObjects, bool& isPartial);
107 107
108 // See GraphicsLayerClient.h for accepted flags. 108 // See GraphicsLayerClient.h for accepted flags.
109 String layerTreeAsText(unsigned flags = 0) const; 109 String layerTreeAsText(unsigned flags = 0) const;
110 110
111 FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, con st FloatSize& expectedSize); 111 FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, con st FloatSize& expectedSize);
112 112
113 void setPageZoomFactor(float factor);
114 float pageZoomFactor() const { return m_pageZoomFactor; }
115 void setTextZoomFactor(float factor);
116 float textZoomFactor() const { return m_textZoomFactor; }
117 void setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFacto r);
118
119 void deviceOrPageScaleFactorChanged(); 113 void deviceOrPageScaleFactorChanged();
120 double devicePixelRatio() const; 114 double devicePixelRatio() const;
121 115
122 String selectedText() const; 116 String selectedText() const;
123 String selectedTextForClipboard() const; 117 String selectedTextForClipboard() const;
124 118
125 VisiblePosition visiblePositionForPoint(const IntPoint& framePoint); 119 VisiblePosition visiblePositionForPoint(const IntPoint& framePoint);
126 Document* documentAtPoint(const IntPoint& windowPoint); 120 Document* documentAtPoint(const IntPoint& windowPoint);
127 PassRefPtr<Range> rangeForPoint(const IntPoint& framePoint); 121 PassRefPtr<Range> rangeForPoint(const IntPoint& framePoint);
128 122
(...skipping 12 matching lines...) Expand all
141 135
142 RefPtr<FrameView> m_view; 136 RefPtr<FrameView> m_view;
143 137
144 OwnPtr<ScriptController> m_script; 138 OwnPtr<ScriptController> m_script;
145 const OwnPtr<Editor> m_editor; 139 const OwnPtr<Editor> m_editor;
146 const OwnPtr<SpellChecker> m_spellChecker; 140 const OwnPtr<SpellChecker> m_spellChecker;
147 const OwnPtr<FrameSelection> m_selection; 141 const OwnPtr<FrameSelection> m_selection;
148 const OwnPtr<EventHandler> m_eventHandler; 142 const OwnPtr<EventHandler> m_eventHandler;
149 const OwnPtr<FrameConsole> m_console; 143 const OwnPtr<FrameConsole> m_console;
150 OwnPtr<InputMethodController> m_inputMethodController; 144 OwnPtr<InputMethodController> m_inputMethodController;
151
152 float m_pageZoomFactor;
153 float m_textZoomFactor;
154 }; 145 };
155 146
156 inline FrameView* LocalFrame::view() const 147 inline FrameView* LocalFrame::view() const
157 { 148 {
158 return m_view.get(); 149 return m_view.get();
159 } 150 }
160 151
161 inline ScriptController& LocalFrame::script() 152 inline ScriptController& LocalFrame::script()
162 { 153 {
163 return *m_script; 154 return *m_script;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, true, true); 188 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, true, true);
198 189
199 } // namespace blink 190 } // namespace blink
200 191
201 // During refactoring, there are some places where we need to do type conversion s that 192 // During refactoring, there are some places where we need to do type conversion s that
202 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 193 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
203 // At that time this #define will be removed and all the uses of it will need to be corrected. 194 // At that time this #define will be removed and all the uses of it will need to be corrected.
204 #define toLocalFrameTemporary toLocalFrame 195 #define toLocalFrameTemporary toLocalFrame
205 196
206 #endif // LocalFrame_h 197 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « sky/engine/core/events/MouseRelatedEvent.cpp ('k') | sky/engine/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698