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

Side by Side Diff: Source/web/FullscreenController.h

Issue 636363003: Fix fullscreen elements in pinch viewport mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add test Created 6 years, 2 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
« no previous file with comments | « Source/core/rendering/RenderFullScreen.cpp ('k') | Source/web/FullscreenController.cpp » ('j') | 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) 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef FullscreenController_h 31 #ifndef FullscreenController_h
32 #define FullscreenController_h 32 #define FullscreenController_h
33 33
34 #include "core/rendering/RenderFullScreen.h"
34 #include "platform/geometry/FloatPoint.h" 35 #include "platform/geometry/FloatPoint.h"
35 #include "platform/geometry/IntSize.h" 36 #include "platform/geometry/IntSize.h"
36 #include "platform/heap/Handle.h" 37 #include "platform/heap/Handle.h"
37 #include "wtf/PassOwnPtr.h" 38 #include "wtf/PassOwnPtr.h"
38 #include "wtf/RefPtr.h" 39 #include "wtf/RefPtr.h"
39 40
40 namespace blink { 41 namespace blink {
41 42
42 class Element; 43 class Element;
43 class LocalFrame; 44 class LocalFrame;
44 class WebViewImpl; 45 class WebViewImpl;
45 46
46 class FullscreenController final : public NoBaseWillBeGarbageCollected<Fullscree nController> { 47 class FullscreenController final : public NoBaseWillBeGarbageCollected<Fullscree nController> {
47 public: 48 public:
48 static PassOwnPtrWillBeRawPtr<FullscreenController> create(WebViewImpl*); 49 static PassOwnPtrWillBeRawPtr<FullscreenController> create(WebViewImpl*);
49 50
50 void didEnterFullScreen(); 51 void didEnterFullScreen();
51 void didExitFullScreen(); 52 void didExitFullScreen();
52 53
53 void enterFullScreenForElement(Element*); 54 void enterFullScreenForElement(Element*);
54 void exitFullScreenForElement(Element*); 55 void exitFullScreenForElement(Element*);
55 56
56 bool isFullscreen() { return m_fullScreenFrame; } 57 bool isFullscreen() { return m_fullScreenFrame; }
57 58
59 void updateSize();
60
58 void trace(Visitor*); 61 void trace(Visitor*);
59 62
60 protected: 63 protected:
61 explicit FullscreenController(WebViewImpl*); 64 explicit FullscreenController(WebViewImpl*);
62 65
63 private: 66 private:
64 WebViewImpl* m_webViewImpl; 67 WebViewImpl* m_webViewImpl;
65 68
66 float m_exitFullscreenPageScaleFactor; 69 float m_exitFullscreenPageScaleFactor;
67 IntSize m_exitFullscreenScrollOffset; 70 IntSize m_exitFullscreenScrollOffset;
68 FloatPoint m_exitFullscreenPinchViewportOffset; 71 FloatPoint m_exitFullscreenPinchViewportOffset;
69 72
70 // If set, the WebView is transitioning to fullscreen for this element. 73 // If set, the WebView is transitioning to fullscreen for this element.
71 RefPtrWillBeMember<Element> m_provisionalFullScreenElement; 74 RefPtrWillBeMember<Element> m_provisionalFullScreenElement;
72 75
73 // If set, the WebView is in fullscreen mode for an element in this frame. 76 // If set, the WebView is in fullscreen mode for an element in this frame.
74 RefPtrWillBeMember<LocalFrame> m_fullScreenFrame; 77 RefPtrWillBeMember<LocalFrame> m_fullScreenFrame;
75 78
76 bool m_isCancelingFullScreen; 79 bool m_isCancelingFullScreen;
77 }; 80 };
78 81
79 } // namespace blink 82 } // namespace blink
80 83
81 #endif 84 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFullScreen.cpp ('k') | Source/web/FullscreenController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698