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

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

Issue 2495423004: Convert FullscreenController to use WebCallbacks (Closed)
Patch Set: just in case 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
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | no next file » | 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) 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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "web/WebViewImpl.h" 31 #include "web/WebViewImpl.h"
32 32
33 #include "core/CSSValueKeywords.h" 33 #include "core/CSSValueKeywords.h"
34 #include "core/HTMLNames.h" 34 #include "core/HTMLNames.h"
35 #include "core/clipboard/DataObject.h" 35 #include "core/clipboard/DataObject.h"
36 #include "core/dom/Document.h" 36 #include "core/dom/Document.h"
37 #include "core/dom/DocumentUserGestureToken.h" 37 #include "core/dom/DocumentUserGestureToken.h"
38 #include "core/dom/Fullscreen.h" 38 #include "core/dom/Fullscreen.h"
39 #include "core/dom/FullscreenCallbacks.h"
39 #include "core/dom/LayoutTreeBuilderTraversal.h" 40 #include "core/dom/LayoutTreeBuilderTraversal.h"
40 #include "core/dom/Text.h" 41 #include "core/dom/Text.h"
41 #include "core/editing/EditingUtilities.h" 42 #include "core/editing/EditingUtilities.h"
42 #include "core/editing/Editor.h" 43 #include "core/editing/Editor.h"
43 #include "core/editing/FrameSelection.h" 44 #include "core/editing/FrameSelection.h"
44 #include "core/editing/InputMethodController.h" 45 #include "core/editing/InputMethodController.h"
45 #include "core/editing/iterators/TextIterator.h" 46 #include "core/editing/iterators/TextIterator.h"
46 #include "core/editing/markers/DocumentMarkerController.h" 47 #include "core/editing/markers/DocumentMarkerController.h"
47 #include "core/editing/serializers/HTMLInterchange.h" 48 #include "core/editing/serializers/HTMLInterchange.h"
48 #include "core/editing/serializers/Serialization.h" 49 #include "core/editing/serializers/Serialization.h"
(...skipping 2020 matching lines...) Expand 10 before | Expand all | Expand 10 after
2069 if (!page()) 2070 if (!page())
2070 return; 2071 return;
2071 if (!page()->mainFrame()->isLocalFrame()) 2072 if (!page()->mainFrame()->isLocalFrame())
2072 return; 2073 return;
2073 FrameView* view = page()->deprecatedLocalMainFrame()->view(); 2074 FrameView* view = page()->deprecatedLocalMainFrame()->view();
2074 2075
2075 WebRect damagedRect(0, 0, m_size.width, m_size.height); 2076 WebRect damagedRect(0, 0, m_size.width, m_size.height);
2076 view->invalidateRect(damagedRect); 2077 view->invalidateRect(damagedRect);
2077 } 2078 }
2078 2079
2079 void WebViewImpl::enterFullscreen(LocalFrame& frame) { 2080 void WebViewImpl::enterFullscreen(
2080 m_fullscreenController->enterFullscreen(frame); 2081 LocalFrame& frame,
2082 std::unique_ptr<FullscreenCallbacks> callbacks) {
2083 m_fullscreenController->enterFullscreen(frame, std::move(callbacks));
2081 } 2084 }
2082 2085
2083 void WebViewImpl::exitFullscreen(LocalFrame& frame) { 2086 void WebViewImpl::exitFullscreen(LocalFrame& frame) {
2084 m_fullscreenController->exitFullscreen(frame); 2087 m_fullscreenController->exitFullscreen(frame);
2085 } 2088 }
2086 2089
2087 void WebViewImpl::fullscreenElementChanged(Element* fromElement, 2090 void WebViewImpl::fullscreenElementChanged(Element* fromElement,
2088 Element* toElement) { 2091 Element* toElement) {
2089 m_fullscreenController->fullscreenElementChanged(fromElement, toElement); 2092 m_fullscreenController->fullscreenElementChanged(fromElement, toElement);
2090 } 2093 }
(...skipping 2113 matching lines...) Expand 10 before | Expand all | Expand 10 after
4204 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4207 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4205 return nullptr; 4208 return nullptr;
4206 return focusedFrame; 4209 return focusedFrame;
4207 } 4210 }
4208 4211
4209 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4212 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4210 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4213 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4211 } 4214 }
4212 4215
4213 } // namespace blink 4216 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698