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

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

Issue 2495423004: Convert FullscreenController to use WebCallbacks (Closed)
Patch Set: rebase 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 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after
2066 if (!page()) 2066 if (!page())
2067 return; 2067 return;
2068 if (!page()->mainFrame()->isLocalFrame()) 2068 if (!page()->mainFrame()->isLocalFrame())
2069 return; 2069 return;
2070 FrameView* view = page()->deprecatedLocalMainFrame()->view(); 2070 FrameView* view = page()->deprecatedLocalMainFrame()->view();
2071 2071
2072 WebRect damagedRect(0, 0, m_size.width, m_size.height); 2072 WebRect damagedRect(0, 0, m_size.width, m_size.height);
2073 view->invalidateRect(damagedRect); 2073 view->invalidateRect(damagedRect);
2074 } 2074 }
2075 2075
2076 void WebViewImpl::enterFullscreenForElement(Element* element) { 2076 void WebViewImpl::enterFullscreen(
2077 m_fullscreenController->enterFullscreenForElement(element); 2077 LocalFrame& frame,
2078 std::unique_ptr<WebFullscreenCallbacks> callbacks) {
2079 m_fullscreenController->enterFullscreen(frame, std::move(callbacks));
2078 } 2080 }
2079 2081
2080 void WebViewImpl::exitFullscreen(LocalFrame* frame) { 2082 void WebViewImpl::exitFullscreen(LocalFrame& frame) {
2081 m_fullscreenController->exitFullscreen(frame); 2083 m_fullscreenController->exitFullscreen(frame);
2082 } 2084 }
2083 2085
2084 void WebViewImpl::fullscreenElementChanged(Element* fromElement, 2086 void WebViewImpl::fullscreenElementChanged(Element* fromElement,
2085 Element* toElement) { 2087 Element* toElement) {
2086 m_fullscreenController->fullscreenElementChanged(fromElement, toElement); 2088 m_fullscreenController->fullscreenElementChanged(fromElement, toElement);
2087 } 2089 }
2088 2090
2089 bool WebViewImpl::hasHorizontalScrollbar() { 2091 bool WebViewImpl::hasHorizontalScrollbar() {
2090 return mainFrameImpl() 2092 return mainFrameImpl()
(...skipping 2110 matching lines...) Expand 10 before | Expand all | Expand 10 after
4201 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4203 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4202 return nullptr; 4204 return nullptr;
4203 return focusedFrame; 4205 return focusedFrame;
4204 } 4206 }
4205 4207
4206 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4208 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4207 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4209 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4208 } 4210 }
4209 4211
4210 } // namespace blink 4212 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698