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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutFullScreen.cpp

Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Getting back the FullScreen fix, missed during the rebase. Created 4 years, 4 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) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 // Create a stacking context: 99 // Create a stacking context:
100 fullscreenStyle->setZIndex(INT_MAX); 100 fullscreenStyle->setZIndex(INT_MAX);
101 fullscreenStyle->setIsStackingContext(true); 101 fullscreenStyle->setIsStackingContext(true);
102 102
103 fullscreenStyle->setFontDescription(FontDescription()); 103 fullscreenStyle->setFontDescription(FontDescription());
104 fullscreenStyle->font().update(nullptr); 104 fullscreenStyle->font().update(nullptr);
105 105
106 fullscreenStyle->setDisplay(FLEX); 106 fullscreenStyle->setDisplay(FLEX);
107 fullscreenStyle->setJustifyContentPosition(ContentPositionCenter); 107 fullscreenStyle->setJustifyContentPosition(ContentPositionCenter);
108 // TODO (lajava): Since the FullScrenn layout object is anonymous, its Defau lt Alignment (align-items) value can't be used to resolve its children Self Alig nment 'auto' values.
108 fullscreenStyle->setAlignItemsPosition(ItemPositionCenter); 109 fullscreenStyle->setAlignItemsPosition(ItemPositionCenter);
109 fullscreenStyle->setFlexDirection(FlowColumn); 110 fullscreenStyle->setFlexDirection(FlowColumn);
110 111
111 fullscreenStyle->setPosition(FixedPosition); 112 fullscreenStyle->setPosition(FixedPosition);
112 fullscreenStyle->setLeft(Length(0, blink::Fixed)); 113 fullscreenStyle->setLeft(Length(0, blink::Fixed));
113 fullscreenStyle->setTop(Length(0, blink::Fixed)); 114 fullscreenStyle->setTop(Length(0, blink::Fixed));
114 IntSize viewportSize = document().page()->frameHost().visualViewport().size( ); 115 IntSize viewportSize = document().page()->frameHost().visualViewport().size( );
115 fullscreenStyle->setWidth(Length(viewportSize.width(), blink::Fixed)); 116 fullscreenStyle->setWidth(Length(viewportSize.width(), blink::Fixed));
116 fullscreenStyle->setHeight(Length(viewportSize.height(), blink::Fixed)); 117 fullscreenStyle->setHeight(Length(viewportSize.height(), blink::Fixed));
117 118
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 m_placeholder->setStyleWithWritingModeOfParent(style); 198 m_placeholder->setStyleWithWritingModeOfParent(style);
198 if (parent()) { 199 if (parent()) {
199 parent()->addChildWithWritingModeOfParent(m_placeholder, this); 200 parent()->addChildWithWritingModeOfParent(m_placeholder, this);
200 parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation( LayoutInvalidationReason::Fullscreen); 201 parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation( LayoutInvalidationReason::Fullscreen);
201 } 202 }
202 } else { 203 } else {
203 m_placeholder->setStyle(style); 204 m_placeholder->setStyle(style);
204 m_placeholder->setStyleWithWritingModeOfParent(style); 205 m_placeholder->setStyleWithWritingModeOfParent(style);
205 } 206 }
206 } 207 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFullScreen.h ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698