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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

Issue 1410833004: Revert "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 16 matching lines...) Expand all
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/css/resolver/StyleAdjuster.h" 30 #include "core/css/resolver/StyleAdjuster.h"
31 31
32 #include "core/HTMLNames.h" 32 #include "core/HTMLNames.h"
33 #include "core/SVGNames.h" 33 #include "core/SVGNames.h"
34 #include "core/dom/ContainerNode.h" 34 #include "core/dom/ContainerNode.h"
35 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
36 #include "core/dom/Element.h" 36 #include "core/dom/Element.h"
37 #include "core/dom/Fullscreen.h"
38 #include "core/frame/FrameHost.h"
39 #include "core/frame/FrameView.h" 37 #include "core/frame/FrameView.h"
40 #include "core/frame/Settings.h" 38 #include "core/frame/Settings.h"
41 #include "core/frame/UseCounter.h" 39 #include "core/frame/UseCounter.h"
42 #include "core/html/HTMLIFrameElement.h" 40 #include "core/html/HTMLIFrameElement.h"
43 #include "core/html/HTMLInputElement.h" 41 #include "core/html/HTMLInputElement.h"
44 #include "core/html/HTMLPlugInElement.h" 42 #include "core/html/HTMLPlugInElement.h"
45 #include "core/html/HTMLTableCellElement.h" 43 #include "core/html/HTMLTableCellElement.h"
46 #include "core/html/HTMLTextAreaElement.h" 44 #include "core/html/HTMLTextAreaElement.h"
47 #include "core/layout/LayoutReplaced.h" 45 #include "core/layout/LayoutReplaced.h"
48 #include "core/layout/LayoutTheme.h" 46 #include "core/layout/LayoutTheme.h"
49 #include "core/page/Page.h"
50 #include "core/style/ComputedStyle.h" 47 #include "core/style/ComputedStyle.h"
51 #include "core/style/ComputedStyleConstants.h" 48 #include "core/style/ComputedStyleConstants.h"
52 #include "core/svg/SVGSVGElement.h" 49 #include "core/svg/SVGSVGElement.h"
53 #include "platform/Length.h" 50 #include "platform/Length.h"
54 #include "platform/transforms/TransformOperations.h" 51 #include "platform/transforms/TransformOperations.h"
55 #include "wtf/Assertions.h" 52 #include "wtf/Assertions.h"
56 53
57 namespace blink { 54 namespace blink {
58 55
59 using namespace HTMLNames; 56 using namespace HTMLNames;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 170
174 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display. 171 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display.
175 if (style.hasOutOfFlowPosition() || style.isFloating() || (element && el ement->document().documentElement() == element)) 172 if (style.hasOutOfFlowPosition() || style.isFloating() || (element && el ement->document().documentElement() == element))
176 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFlo ating(), !m_useQuirksModeStyles)); 173 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFlo ating(), !m_useQuirksModeStyles));
177 174
178 // We don't adjust the first letter style earlier because we may change the display setting in 175 // We don't adjust the first letter style earlier because we may change the display setting in
179 // adjustStyeForTagName() above. 176 // adjustStyeForTagName() above.
180 adjustStyleForFirstLetter(style); 177 adjustStyleForFirstLetter(style);
181 178
182 adjustStyleForDisplay(style, parentStyle, element ? &element->document() : 0); 179 adjustStyleForDisplay(style, parentStyle, element ? &element->document() : 0);
183
184 if (element && Fullscreen::isActiveFullScreenElement(*element)) {
185 // We need to size the fullscreen element to the inner viewport and not to the
186 // outer viewport (what percentage would do). Unfortunately CSS can' t handle
187 // that as we don't expose the inner viewport information.
188 //
189 // TODO(dsinclair): We should find a way to get this standardized. c rbug.com/534924
190 IntSize viewportSize = element->document().page()->frameHost().visua lViewport().size();
191 style.setWidth(Length(viewportSize.width(), Fixed));
192 style.setHeight(Length(viewportSize.height(), Fixed));
193 }
194 } else { 180 } else {
195 adjustStyleForFirstLetter(style); 181 adjustStyleForFirstLetter(style);
196 } 182 }
197 183
198 // Make sure our z-index value is only applied if the object is positioned. 184 // Make sure our z-index value is only applied if the object is positioned.
199 if (style.position() == StaticPosition && !parentStyleForcesZIndexToCreateSt ackingContext(parentStyle)) 185 if (style.position() == StaticPosition && !parentStyleForcesZIndexToCreateSt ackingContext(parentStyle))
200 style.setHasAutoZIndex(); 186 style.setHasAutoZIndex();
201 187
202 // Auto z-index becomes 0 for the root element and transparent objects. This prevents 188 // Auto z-index becomes 0 for the root element and transparent objects. This prevents
203 // cases where objects that should be blended as a single unit end up with a non-transparent 189 // cases where objects that should be blended as a single unit end up with a non-transparent
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 // We want to count vertical percentage paddings/margins on flex items b ecause our current 505 // We want to count vertical percentage paddings/margins on flex items b ecause our current
520 // behavior is different from the spec and we want to gather compatibili ty data. 506 // behavior is different from the spec and we want to gather compatibili ty data.
521 if (style.paddingBefore().hasPercent() || style.paddingAfter().hasPercen t()) 507 if (style.paddingBefore().hasPercent() || style.paddingAfter().hasPercen t())
522 UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVert ical); 508 UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVert ical);
523 if (style.marginBefore().hasPercent() || style.marginAfter().hasPercent( )) 509 if (style.marginBefore().hasPercent() || style.marginAfter().hasPercent( ))
524 UseCounter::count(document, UseCounter::FlexboxPercentageMarginVerti cal); 510 UseCounter::count(document, UseCounter::FlexboxPercentageMarginVerti cal);
525 } 511 }
526 } 512 }
527 513
528 } 514 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/fullscreen.css ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698