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

Side by Side Diff: Source/core/layout/LayoutMedia.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after Doug's review. Created 5 years, 10 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
« no previous file with comments | « Source/core/html/shadow/SliderThumbElement.cpp ('k') | Source/core/layout/LayoutObject.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 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return; 58 return;
59 59
60 bool controlsNeedLayout = controlsRenderer->needsLayout(); 60 bool controlsNeedLayout = controlsRenderer->needsLayout();
61 LayoutSize newSize = contentBoxRect().size(); 61 LayoutSize newSize = contentBoxRect().size();
62 if (newSize == oldSize && !controlsNeedLayout) 62 if (newSize == oldSize && !controlsNeedLayout)
63 return; 63 return;
64 64
65 LayoutState state(*this, locationOffset()); 65 LayoutState state(*this, locationOffset());
66 66
67 controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + Layou tSize(paddingLeft(), paddingTop())); 67 controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + Layou tSize(paddingLeft(), paddingTop()));
68 controlsRenderer->style()->setHeight(Length(newSize.height(), Fixed)); 68 controlsRenderer->mutableStyleRef().setHeight(Length(newSize.height(), Fixed ));
69 controlsRenderer->style()->setWidth(Length(newSize.width(), Fixed)); 69 controlsRenderer->mutableStyleRef().setWidth(Length(newSize.width(), Fixed)) ;
70 controlsRenderer->forceLayout(); 70 controlsRenderer->forceLayout();
71 clearNeedsLayout(); 71 clearNeedsLayout();
72 } 72 }
73 73
74 bool LayoutMedia::isChildAllowed(LayoutObject* child, const LayoutStyle&) const 74 bool LayoutMedia::isChildAllowed(LayoutObject* child, const LayoutStyle&) const
75 { 75 {
76 // The only allowed child is the media controls. The user agent stylesheet 76 // The only allowed child is the media controls. The user agent stylesheet
77 // (mediaControls.css) has ::-webkit-media-controls { display: flex; }. If 77 // (mediaControls.css) has ::-webkit-media-controls { display: flex; }. If
78 // author style sets display: inline we would get an inline renderer as a 78 // author style sets display: inline we would get an inline renderer as a
79 // child of replaced content, which is not supposed to be possible. This 79 // child of replaced content, which is not supposed to be possible. This
80 // check can be removed if ::-webkit-media-controls is made internal. 80 // check can be removed if ::-webkit-media-controls is made internal.
81 return child->isFlexibleBox(); 81 return child->isFlexibleBox();
82 } 82 }
83 83
84 void LayoutMedia::paintReplaced(const PaintInfo&, const LayoutPoint&) 84 void LayoutMedia::paintReplaced(const PaintInfo&, const LayoutPoint&)
85 { 85 {
86 } 86 }
87 87
88 } // namespace blink 88 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/shadow/SliderThumbElement.cpp ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698