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

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

Issue 2122013003: Wait until after layout when restoring scroll on exiting fullscreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests after foolip@'s patch Created 4 years, 5 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 | « no previous file | third_party/WebKit/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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void didEnterFullscreen(); 49 void didEnterFullscreen();
50 void didExitFullscreen(); 50 void didExitFullscreen();
51 51
52 void enterFullScreenForElement(Element*); 52 void enterFullScreenForElement(Element*);
53 void exitFullScreenForElement(Element*); 53 void exitFullScreenForElement(Element*);
54 54
55 bool isFullscreen() { return m_fullScreenFrame; } 55 bool isFullscreen() { return m_fullScreenFrame; }
56 56
57 void updateSize(); 57 void updateSize();
58 58
59 void didUpdateLayout();
60
59 DECLARE_TRACE(); 61 DECLARE_TRACE();
60 62
61 protected: 63 protected:
62 explicit FullscreenController(WebViewImpl*); 64 explicit FullscreenController(WebViewImpl*);
63 65
64 private: 66 private:
65 void updatePageScaleConstraints(bool removeConstraints); 67 void updatePageScaleConstraints(bool removeConstraints);
66 68
67 WebViewImpl* m_webViewImpl; 69 WebViewImpl* m_webViewImpl;
68 70
69 bool m_haveEnteredFullscreen; 71 bool m_haveEnteredFullscreen;
70 float m_exitFullscreenPageScaleFactor; 72 float m_exitFullscreenPageScaleFactor;
71 IntSize m_exitFullscreenScrollOffset; 73 IntSize m_exitFullscreenScrollOffset;
72 FloatPoint m_exitFullscreenVisualViewportOffset; 74 FloatPoint m_exitFullscreenVisualViewportOffset;
75 bool m_needsScrollAndScaleRestore;
73 76
74 // If set, the WebView is transitioning to fullscreen for this element. 77 // If set, the WebView is transitioning to fullscreen for this element.
75 Member<Element> m_provisionalFullScreenElement; 78 Member<Element> m_provisionalFullScreenElement;
76 79
77 // If set, the WebView is in fullscreen mode for an element in this frame. 80 // If set, the WebView is in fullscreen mode for an element in this frame.
78 Member<LocalFrame> m_fullScreenFrame; 81 Member<LocalFrame> m_fullScreenFrame;
79 82
80 bool m_isCancelingFullScreen; 83 bool m_isCancelingFullScreen;
81 }; 84 };
82 85
83 } // namespace blink 86 } // namespace blink
84 87
85 #endif 88 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/FullscreenController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698