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

Side by Side Diff: third_party/WebKit/Source/web/FullscreenController.cpp

Issue 1447273003: Make the FloatSize constructor from an IntSize explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 LayoutFullScreen* layoutObject = Fullscreen::from(*m_fullScreenFrame->docume nt()).fullScreenLayoutObject(); 181 LayoutFullScreen* layoutObject = Fullscreen::from(*m_fullScreenFrame->docume nt()).fullScreenLayoutObject();
182 if (layoutObject) 182 if (layoutObject)
183 layoutObject->updateStyle(); 183 layoutObject->updateStyle();
184 } 184 }
185 185
186 void FullscreenController::updatePageScaleConstraints(bool removeConstraints) 186 void FullscreenController::updatePageScaleConstraints(bool removeConstraints)
187 { 187 {
188 PageScaleConstraints fullscreenConstraints; 188 PageScaleConstraints fullscreenConstraints;
189 if (!removeConstraints) { 189 if (!removeConstraints) {
190 fullscreenConstraints = PageScaleConstraints(1.0, 1.0, 1.0); 190 fullscreenConstraints = PageScaleConstraints(1.0, 1.0, 1.0);
191 fullscreenConstraints.layoutSize = IntSize(m_webViewImpl->size()); 191 fullscreenConstraints.layoutSize = FloatSize(m_webViewImpl->size());
192 } 192 }
193 m_webViewImpl->pageScaleConstraintsSet().setFullscreenConstraints(fullscreen Constraints); 193 m_webViewImpl->pageScaleConstraintsSet().setFullscreenConstraints(fullscreen Constraints);
194 m_webViewImpl->pageScaleConstraintsSet().computeFinalConstraints(); 194 m_webViewImpl->pageScaleConstraintsSet().computeFinalConstraints();
195 m_webViewImpl->updateMainFrameLayoutSize(); 195 m_webViewImpl->updateMainFrameLayoutSize();
196 } 196 }
197 197
198 DEFINE_TRACE(FullscreenController) 198 DEFINE_TRACE(FullscreenController)
199 { 199 {
200 visitor->trace(m_provisionalFullScreenElement); 200 visitor->trace(m_provisionalFullScreenElement);
201 visitor->trace(m_fullScreenFrame); 201 visitor->trace(m_fullScreenFrame);
202 } 202 }
203 203
204 } // namespace blink 204 } // namespace blink
205 205
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698