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

Side by Side Diff: third_party/WebKit/public/web/WebFrameOwnerProperties.h

Issue 1938753002: OOPIF: Replicate allowFullscreen flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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 | « third_party/WebKit/public/web/WebFrame.h ('k') | third_party/WebKit/public/web/WebLocalFrame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WebFrameOwnerProperties_h 5 #ifndef WebFrameOwnerProperties_h
6 #define WebFrameOwnerProperties_h 6 #define WebFrameOwnerProperties_h
7 7
8 namespace blink { 8 namespace blink {
9 9
10 struct WebFrameOwnerProperties { 10 struct WebFrameOwnerProperties {
11 enum class ScrollingMode { 11 enum class ScrollingMode {
12 Auto, 12 Auto,
13 AlwaysOff, 13 AlwaysOff,
14 AlwaysOn, 14 AlwaysOn,
15 Last = AlwaysOn 15 Last = AlwaysOn
16 }; 16 };
17 17
18 ScrollingMode scrollingMode; 18 ScrollingMode scrollingMode;
19 int marginWidth; 19 int marginWidth;
20 int marginHeight; 20 int marginHeight;
21 bool allowFullscreen;
21 22
22 WebFrameOwnerProperties() 23 WebFrameOwnerProperties()
23 : scrollingMode(ScrollingMode::Auto) 24 : scrollingMode(ScrollingMode::Auto)
24 , marginWidth(-1) 25 , marginWidth(-1)
25 , marginHeight(-1) 26 , marginHeight(-1)
27 , allowFullscreen(false)
26 { 28 {
27 } 29 }
28 30
29 #if INSIDE_BLINK 31 #if INSIDE_BLINK
30 WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int ma rginHeight) 32 WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int ma rginHeight, bool allowFullscreen)
31 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)) 33 : scrollingMode(static_cast<ScrollingMode>(scrollingMode))
32 , marginWidth(marginWidth) 34 , marginWidth(marginWidth)
33 , marginHeight(marginHeight) 35 , marginHeight(marginHeight)
36 , allowFullscreen(allowFullscreen)
34 { 37 {
35 } 38 }
36 #endif 39 #endif
40
41 bool operator==(const WebFrameOwnerProperties& other) const
42 {
43 return scrollingMode == other.scrollingMode
44 && marginWidth == other.marginWidth
45 && marginHeight == other.marginHeight
46 && allowFullscreen == other.allowFullscreen;
47 }
48
49 bool operator!=(const WebFrameOwnerProperties& other) const
50 {
51 return !(*this == other);
52 }
37 }; 53 };
38 54
39 } // namespace blink 55 } // namespace blink
40 56
41 #endif 57 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/public/web/WebFrame.h ('k') | third_party/WebKit/public/web/WebLocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698