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

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

Issue 2550703002: Move pending state from FullscreenController to Fullscreen (Closed)
Patch Set: tests and documentation Created 4 years 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 2058 matching lines...) Expand 10 before | Expand all | Expand 10 after
2069 if (!page()) 2069 if (!page())
2070 return; 2070 return;
2071 if (!page()->mainFrame()->isLocalFrame()) 2071 if (!page()->mainFrame()->isLocalFrame())
2072 return; 2072 return;
2073 FrameView* view = page()->deprecatedLocalMainFrame()->view(); 2073 FrameView* view = page()->deprecatedLocalMainFrame()->view();
2074 2074
2075 WebRect damagedRect(0, 0, m_size.width, m_size.height); 2075 WebRect damagedRect(0, 0, m_size.width, m_size.height);
2076 view->invalidateRect(damagedRect); 2076 view->invalidateRect(damagedRect);
2077 } 2077 }
2078 2078
2079 void WebViewImpl::enterFullscreenForElement(Element* element) { 2079 void WebViewImpl::enterFullscreen(LocalFrame& frame) {
2080 m_fullscreenController->enterFullscreenForElement(element); 2080 m_fullscreenController->enterFullscreen(frame);
2081 } 2081 }
2082 2082
2083 void WebViewImpl::exitFullscreen(LocalFrame* frame) { 2083 void WebViewImpl::exitFullscreen(LocalFrame& frame) {
2084 m_fullscreenController->exitFullscreen(frame); 2084 m_fullscreenController->exitFullscreen(frame);
2085 } 2085 }
2086 2086
2087 void WebViewImpl::fullscreenElementChanged(Element* fromElement, 2087 void WebViewImpl::fullscreenElementChanged(Element* fromElement,
2088 Element* toElement) { 2088 Element* toElement) {
2089 m_fullscreenController->fullscreenElementChanged(fromElement, toElement); 2089 m_fullscreenController->fullscreenElementChanged(fromElement, toElement);
2090 } 2090 }
2091 2091
2092 bool WebViewImpl::hasHorizontalScrollbar() { 2092 bool WebViewImpl::hasHorizontalScrollbar() {
2093 return mainFrameImpl() 2093 return mainFrameImpl()
(...skipping 2110 matching lines...) Expand 10 before | Expand all | Expand 10 after
4204 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4204 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4205 return nullptr; 4205 return nullptr;
4206 return focusedFrame; 4206 return focusedFrame;
4207 } 4207 }
4208 4208
4209 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4209 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4210 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4210 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4211 } 4211 }
4212 4212
4213 } // namespace blink 4213 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698