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

Side by Side Diff: Source/core/rendering/RenderFullScreen.cpp

Issue 134013002: Upgrade align-self and align-items parsing to CSS 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Really fix the tests Created 6 years, 11 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 | Annotate | Revision Log
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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 RefPtr<RenderStyle> fullscreenStyle = RenderStyle::createDefaultStyle(); 88 RefPtr<RenderStyle> fullscreenStyle = RenderStyle::createDefaultStyle();
89 89
90 // Create a stacking context: 90 // Create a stacking context:
91 fullscreenStyle->setZIndex(INT_MAX); 91 fullscreenStyle->setZIndex(INT_MAX);
92 92
93 fullscreenStyle->setFontDescription(FontDescription()); 93 fullscreenStyle->setFontDescription(FontDescription());
94 fullscreenStyle->font().update(0); 94 fullscreenStyle->font().update(0);
95 95
96 fullscreenStyle->setDisplay(FLEX); 96 fullscreenStyle->setDisplay(FLEX);
97 fullscreenStyle->setJustifyContent(JustifyCenter); 97 fullscreenStyle->setJustifyContent(JustifyCenter);
98 fullscreenStyle->setAlignItems(AlignCenter); 98 fullscreenStyle->setAlignItems(ItemPositionCenter);
99 fullscreenStyle->setFlexDirection(FlowColumn); 99 fullscreenStyle->setFlexDirection(FlowColumn);
100 100
101 fullscreenStyle->setPosition(FixedPosition); 101 fullscreenStyle->setPosition(FixedPosition);
102 fullscreenStyle->setWidth(Length(100.0, Percent)); 102 fullscreenStyle->setWidth(Length(100.0, Percent));
103 fullscreenStyle->setHeight(Length(100.0, Percent)); 103 fullscreenStyle->setHeight(Length(100.0, Percent));
104 fullscreenStyle->setLeft(Length(0, WebCore::Fixed)); 104 fullscreenStyle->setLeft(Length(0, WebCore::Fixed));
105 fullscreenStyle->setTop(Length(0, WebCore::Fixed)); 105 fullscreenStyle->setTop(Length(0, WebCore::Fixed));
106 106
107 fullscreenStyle->setBackgroundColor(Color::black); 107 fullscreenStyle->setBackgroundColor(Color::black);
108 108
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 if (!m_placeholder) { 180 if (!m_placeholder) {
181 m_placeholder = new RenderFullScreenPlaceholder(this); 181 m_placeholder = new RenderFullScreenPlaceholder(this);
182 m_placeholder->setStyle(style); 182 m_placeholder->setStyle(style);
183 if (parent()) { 183 if (parent()) {
184 parent()->addChild(m_placeholder, this); 184 parent()->addChild(m_placeholder, this);
185 parent()->setNeedsLayoutAndPrefWidthsRecalc(); 185 parent()->setNeedsLayoutAndPrefWidthsRecalc();
186 } 186 }
187 } else 187 } else
188 m_placeholder->setStyle(style); 188 m_placeholder->setStyle(style);
189 } 189 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698