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

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

Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed layout test breakage Created 6 years, 8 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/platform/geometry/FloatPoint.h ('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 "platform/geometry/FloatPoint.h"
34 #include "platform/geometry/IntSize.h" 35 #include "platform/geometry/IntSize.h"
35 #include "wtf/PassOwnPtr.h" 36 #include "wtf/PassOwnPtr.h"
36 #include "wtf/RefPtr.h" 37 #include "wtf/RefPtr.h"
37 38
38 namespace WebCore { 39 namespace WebCore {
39 class Element; 40 class Element;
40 class LocalFrame; 41 class LocalFrame;
41 } 42 }
42 43
43 namespace blink { 44 namespace blink {
(...skipping 12 matching lines...) Expand all
56 void exitFullScreenForElement(WebCore::Element*); 57 void exitFullScreenForElement(WebCore::Element*);
57 58
58 protected: 59 protected:
59 explicit FullscreenController(WebViewImpl*); 60 explicit FullscreenController(WebViewImpl*);
60 61
61 private: 62 private:
62 WebViewImpl* m_webViewImpl; 63 WebViewImpl* m_webViewImpl;
63 64
64 float m_exitFullscreenPageScaleFactor; 65 float m_exitFullscreenPageScaleFactor;
65 WebCore::IntSize m_exitFullscreenScrollOffset; 66 WebCore::IntSize m_exitFullscreenScrollOffset;
67 WebCore::FloatPoint m_exitFullscreenPinchViewportOffset;
66 68
67 // If set, the WebView is transitioning to fullscreen for this element. 69 // If set, the WebView is transitioning to fullscreen for this element.
68 RefPtr<WebCore::Element> m_provisionalFullScreenElement; 70 RefPtr<WebCore::Element> m_provisionalFullScreenElement;
69 71
70 // If set, the WebView is in fullscreen mode for an element in this frame. 72 // If set, the WebView is in fullscreen mode for an element in this frame.
71 RefPtr<WebCore::LocalFrame> m_fullScreenFrame; 73 RefPtr<WebCore::LocalFrame> m_fullScreenFrame;
72 74
73 bool m_isCancelingFullScreen; 75 bool m_isCancelingFullScreen;
74 }; 76 };
75 77
76 } 78 }
77 79
78 #endif 80 #endif
79 81
OLDNEW
« no previous file with comments | « Source/platform/geometry/FloatPoint.h ('k') | Source/web/FullscreenController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698