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

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

Issue 1997413003: Revert of Add support for entering/exiting HTML fullscreen from OOPIFs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 } 187 }
188 } 188 }
189 } 189 }
190 190
191 void WebFrameWidgetImpl::resizeVisualViewport(const WebSize& newSize) 191 void WebFrameWidgetImpl::resizeVisualViewport(const WebSize& newSize)
192 { 192 {
193 // TODO(alexmos, kenrb): resizing behavior such as this should be changed 193 // TODO(alexmos, kenrb): resizing behavior such as this should be changed
194 // to use Page messages. https://crbug.com/599688. 194 // to use Page messages. https://crbug.com/599688.
195 page()->frameHost().visualViewport().setSize(newSize); 195 page()->frameHost().visualViewport().setSize(newSize);
196 page()->frameHost().visualViewport().clampToBoundaries(); 196 page()->frameHost().visualViewport().clampToBoundaries();
197
198 view()->didUpdateFullScreenSize();
199 } 197 }
200 198
201 void WebFrameWidgetImpl::updateMainFrameLayoutSize() 199 void WebFrameWidgetImpl::updateMainFrameLayoutSize()
202 { 200 {
203 if (!m_localRoot) 201 if (!m_localRoot)
204 return; 202 return;
205 203
206 FrameView* view = m_localRoot->frameView(); 204 FrameView* view = m_localRoot->frameView();
207 if (!view) 205 if (!view)
208 return; 206 return;
209 207
210 WebSize layoutSize = m_size; 208 WebSize layoutSize = m_size;
211 209
212 view->setLayoutSize(layoutSize); 210 view->setLayoutSize(layoutSize);
213 } 211 }
214 212
215 void WebFrameWidgetImpl::setIgnoreInputEvents(bool newValue) 213 void WebFrameWidgetImpl::setIgnoreInputEvents(bool newValue)
216 { 214 {
217 DCHECK_NE(m_ignoreInputEvents, newValue); 215 DCHECK_NE(m_ignoreInputEvents, newValue);
218 m_ignoreInputEvents = newValue; 216 m_ignoreInputEvents = newValue;
219 } 217 }
220 218
221 void WebFrameWidgetImpl::didEnterFullScreen() 219 void WebFrameWidgetImpl::didEnterFullScreen()
222 { 220 {
223 view()->didEnterFullScreen(); 221 // FIXME: Implement full screen for out-of-process iframes.
224 } 222 }
225 223
226 void WebFrameWidgetImpl::didExitFullScreen() 224 void WebFrameWidgetImpl::didExitFullScreen()
227 { 225 {
228 view()->didExitFullScreen(); 226 // FIXME: Implement full screen for out-of-process iframes.
229 } 227 }
230 228
231 void WebFrameWidgetImpl::beginFrame(double lastFrameTimeMonotonic) 229 void WebFrameWidgetImpl::beginFrame(double lastFrameTimeMonotonic)
232 { 230 {
233 TRACE_EVENT1("blink", "WebFrameWidgetImpl::beginFrame", "frameTime", lastFra meTimeMonotonic); 231 TRACE_EVENT1("blink", "WebFrameWidgetImpl::beginFrame", "frameTime", lastFra meTimeMonotonic);
234 DCHECK(lastFrameTimeMonotonic); 232 DCHECK(lastFrameTimeMonotonic);
235 PageWidgetDelegate::animate(*page(), lastFrameTimeMonotonic); 233 PageWidgetDelegate::animate(*page(), lastFrameTimeMonotonic);
236 } 234 }
237 235
238 void WebFrameWidgetImpl::updateAllLifecyclePhases() 236 void WebFrameWidgetImpl::updateAllLifecyclePhases()
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 1090
1093 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame) 1091 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame)
1094 { 1092 {
1095 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame)); 1093 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame));
1096 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); 1094 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
1097 result.setToShadowHostIfInUserAgentShadowRoot(); 1095 result.setToShadowHostIfInUserAgentShadowRoot();
1098 return result; 1096 return result;
1099 } 1097 }
1100 1098
1101 } // namespace blink 1099 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FullscreenController.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698