Diff
Modified: trunk/Source/WebCore/ChangeLog (201112 => 201113)
--- trunk/Source/WebCore/ChangeLog 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/ChangeLog 2016-05-18 23:09:09 UTC (rev 201113)
@@ -1,3 +1,141 @@
+2016-05-18 Alex Christensen <achristen...@webkit.org>
+
+ Clean up CSS code
+ https://bugs.webkit.org/show_bug.cgi?id=157808
+
+ Reviewed by Chris Dumez.
+
+ No new tests. Just cleaning up and modernizing code.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::convertToCenterCoordinate):
+ (WebCore::cssValueToBasicShapeRadius):
+ (WebCore::basicShapeForValue):
+ * css/BasicShapeFunctions.h:
+ * css/CSSAnimationTriggerScrollValue.h:
+ (WebCore::CSSAnimationTriggerScrollValue::create):
+ (WebCore::CSSAnimationTriggerScrollValue::startValue):
+ (WebCore::CSSAnimationTriggerScrollValue::CSSAnimationTriggerScrollValue):
+ * css/CSSAspectRatioValue.h:
+ * css/CSSBasicShapes.h:
+ * css/CSSBorderImage.cpp:
+ (WebCore::createBorderImageValue):
+ * css/CSSBorderImage.h:
+ * css/CSSBorderImageSliceValue.h:
+ (WebCore::CSSBorderImageSliceValue::create):
+ * css/CSSCalculationValue.h:
+ * css/CSSCanvasValue.h:
+ (WebCore::CSSCanvasValue::CSSCanvasValue):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::valueForNinePieceImageSlice):
+ (WebCore::valueForNinePieceImageQuad):
+ (WebCore::valueForNinePieceImage):
+ (WebCore::zoomAdjustedPixelValue):
+ * css/CSSComputedStyleDeclaration.h:
+ * css/CSSFontFaceLoadEvent.cpp:
+ (WebCore::CSSFontFaceLoadEvent::CSSFontFaceLoadEvent):
+ * css/CSSFontFaceLoadEvent.h:
+ * css/CSSFontValue.h:
+ * css/CSSFunctionValue.h:
+ * css/CSSGradientValue.h:
+ (WebCore::CSSGradientValue::setFirstX):
+ (WebCore::CSSGradientValue::setFirstY):
+ (WebCore::CSSGradientValue::setSecondX):
+ (WebCore::CSSGradientValue::setSecondY):
+ (WebCore::CSSGradientValue::addStop):
+ (WebCore::CSSLinearGradientValue::create):
+ (WebCore::CSSLinearGradientValue::setAngle):
+ (WebCore::CSSRadialGradientValue::setFirstRadius):
+ (WebCore::CSSRadialGradientValue::setSecondRadius):
+ (WebCore::CSSRadialGradientValue::setShape):
+ (WebCore::CSSRadialGradientValue::setSizingBehavior):
+ (WebCore::CSSRadialGradientValue::setEndHorizontalSize):
+ (WebCore::CSSRadialGradientValue::setEndVerticalSize):
+ * css/CSSGroupingRule.cpp:
+ (WebCore::CSSGroupingRule::item):
+ (WebCore::CSSGroupingRule::cssRules):
+ * css/CSSKeyframesRule.cpp:
+ (WebCore::CSSKeyframesRule::cssRules):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::addProperty):
+ (WebCore::CSSParser::rollbackLastProperties):
+ (WebCore::CSSParser::parseDashboardRegions):
+ (WebCore::CSSParser::parseClipShape):
+ (WebCore::CSSParser::parseBasicShapeCircle):
+ (WebCore::BorderImageParseContext::commitWebKitBorderImage):
+ (WebCore::BorderImageParseContext::commitBorderImage):
+ (WebCore::BorderImageSliceParseContext::commitBorderImageSlice):
+ (WebCore::BorderImageQuadParseContext::commitBorderImageQuad):
+ (WebCore::CSSParser::parseDeprecatedRadialGradient):
+ (WebCore::CSSParser::parseRadialGradient):
+ * css/CSSParser.h:
+ (WebCore::cssyylex):
+ * css/CSSPrimitiveValue.h:
+ * css/CSSProperty.cpp:
+ * css/CSSProperty.h:
+ (WebCore::CSSProperty::CSSProperty):
+ * css/CSSRule.h:
+ * css/CSSRuleList.h:
+ * css/CSSSegmentedFontFace.h:
+ * css/Counter.h:
+ (WebCore::Counter::create):
+ (WebCore::Counter::identifier):
+ (WebCore::Counter::listStyleIdent):
+ (WebCore::Counter::setIdentifier):
+ (WebCore::Counter::setListStyle):
+ (WebCore::Counter::setSeparator):
+ (WebCore::Counter::equals):
+ (WebCore::Counter::cloneForCSSOM):
+ (WebCore::Counter::Counter):
+ * css/Pair.h:
+ * css/Rect.h:
+ (WebCore::RectBase::bottom):
+ (WebCore::RectBase::left):
+ (WebCore::RectBase::setTop):
+ (WebCore::RectBase::setRight):
+ (WebCore::RectBase::setBottom):
+ (WebCore::RectBase::setLeft):
+ (WebCore::RectBase::equals):
+ * css/SVGCSSComputedStyleDeclaration.cpp:
+ (WebCore::strokeDashArrayToCSSValueList):
+ (WebCore::ComputedStyleExtractor::adjustSVGPaintForCurrentColor):
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertClipPath):
+ (WebCore::StyleBuilderConverter::convertShapeValue):
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::borderPropertyValue):
+ (WebCore::StyleProperties::getPropertyCSSValue):
+ (WebCore::StyleProperties::getPropertyCSSValueInternal):
+ (WebCore::MutableStyleProperties::setCustomProperty):
+ (WebCore::MutableStyleProperties::setProperty):
+ * css/StyleProperties.h:
+ (WebCore::StyleProperties::isEmpty):
+ (isType):
+ * css/StylePropertyShorthand.cpp:
+ * css/StylePropertyShorthand.h:
+ (WebCore::StylePropertyShorthand::StylePropertyShorthand):
+ (WebCore::StylePropertyShorthand::id):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::appendAuthorStyleSheets):
+ (WebCore::StyleResolver::addKeyframeStyle):
+ (WebCore::StyleResolver::~StyleResolver):
+ (WebCore::StyleResolver::resolvedVariableValue):
+ (WebCore::StyleResolver::styleImage):
+ (WebCore::StyleResolver::cachedOrPendingFromValue):
+ (WebCore::StyleResolver::generatedOrPendingFromValue):
+ (WebCore::StyleResolver::createFilterOperations):
+ (WebCore::StyleResolver::loadPendingImage):
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::hasViewportDependentMediaQueries):
+ (WebCore::StyleResolver::state):
+ (WebCore::checkRegionSelector):
+ * css/StyleSheetList.h:
+ * css/WebKitCSSFilterValue.cpp:
+ * css/WebKitCSSFilterValue.h:
+ * css/WebKitCSSTransformValue.cpp:
+ * css/WebKitCSSTransformValue.h:
+ * rendering/shapes/Shape.cpp:
+
2016-05-18 Jer Noble <jer.no...@apple.com>
webkitEnterFullscreen() does not require a user gesture when RequireUserGestureForAudioRateChange is set.
Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -188,7 +188,7 @@
return BasicShapeCenterCoordinate(direction, offset);
}
-static BasicShapeRadius cssValueToBasicShapeRadius(const CSSToLengthConversionData& conversionData, PassRefPtr<CSSPrimitiveValue> radius)
+static BasicShapeRadius cssValueToBasicShapeRadius(const CSSToLengthConversionData& conversionData, CSSPrimitiveValue* radius)
{
if (!radius)
return BasicShapeRadius(BasicShapeRadius::ClosestSide);
@@ -205,16 +205,16 @@
}
}
- return BasicShapeRadius(convertToLength(conversionData, radius.get()));
+ return BasicShapeRadius(convertToLength(conversionData, radius));
}
-Ref<BasicShape> basicShapeForValue(const CSSToLengthConversionData& conversionData, const CSSBasicShape* basicShapeValue)
+Ref<BasicShape> basicShapeForValue(const CSSToLengthConversionData& conversionData, const CSSBasicShape& basicShapeValue)
{
RefPtr<BasicShape> basicShape;
- switch (basicShapeValue->type()) {
+ switch (basicShapeValue.type()) {
case CSSBasicShape::CSSBasicShapeCircleType: {
- auto& circleValue = downcast<CSSBasicShapeCircle>(*basicShapeValue);
+ auto& circleValue = downcast<CSSBasicShapeCircle>(basicShapeValue);
auto circle = BasicShapeCircle::create();
circle->setCenterX(convertToCenterCoordinate(conversionData, circleValue.centerX()));
@@ -225,7 +225,7 @@
break;
}
case CSSBasicShape::CSSBasicShapeEllipseType: {
- auto& ellipseValue = downcast<CSSBasicShapeEllipse>(*basicShapeValue);
+ auto& ellipseValue = downcast<CSSBasicShapeEllipse>(basicShapeValue);
auto ellipse = BasicShapeEllipse::create();
ellipse->setCenterX(convertToCenterCoordinate(conversionData, ellipseValue.centerX()));
@@ -238,7 +238,7 @@
break;
}
case CSSBasicShape::CSSBasicShapePolygonType: {
- auto& polygonValue = downcast<CSSBasicShapePolygon>(*basicShapeValue);
+ auto& polygonValue = downcast<CSSBasicShapePolygon>(basicShapeValue);
auto polygon = BasicShapePolygon::create();
polygon->setWindRule(polygonValue.windRule());
@@ -250,7 +250,7 @@
break;
}
case CSSBasicShape::CSSBasicShapeInsetType: {
- auto& rectValue = downcast<CSSBasicShapeInset>(*basicShapeValue);
+ auto& rectValue = downcast<CSSBasicShapeInset>(basicShapeValue);
auto rect = BasicShapeInset::create();
rect->setTop(convertToLength(conversionData, rectValue.top()));
@@ -267,7 +267,7 @@
break;
}
case CSSBasicShape::CSSBasicShapePathType: {
- auto& pathValue = downcast<CSSBasicShapePath>(*basicShapeValue);
+ auto& pathValue = downcast<CSSBasicShapePath>(basicShapeValue);
auto path = BasicShapePath::create(pathValue.pathData().copy());
path->setWindRule(pathValue.windRule());
Modified: trunk/Source/WebCore/css/BasicShapeFunctions.h (201112 => 201113)
--- trunk/Source/WebCore/css/BasicShapeFunctions.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -27,25 +27,21 @@
* SUCH DAMAGE.
*/
-#ifndef BasicShapeFunctions_h
-#define BasicShapeFunctions_h
+#pragma once
-#include "BasicShapes.h"
-#include <wtf/PassRefPtr.h>
+#include <wtf/Ref.h>
namespace WebCore {
+class BasicShape;
+class BasicShapeCenterCoordinate;
class CSSBasicShape;
class CSSToLengthConversionData;
-class CSSPrimitiveValue;
-class CSSToLengthConversionData;
class CSSValue;
class RenderStyle;
Ref<CSSValue> valueForBasicShape(const RenderStyle&, const BasicShape&);
-Ref<BasicShape> basicShapeForValue(const CSSToLengthConversionData&, const CSSBasicShape*);
-
+Ref<BasicShape> basicShapeForValue(const CSSToLengthConversionData&, const CSSBasicShape&);
float floatValueForCenterCoordinate(const BasicShapeCenterCoordinate&, float);
-}
-#endif
+}
Modified: trunk/Source/WebCore/css/CSSAnimationTriggerScrollValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSAnimationTriggerScrollValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSAnimationTriggerScrollValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -23,21 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSAnimationTriggerScrollValue_h
-#define CSSAnimationTriggerScrollValue_h
+#pragma once
#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
#include "CSSValue.h"
-#include <wtf/PassRefPtr.h>
namespace WebCore {
class CSSAnimationTriggerScrollValue : public CSSValue {
public:
- static Ref<CSSAnimationTriggerScrollValue> create(PassRefPtr<CSSValue> startValue, PassRefPtr<CSSValue> endValue = nullptr)
+ static Ref<CSSAnimationTriggerScrollValue> create(Ref<CSSValue>&& startValue, RefPtr<CSSValue>&& endValue = nullptr)
{
- return adoptRef(*new CSSAnimationTriggerScrollValue(startValue, endValue));
+ return adoptRef(*new CSSAnimationTriggerScrollValue(WTFMove(startValue), WTFMove(endValue)));
}
const CSSValue* startValue() const { return m_startValue.get(); }
@@ -49,10 +47,10 @@
bool equals(const CSSAnimationTriggerScrollValue&) const;
private:
- CSSAnimationTriggerScrollValue(PassRefPtr<CSSValue> startValue, PassRefPtr<CSSValue> endValue)
+ CSSAnimationTriggerScrollValue(Ref<CSSValue>&& startValue, RefPtr<CSSValue>&& endValue)
: CSSValue(AnimationTriggerScrollClass)
- , m_startValue(startValue)
- , m_endValue(endValue)
+ , m_startValue(WTFMove(startValue))
+ , m_endValue(WTFMove(endValue))
{
}
@@ -65,5 +63,3 @@
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSAnimationTriggerScrollValue, isAnimationTriggerScrollValue())
#endif
-
-#endif
Modified: trunk/Source/WebCore/css/CSSAspectRatioValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSAspectRatioValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSAspectRatioValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -26,10 +26,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSAspectRatioValue_h
-#define CSSAspectRatioValue_h
+#pragma once
-#include "CSSPrimitiveValue.h"
#include "CSSValue.h"
namespace WebCore {
@@ -63,5 +61,3 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSAspectRatioValue, isAspectRatioValue())
-
-#endif
Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSBasicShapes.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -27,10 +27,8 @@
* SUCH DAMAGE.
*/
-#ifndef CSSBasicShapes_h
-#define CSSBasicShapes_h
+#pragma once
-#include "CSSPrimitiveValue.h"
#include "WindRule.h"
#include <wtf/RefPtr.h>
#include <wtf/TypeCasts.h>
@@ -39,6 +37,7 @@
namespace WebCore {
+class CSSPrimitiveValue;
class SVGPathByteStream;
class CSSBasicShape : public RefCounted<CSSBasicShape> {
@@ -77,10 +76,10 @@
CSSPrimitiveValue* bottomRightRadius() const { return m_bottomRightRadius.get(); }
CSSPrimitiveValue* bottomLeftRadius() const { return m_bottomLeftRadius.get(); }
- void setTop(PassRefPtr<CSSPrimitiveValue> top) { m_top = top; }
- void setRight(PassRefPtr<CSSPrimitiveValue> right) { m_right = right; }
- void setBottom(PassRefPtr<CSSPrimitiveValue> bottom) { m_bottom = bottom; }
- void setLeft(PassRefPtr<CSSPrimitiveValue> left) { m_left = left; }
+ void setTop(RefPtr<CSSPrimitiveValue>&& top) { m_top = WTFMove(top); }
+ void setRight(RefPtr<CSSPrimitiveValue>&& right) { m_right = WTFMove(right); }
+ void setBottom(RefPtr<CSSPrimitiveValue>&& bottom) { m_bottom = WTFMove(bottom); }
+ void setLeft(RefPtr<CSSPrimitiveValue>&& left) { m_left = WTFMove(left); }
void updateShapeSize4Values(CSSPrimitiveValue* top, CSSPrimitiveValue* right, CSSPrimitiveValue* bottom, CSSPrimitiveValue* left)
{
@@ -105,10 +104,10 @@
updateShapeSize4Values(value1, value2, value3, value2);
}
- void setTopLeftRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_topLeftRadius = radius; }
- void setTopRightRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_topRightRadius = radius; }
- void setBottomRightRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_bottomRightRadius = radius; }
- void setBottomLeftRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_bottomLeftRadius = radius; }
+ void setTopLeftRadius(RefPtr<CSSPrimitiveValue>&& radius) { m_topLeftRadius = WTFMove(radius); }
+ void setTopRightRadius(RefPtr<CSSPrimitiveValue>&& radius) { m_topRightRadius = WTFMove(radius); }
+ void setBottomRightRadius(RefPtr<CSSPrimitiveValue>&& radius) { m_bottomRightRadius = WTFMove(radius); }
+ void setBottomLeftRadius(RefPtr<CSSPrimitiveValue>&& radius) { m_bottomLeftRadius = WTFMove(radius); }
private:
CSSBasicShapeInset() { }
@@ -136,9 +135,9 @@
CSSPrimitiveValue* centerY() const { return m_centerY.get(); }
CSSPrimitiveValue* radius() const { return m_radius.get(); }
- void setCenterX(PassRefPtr<CSSPrimitiveValue> centerX) { m_centerX = centerX; }
- void setCenterY(PassRefPtr<CSSPrimitiveValue> centerY) { m_centerY = centerY; }
- void setRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_radius = radius; }
+ void setCenterX(RefPtr<CSSPrimitiveValue>&& centerX) { m_centerX = WTFMove(centerX); }
+ void setCenterY(RefPtr<CSSPrimitiveValue>&& centerY) { m_centerY = WTFMove(centerY); }
+ void setRadius(RefPtr<CSSPrimitiveValue>&& radius) { m_radius = WTFMove(radius); }
private:
CSSBasicShapeCircle() { }
@@ -248,5 +247,3 @@
SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(CSSBasicShapeEllipse)
SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(CSSBasicShapePolygon)
SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(CSSBasicShapePath)
-
-#endif // CSSBasicShapes_h
Modified: trunk/Source/WebCore/css/CSSBorderImage.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSBorderImage.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSBorderImage.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -20,9 +20,11 @@
#include "config.h"
#include "CSSBorderImage.h"
+#include "CSSValueList.h"
+
namespace WebCore {
-Ref<CSSValueList> createBorderImageValue(PassRefPtr<CSSValue> image, PassRefPtr<CSSValue> imageSlice, PassRefPtr<CSSValue> borderSlice, PassRefPtr<CSSValue> outset, PassRefPtr<CSSValue> repeat)
+Ref<CSSValueList> createBorderImageValue(RefPtr<CSSValue>&& image, RefPtr<CSSValue>&& imageSlice, RefPtr<CSSValue>&& borderSlice, RefPtr<CSSValue>&& outset, RefPtr<CSSValue>&& repeat)
{
auto list = CSSValueList::createSpaceSeparated();
if (image)
@@ -31,19 +33,19 @@
if (borderSlice || outset) {
auto listSlash = CSSValueList::createSlashSeparated();
if (imageSlice)
- listSlash.get().append(*imageSlice);
+ listSlash.get().append(imageSlice.releaseNonNull());
if (borderSlice)
- listSlash.get().append(*borderSlice);
+ listSlash.get().append(borderSlice.releaseNonNull());
if (outset)
- listSlash.get().append(*outset);
+ listSlash.get().append(outset.releaseNonNull());
list.get().append(WTFMove(listSlash));
} else if (imageSlice)
- list.get().append(*imageSlice);
+ list.get().append(imageSlice.releaseNonNull());
if (repeat)
- list.get().append(*repeat);
+ list.get().append(repeat.releaseNonNull());
return list;
}
Modified: trunk/Source/WebCore/css/CSSBorderImage.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSBorderImage.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSBorderImage.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -17,18 +17,15 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef CSSBorderImage_h
-#define CSSBorderImage_h
+#pragma once
-#include "CSSBorderImageSliceValue.h"
-#include "CSSValueList.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
-Ref<CSSValueList> createBorderImageValue(PassRefPtr<CSSValue> image, PassRefPtr<CSSValue> imageSlice, PassRefPtr<CSSValue> borderSlice, PassRefPtr<CSSValue> outset, PassRefPtr<CSSValue> repeat);
+class CSSValue;
+class CSSValueList;
-} // namespace WebCore
+Ref<CSSValueList> createBorderImageValue(RefPtr<CSSValue>&& image, RefPtr<CSSValue>&& imageSlice, RefPtr<CSSValue>&& borderSlice, RefPtr<CSSValue>&& outset, RefPtr<CSSValue>&& repeat);
-#endif // CSSBorderImage_h
+} // namespace WebCore
Modified: trunk/Source/WebCore/css/CSSBorderImageSliceValue.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSBorderImageSliceValue.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSBorderImageSliceValue.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -31,9 +31,9 @@
namespace WebCore {
-CSSBorderImageSliceValue::CSSBorderImageSliceValue(PassRefPtr<CSSPrimitiveValue> slices, bool fill)
+CSSBorderImageSliceValue::CSSBorderImageSliceValue(RefPtr<CSSPrimitiveValue>&& slices, bool fill)
: CSSValue(BorderImageSliceClass)
- , m_slices(slices)
+ , m_slices(WTFMove(slices))
, m_fill(fill)
{
}
Modified: trunk/Source/WebCore/css/CSSBorderImageSliceValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSBorderImageSliceValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSBorderImageSliceValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -23,11 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSBorderImageSliceValue_h
-#define CSSBorderImageSliceValue_h
+#pragma once
#include "CSSPrimitiveValue.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
@@ -36,9 +34,9 @@
class CSSBorderImageSliceValue : public CSSValue {
public:
- static Ref<CSSBorderImageSliceValue> create(PassRefPtr<CSSPrimitiveValue> slices, bool fill)
+ static Ref<CSSBorderImageSliceValue> create(RefPtr<CSSPrimitiveValue>&& slices, bool fill)
{
- return adoptRef(*new CSSBorderImageSliceValue(slices, fill));
+ return adoptRef(*new CSSBorderImageSliceValue(WTFMove(slices), fill));
}
String customCSSText() const;
@@ -53,11 +51,9 @@
bool m_fill;
private:
- CSSBorderImageSliceValue(PassRefPtr<CSSPrimitiveValue> slices, bool fill);
+ CSSBorderImageSliceValue(RefPtr<CSSPrimitiveValue>&& slices, bool fill);
};
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSBorderImageSliceValue, isBorderImageSliceValue())
-
-#endif // CSSBorderImageSliceValue_h
Modified: trunk/Source/WebCore/css/CSSCalculationValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSCalculationValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSCalculationValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -28,8 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSCalculationValue_h
-#define CSSCalculationValue_h
+#pragma once
#include "CSSPrimitiveValue.h"
#include "CalculationValue.h"
@@ -134,5 +133,3 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSCalcValue, isCalcValue())
-
-#endif // CSSCalculationValue_h
Modified: trunk/Source/WebCore/css/CSSCanvasValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSCanvasValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSCanvasValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSCanvasValue_h
-#define CSSCanvasValue_h
+#pragma once
#include "CSSImageGeneratorValue.h"
#include "HTMLCanvasElement.h"
@@ -32,6 +31,7 @@
namespace WebCore {
class Document;
+class HTMLCanvasElement;
class CSSCanvasValue : public CSSImageGeneratorValue {
public:
@@ -54,7 +54,6 @@
: CSSImageGeneratorValue(CanvasClass)
, m_canvasObserver(*this)
, m_name(name)
- , m_element(0)
{
}
@@ -99,11 +98,10 @@
// The name of the canvas.
String m_name;
// The document supplies the element and owns it.
- HTMLCanvasElement* m_element;
+ HTMLCanvasElement* m_element { nullptr };
};
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSCanvasValue, isCanvasValue())
-#endif // CSSCanvasValue_h
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -32,6 +32,7 @@
#include "CSSAspectRatioValue.h"
#include "CSSBasicShapes.h"
#include "CSSBorderImage.h"
+#include "CSSBorderImageSliceValue.h"
#include "CSSCustomPropertyValue.h"
#include "CSSFontFeatureValue.h"
#include "CSSFontValue.h"
@@ -64,6 +65,7 @@
#include "StyleInheritedData.h"
#include "StyleProperties.h"
#include "StylePropertyShorthand.h"
+#include "StylePropertyShorthandFunctions.h"
#include "StyleResolver.h"
#include "WebKitCSSFilterValue.h"
#include "WebKitCSSTransformValue.h"
@@ -538,10 +540,10 @@
}
auto quad = Quad::create();
- quad->setTop(top.release());
- quad->setRight(right.release());
- quad->setBottom(bottom.release());
- quad->setLeft(left.release());
+ quad->setTop(WTFMove(top));
+ quad->setRight(WTFMove(right));
+ quad->setBottom(WTFMove(bottom));
+ quad->setLeft(WTFMove(left));
return CSSBorderImageSliceValue::create(CSSValuePool::singleton().createValue(WTFMove(quad)), image.fill());
}
@@ -591,10 +593,10 @@
}
auto quad = Quad::create();
- quad->setTop(top);
- quad->setRight(right);
- quad->setBottom(bottom);
- quad->setLeft(left);
+ quad->setTop(WTFMove(top));
+ quad->setRight(WTFMove(right));
+ quad->setBottom(WTFMove(bottom));
+ quad->setLeft(WTFMove(left));
return cssValuePool.createValue(WTFMove(quad));
}
@@ -634,7 +636,7 @@
// Create the repeat rules.
RefPtr<CSSValue> repeat = valueForNinePieceImageRepeat(image);
- return createBorderImageValue(imageValue.release(), imageSlices.release(), borderSlices.release(), outset.release(), repeat.release());
+ return createBorderImageValue(WTFMove(imageValue), WTFMove(imageSlices), WTFMove(borderSlices), WTFMove(outset), WTFMove(repeat));
}
inline static Ref<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const RenderStyle& style)
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -70,7 +70,7 @@
Node* styledNode() const;
RefPtr<CSSValue> svgPropertyValue(CSSPropertyID, EUpdateLayout) const;
- RefPtr<SVGPaint> adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint>, const RenderStyle*) const;
+ RefPtr<SVGPaint> adjustSVGPaintForCurrentColor(RefPtr<SVGPaint>&&, const RenderStyle*) const;
static Ref<CSSValue> valueForShadow(const ShadowData*, CSSPropertyID, const RenderStyle&, AdjustPixelValuesForComputedStyle = AdjustPixelValues);
RefPtr<CSSPrimitiveValue> currentColorOrValidColor(const RenderStyle*, const Color&) const;
Modified: trunk/Source/WebCore/css/CSSFontFaceLoadEvent.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSFontFaceLoadEvent.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSFontFaceLoadEvent.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -39,10 +39,10 @@
{
}
-CSSFontFaceLoadEvent::CSSFontFaceLoadEvent(const AtomicString& type, PassRefPtr<CSSFontFaceRule> fontface, PassRefPtr<DOMError> error)
+CSSFontFaceLoadEvent::CSSFontFaceLoadEvent(const AtomicString& type, RefPtr<CSSFontFaceRule>&& fontface, RefPtr<DOMError>&& error)
: Event(type, false, false)
- , m_fontface(fontface)
- , m_error(error)
+ , m_fontface(WTFMove(fontface))
+ , m_error(WTFMove(error))
{
}
Modified: trunk/Source/WebCore/css/CSSFontFaceLoadEvent.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSFontFaceLoadEvent.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSFontFaceLoadEvent.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -28,21 +28,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#pragma once
+
#if ENABLE(FONT_LOAD_EVENTS)
-#ifndef CSSFontFaceLoadEvent_h
-#define CSSFontFaceLoadEvent_h
-
#include "CSSFontFaceRule.h"
#include "CSSValue.h"
-#include "DOMError.h"
#include "Event.h"
#include "EventNames.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
+class DOMError;
+
struct CSSFontFaceLoadEventInit : public EventInit {
RefPtr<CSSFontFaceRule> fontface;
RefPtr<DOMError> error;
@@ -60,14 +59,14 @@
return adoptRef<CSSFontFaceLoadEvent>(*new CSSFontFaceLoadEvent(type, initializer));
}
- static Ref<CSSFontFaceLoadEvent> createForFontFaceRule(const AtomicString& type, PassRefPtr<CSSFontFaceRule> rule)
+ static Ref<CSSFontFaceLoadEvent> createForFontFaceRule(const AtomicString& type, RefPtr<CSSFontFaceRule>&& rule)
{
- return adoptRef<CSSFontFaceLoadEvent>(*new CSSFontFaceLoadEvent(type, rule, 0));
+ return adoptRef<CSSFontFaceLoadEvent>(*new CSSFontFaceLoadEvent(type, WTFMove(rule), nullptr));
}
- static Ref<CSSFontFaceLoadEvent> createForError(PassRefPtr<CSSFontFaceRule> rule, PassRefPtr<DOMError> error)
+ static Ref<CSSFontFaceLoadEvent> createForError(RefPtr<CSSFontFaceRule>&& rule, RefPtr<DOMError>&& error)
{
- return adoptRef<CSSFontFaceLoadEvent>(*new CSSFontFaceLoadEvent(eventNames().errorEvent, rule, error));
+ return adoptRef<CSSFontFaceLoadEvent>(*new CSSFontFaceLoadEvent(eventNames().errorEvent, WTFMove(rule), WTFMove(error)));
}
virtual ~CSSFontFaceLoadEvent();
@@ -79,7 +78,7 @@
private:
CSSFontFaceLoadEvent();
- CSSFontFaceLoadEvent(const AtomicString&, PassRefPtr<CSSFontFaceRule>, PassRefPtr<DOMError>);
+ CSSFontFaceLoadEvent(const AtomicString&, RefPtr<CSSFontFaceRule>&&, RefPtr<DOMError>&&);
CSSFontFaceLoadEvent(const AtomicString&, const CSSFontFaceLoadEventInit&);
RefPtr<CSSFontFaceRule> m_fontface;
@@ -88,5 +87,4 @@
} // namespace WebCore
-#endif // CSSFontFaceLoadEvent_h
#endif // ENABLE(FONT_LOAD_EVENTS)
Modified: trunk/Source/WebCore/css/CSSFontValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSFontValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSFontValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -18,11 +18,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef CSSFontValue_h
-#define CSSFontValue_h
+#pragma once
#include "CSSValue.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
@@ -58,5 +56,3 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSFontValue, isFontValue())
-
-#endif
Modified: trunk/Source/WebCore/css/CSSFunctionValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSFunctionValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSFunctionValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSFunctionValue_h
-#define CSSFunctionValue_h
+#pragma once
#include "CSSValue.h"
@@ -65,6 +64,3 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSFunctionValue, isFunctionValue())
-
-#endif
-
Modified: trunk/Source/WebCore/css/CSSGradientValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSGradientValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSGradientValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSGradientValue_h
-#define CSSGradientValue_h
+#pragma once
#include "CSSImageGeneratorValue.h"
#include "CSSPrimitiveValue.h"
@@ -64,10 +63,10 @@
public:
RefPtr<Image> image(RenderElement*, const FloatSize&);
- void setFirstX(PassRefPtr<CSSPrimitiveValue> val) { m_firstX = val; }
- void setFirstY(PassRefPtr<CSSPrimitiveValue> val) { m_firstY = val; }
- void setSecondX(PassRefPtr<CSSPrimitiveValue> val) { m_secondX = val; }
- void setSecondY(PassRefPtr<CSSPrimitiveValue> val) { m_secondY = val; }
+ void setFirstX(RefPtr<CSSPrimitiveValue>&& val) { m_firstX = WTFMove(val); }
+ void setFirstY(RefPtr<CSSPrimitiveValue>&& val) { m_firstY = WTFMove(val); }
+ void setSecondX(RefPtr<CSSPrimitiveValue>&& val) { m_secondX = WTFMove(val); }
+ void setSecondY(RefPtr<CSSPrimitiveValue>&& val) { m_secondY = WTFMove(val); }
void addStop(const CSSGradientColorStop& stop) { m_stops.append(stop); }
@@ -139,7 +138,7 @@
return adoptRef(*new CSSLinearGradientValue(repeat, gradientType));
}
- void setAngle(PassRefPtr<CSSPrimitiveValue> val) { m_angle = val; }
+ void setAngle(RefPtr<CSSPrimitiveValue>&& val) { m_angle = WTFMove(val); }
String customCSSText() const;
@@ -182,14 +181,14 @@
String customCSSText() const;
- void setFirstRadius(PassRefPtr<CSSPrimitiveValue> val) { m_firstRadius = val; }
- void setSecondRadius(PassRefPtr<CSSPrimitiveValue> val) { m_secondRadius = val; }
+ void setFirstRadius(RefPtr<CSSPrimitiveValue>&& val) { m_firstRadius = WTFMove(val); }
+ void setSecondRadius(RefPtr<CSSPrimitiveValue>&& val) { m_secondRadius = WTFMove(val); }
- void setShape(PassRefPtr<CSSPrimitiveValue> val) { m_shape = val; }
- void setSizingBehavior(PassRefPtr<CSSPrimitiveValue> val) { m_sizingBehavior = val; }
+ void setShape(RefPtr<CSSPrimitiveValue>&& val) { m_shape = WTFMove(val); }
+ void setSizingBehavior(RefPtr<CSSPrimitiveValue>&& val) { m_sizingBehavior = WTFMove(val); }
- void setEndHorizontalSize(PassRefPtr<CSSPrimitiveValue> val) { m_endHorizontalSize = val; }
- void setEndVerticalSize(PassRefPtr<CSSPrimitiveValue> val) { m_endVerticalSize = val; }
+ void setEndHorizontalSize(RefPtr<CSSPrimitiveValue>&& val) { m_endHorizontalSize = WTFMove(val); }
+ void setEndVerticalSize(RefPtr<CSSPrimitiveValue>&& val) { m_endVerticalSize = WTFMove(val); }
// Create the gradient for a given size.
Ref<Gradient> createGradient(RenderElement&, const FloatSize&);
@@ -234,5 +233,3 @@
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSGradientValue, isGradientValue())
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSLinearGradientValue, isLinearGradientValue())
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSRadialGradientValue, isRadialGradientValue())
-
-#endif // CSSGradientValue_h
Modified: trunk/Source/WebCore/css/CSSGroupingRule.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSGroupingRule.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSGroupingRule.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -133,7 +133,7 @@
CSSRule* CSSGroupingRule::item(unsigned index) const
{
if (index >= length())
- return 0;
+ return nullptr;
ASSERT(m_childRuleCSSOMWrappers.size() == m_groupRule->childRules().size());
RefPtr<CSSRule>& rule = m_childRuleCSSOMWrappers[index];
if (!rule)
@@ -144,7 +144,7 @@
CSSRuleList& CSSGroupingRule::cssRules() const
{
if (!m_ruleListCSSOMWrapper)
- m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<CSSGroupingRule>>(const_cast<CSSGroupingRule*>(this));
+ m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<CSSGroupingRule>>(const_cast<CSSGroupingRule&>(*this));
return *m_ruleListCSSOMWrapper;
}
Modified: trunk/Source/WebCore/css/CSSKeyframesRule.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -193,7 +193,7 @@
CSSRuleList& CSSKeyframesRule::cssRules()
{
if (!m_ruleListCSSOMWrapper)
- m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<CSSKeyframesRule>>(this);
+ m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<CSSKeyframesRule>>(*this);
return *m_ruleListCSSOMWrapper;
}
Modified: trunk/Source/WebCore/css/CSSParser.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSParser.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -32,6 +32,7 @@
#include "CSSAspectRatioValue.h"
#include "CSSBasicShapes.h"
#include "CSSBorderImage.h"
+#include "CSSBorderImageSliceValue.h"
#include "CSSCanvasValue.h"
#include "CSSContentDistributionValue.h"
#include "CSSCrossfadeValue.h"
@@ -90,6 +91,7 @@
#include "Settings.h"
#include "StyleProperties.h"
#include "StylePropertyShorthand.h"
+#include "StylePropertyShorthandFunctions.h"
#include "StyleRule.h"
#include "StyleRuleImport.h"
#include "StyleSheetContents.h"
@@ -1646,15 +1648,15 @@
{
// This property doesn't belong to a shorthand or is a CSS variable (which will be resolved later).
if (!m_currentShorthand) {
- m_parsedProperties.append(CSSProperty(propId, value, important, false, CSSPropertyInvalid, m_implicitShorthand || implicit));
+ m_parsedProperties.append(CSSProperty(propId, WTFMove(value), important, false, CSSPropertyInvalid, m_implicitShorthand || implicit));
return;
}
Vector<StylePropertyShorthand> shorthands = matchingShorthandsForLonghand(propId);
if (shorthands.size() == 1)
- m_parsedProperties.append(CSSProperty(propId, value, important, true, CSSPropertyInvalid, m_implicitShorthand || implicit));
+ m_parsedProperties.append(CSSProperty(propId, WTFMove(value), important, true, CSSPropertyInvalid, m_implicitShorthand || implicit));
else
- m_parsedProperties.append(CSSProperty(propId, value, important, true, indexOfShorthandForLonghand(m_currentShorthand, shorthands), m_implicitShorthand || implicit));
+ m_parsedProperties.append(CSSProperty(propId, WTFMove(value), important, true, indexOfShorthandForLonghand(m_currentShorthand, shorthands), m_implicitShorthand || implicit));
}
void CSSParser::rollbackLastProperties(int num)
@@ -1880,20 +1882,19 @@
return nullptr;
}
-void CSSParser::addExpandedPropertyForValue(CSSPropertyID propId, RefPtr<CSSValue>&& prpValue, bool important)
+void CSSParser::addExpandedPropertyForValue(CSSPropertyID propId, RefPtr<CSSValue>&& value, bool important)
{
const StylePropertyShorthand& shorthand = shorthandForProperty(propId);
unsigned shorthandLength = shorthand.length();
if (!shorthandLength) {
- addProperty(propId, WTFMove(prpValue), important);
+ addProperty(propId, WTFMove(value), important);
return;
}
- RefPtr<CSSValue> value = prpValue;
ShorthandScope scope(this, propId);
const CSSPropertyID* longhands = shorthand.properties();
for (unsigned i = 0; i < shorthandLength; ++i)
- addProperty(longhands[i], WTFMove(value), important);
+ addProperty(longhands[i], value.copyRef(), important);
}
RefPtr<CSSValue> CSSParser::parseVariableDependentValue(CSSPropertyID propID, const CSSVariableDependentValue& dependentValue, const CustomPropertyValueMap& customProperties)
@@ -5114,12 +5115,12 @@
if (!validateUnit(firstArgumentWithCalculation, FLength))
return nullptr;
- RefPtr<CSSValue> startValue = createPrimitiveNumericValue(firstArgumentWithCalculation);
+ Ref<CSSValue> startValue = createPrimitiveNumericValue(firstArgumentWithCalculation);
argument = args->next();
if (!argument)
- return CSSAnimationTriggerScrollValue::create(startValue.release());
+ return CSSAnimationTriggerScrollValue::create(WTFMove(startValue));
if (!isComma(argument))
return nullptr;
@@ -5129,9 +5130,9 @@
if (!validateUnit(secondArgumentWithCalculation, FLength))
return nullptr;
- RefPtr<CSSValue> endValue = createPrimitiveNumericValue(secondArgumentWithCalculation);
+ Ref<CSSValue> endValue = createPrimitiveNumericValue(secondArgumentWithCalculation);
- return CSSAnimationTriggerScrollValue::create(startValue.release(), endValue.release());
+ return CSSAnimationTriggerScrollValue::create(WTFMove(startValue), WTFMove(endValue));
}
return nullptr;
@@ -6234,10 +6235,10 @@
// This originally used CSSValueInvalid by accident. It might be more logical to use something else.
RefPtr<CSSPrimitiveValue> amount = CSSValuePool::singleton().createIdentifierValue(CSSValueInvalid);
- region->setTop(amount);
- region->setRight(amount);
- region->setBottom(amount);
- region->setLeft(amount);
+ region->setTop(amount.copyRef());
+ region->setRight(amount.copyRef());
+ region->setBottom(amount.copyRef());
+ region->setLeft(WTFMove(amount));
} else {
// Next four arguments must be offset numbers
for (int i = 0; i < 4; ++i) {
@@ -6252,13 +6253,13 @@
RefPtr<CSSPrimitiveValue> amount = arg->id == CSSValueAuto ? CSSValuePool::singleton().createIdentifierValue(CSSValueAuto) : createPrimitiveNumericValue(argWithCalculation);
if (i == 0)
- region->setTop(amount);
+ region->setTop(WTFMove(amount));
else if (i == 1)
- region->setRight(amount);
+ region->setRight(WTFMove(amount));
else if (i == 2)
- region->setBottom(amount);
+ region->setBottom(WTFMove(amount));
else
- region->setLeft(amount);
+ region->setLeft(WTFMove(amount));
}
}
@@ -6470,13 +6471,13 @@
break;
RefPtr<CSSPrimitiveValue> length = argument->id == CSSValueAuto ? CSSValuePool::singleton().createIdentifierValue(CSSValueAuto) : createPrimitiveNumericValue(argumentWithCalculation);
if (i == 0)
- rect->setTop(length);
+ rect->setTop(WTFMove(length));
else if (i == 1)
- rect->setRight(length);
+ rect->setRight(WTFMove(length));
else if (i == 2)
- rect->setBottom(length);
+ rect->setBottom(WTFMove(length));
else
- rect->setLeft(length);
+ rect->setLeft(WTFMove(length));
argument = args->next();
if (argument && args->size() == 7) {
if (argument->unit == CSSParserValue::Operator && argument->iValue == ',') {
@@ -6651,7 +6652,7 @@
if (!args.currentIndex() && argument->id != CSSValueAt) {
if (RefPtr<CSSPrimitiveValue> radius = parseShapeRadius(*argument)) {
- shape->setRadius(radius);
+ shape->setRadius(WTFMove(radius));
continue;
}
@@ -6663,8 +6664,8 @@
RefPtr<CSSPrimitiveValue> centerY;
parseFillPosition(args, centerX, centerY);
if (centerX && centerY && !args.current()) {
- shape->setCenterX(centerX);
- shape->setCenterY(centerY);
+ shape->setCenterX(WTFMove(centerX));
+ shape->setCenterY(WTFMove(centerY));
} else
return nullptr;
} else
@@ -8245,7 +8246,7 @@
RefPtr<CSSValue> commitWebKitBorderImage()
{
- return createBorderImageValue(m_image, m_imageSlice, m_borderSlice, m_outset, m_repeat);
+ return createBorderImageValue(m_image.copyRef(), m_imageSlice.copyRef(), m_borderSlice.copyRef(), m_outset.copyRef(), m_repeat.copyRef());
}
void commitBorderImage(CSSParser& parser, bool important)
@@ -8447,10 +8448,10 @@
// Now build a rect value to hold all four of our primitive values.
auto quad = Quad::create();
- quad->setTop(m_top);
- quad->setRight(m_right);
- quad->setBottom(m_bottom);
- quad->setLeft(m_left);
+ quad->setTop(m_top.copyRef());
+ quad->setRight(m_right.copyRef());
+ quad->setBottom(m_bottom.copyRef());
+ quad->setLeft(m_left.copyRef());
// Make our new border image value now.
return CSSBorderImageSliceValue::create(CSSValuePool::singleton().createValue(WTFMove(quad)), m_fill);
@@ -8565,10 +8566,10 @@
// Now build a quad value to hold all four of our primitive values.
auto quad = Quad::create();
- quad->setTop(m_top);
- quad->setRight(m_right);
- quad->setBottom(m_bottom);
- quad->setLeft(m_left);
+ quad->setTop(m_top.copyRef());
+ quad->setRight(m_right.copyRef());
+ quad->setBottom(m_bottom.copyRef());
+ quad->setLeft(m_left.copyRef());
// Make our new value now.
return CSSValuePool::singleton().createValue(WTFMove(quad));
@@ -9109,11 +9110,11 @@
return false;
}
- result->setFirstX(centerX);
- result->setSecondX(centerX);
+ result->setFirstX(centerX.copyRef());
+ result->setSecondX(WTFMove(centerX));
// CSS3 radial gradients always share the same start and end point.
- result->setFirstY(centerY);
- result->setSecondY(centerY);
+ result->setFirstY(centerY.copyRef());
+ result->setSecondY(WTFMove(centerY));
RefPtr<CSSPrimitiveValue> shapeValue;
RefPtr<CSSPrimitiveValue> sizeValue;
@@ -9152,8 +9153,8 @@
}
}
- result->setShape(shapeValue);
- result->setSizingBehavior(sizeValue);
+ result->setShape(shapeValue.copyRef());
+ result->setSizingBehavior(sizeValue.copyRef());
// Or, two lengths or percentages
RefPtr<CSSPrimitiveValue> horizontalSize;
@@ -9185,8 +9186,8 @@
if (!horizontalSize != !verticalSize)
return false;
- result->setEndHorizontalSize(horizontalSize);
- result->setEndVerticalSize(verticalSize);
+ result->setEndHorizontalSize(WTFMove(horizontalSize));
+ result->setEndVerticalSize(WTFMove(verticalSize));
if (!parseGradientColorStops(*args, *result, expectComma))
return false;
@@ -9355,10 +9356,10 @@
if (!verticalSize && horizontalSize && horizontalSize->isPercentage())
return false;
- result->setShape(shapeValue);
- result->setSizingBehavior(sizeValue);
- result->setEndHorizontalSize(horizontalSize);
- result->setEndVerticalSize(verticalSize);
+ result->setShape(shapeValue.copyRef());
+ result->setSizingBehavior(sizeValue.copyRef());
+ result->setEndHorizontalSize(horizontalSize.copyRef());
+ result->setEndVerticalSize(verticalSize.copyRef());
// Second part of grammar, the center-position clause:
// at <position>
@@ -9377,11 +9378,11 @@
if (!argument)
return false;
- result->setFirstX(centerX);
- result->setFirstY(centerY);
+ result->setFirstX(centerX.copyRef());
+ result->setFirstY(centerY.copyRef());
// Right now, CSS radial gradients have the same start and end centers.
- result->setSecondX(centerX);
- result->setSecondY(centerY);
+ result->setSecondX(centerX.copyRef());
+ result->setSecondY(centerY.copyRef());
}
if (shapeValue || sizeValue || horizontalSize || centerX || centerY)
Modified: trunk/Source/WebCore/css/CSSParser.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSParser.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSParser.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -20,8 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef CSSParser_h
-#define CSSParser_h
+#pragma once
#include "CSSCalculationValue.h"
#include "CSSGradientValue.h"
@@ -778,5 +777,3 @@
}
} // namespace WebCore
-
-#endif // CSSParser_h
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -19,8 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef CSSPrimitiveValue_h
-#define CSSPrimitiveValue_h
+#pragma once
#include "CSSPropertyNames.h"
#include "CSSValue.h"
@@ -469,5 +468,3 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSPrimitiveValue, isPrimitiveValue())
-
-#endif // CSSPrimitiveValue_h
Modified: trunk/Source/WebCore/css/CSSProperty.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/CSSProperty.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -24,6 +24,7 @@
#include "CSSValueList.h"
#include "RenderStyleConstants.h"
#include "StylePropertyShorthand.h"
+#include "StylePropertyShorthandFunctions.h"
#include <wtf/NeverDestroyed.h>
#include <wtf/text/StringBuilder.h>
Modified: trunk/Source/WebCore/css/CSSProperty.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSProperty.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSProperty.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -19,14 +19,11 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef CSSProperty_h
-#define CSSProperty_h
+#pragma once
#include "CSSPropertyNames.h"
#include "CSSValue.h"
-#include "RenderStyleConstants.h"
#include "WritingMode.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
@@ -64,9 +61,9 @@
class CSSProperty {
public:
- CSSProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> value, bool important = false, bool isSetFromShorthand = false, int indexInShorthandsVector = 0, bool implicit = false)
+ CSSProperty(CSSPropertyID propertyID, RefPtr<CSSValue>&& value, bool important = false, bool isSetFromShorthand = false, int indexInShorthandsVector = 0, bool implicit = false)
: m_metadata(propertyID, isSetFromShorthand, indexInShorthandsVector, important, implicit, isInheritedProperty(propertyID))
- , m_value(value)
+ , m_value(WTFMove(value))
{
}
@@ -180,5 +177,3 @@
static const bool canMoveWithMemcpy = true;
};
}
-
-#endif // CSSProperty_h
Modified: trunk/Source/WebCore/css/CSSRule.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSRule.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSRule.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -20,8 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef CSSRule_h
-#define CSSRule_h
+#pragma once
#include <wtf/RefCounted.h>
#include <wtf/TypeCasts.h>
@@ -123,4 +122,3 @@
static bool isType(const WebCore::CSSRule& rule) { return rule.type() == WebCore::predicate; } \
SPECIALIZE_TYPE_TRAITS_END()
-#endif // CSSRule_h
Modified: trunk/Source/WebCore/css/CSSRuleList.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSRuleList.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSRuleList.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -19,14 +19,11 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef CSSRuleList_h
-#define CSSRuleList_h
+#pragma once
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
namespace WebCore {
@@ -76,19 +73,20 @@
template <class Rule>
class LiveCSSRuleList final : public CSSRuleList {
public:
- LiveCSSRuleList(Rule* rule) : m_rule(rule) { }
+ LiveCSSRuleList(Rule& rule)
+ : m_rule(rule)
+ {
+ }
- void ref() override { m_rule->ref(); }
- void deref() override { m_rule->deref(); }
+ void ref() override { m_rule.ref(); }
+ void deref() override { m_rule.deref(); }
private:
- unsigned length() const override { return m_rule->length(); }
- CSSRule* item(unsigned index) const override { return m_rule->item(index); }
- CSSStyleSheet* styleSheet() const override { return m_rule->parentStyleSheet(); }
+ unsigned length() const override { return m_rule.length(); }
+ CSSRule* item(unsigned index) const override { return m_rule.item(index); }
+ CSSStyleSheet* styleSheet() const override { return m_rule.parentStyleSheet(); }
- Rule* m_rule;
+ Rule& m_rule;
};
} // namespace WebCore
-
-#endif // CSSRuleList_h
Modified: trunk/Source/WebCore/css/CSSSegmentedFontFace.h (201112 => 201113)
--- trunk/Source/WebCore/css/CSSSegmentedFontFace.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/CSSSegmentedFontFace.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -28,9 +28,7 @@
#include "CSSFontFace.h"
#include "FontCache.h"
-#include "FontRanges.h"
#include <wtf/HashMap.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
@@ -38,6 +36,7 @@
class CSSFontSelector;
class FontDescription;
+class FontRanges;
class CSSSegmentedFontFace final : public RefCounted<CSSSegmentedFontFace>, public CSSFontFace::Client {
WTF_MAKE_FAST_ALLOCATED;
Modified: trunk/Source/WebCore/css/Counter.h (201112 => 201113)
--- trunk/Source/WebCore/css/Counter.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/Counter.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -18,8 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef Counter_h
-#define Counter_h
+#pragma once
#include "CSSPrimitiveValue.h"
#include <wtf/text/WTFString.h>
@@ -28,9 +27,9 @@
class Counter : public RefCounted<Counter> {
public:
- static Ref<Counter> create(PassRefPtr<CSSPrimitiveValue> identifier, PassRefPtr<CSSPrimitiveValue> listStyle, PassRefPtr<CSSPrimitiveValue> separator)
+ static Ref<Counter> create(RefPtr<CSSPrimitiveValue>&& identifier, RefPtr<CSSPrimitiveValue>&& listStyle, RefPtr<CSSPrimitiveValue>&& separator)
{
- return adoptRef(*new Counter(identifier, listStyle, separator));
+ return adoptRef(*new Counter(WTFMove(identifier), WTFMove(listStyle), WTFMove(separator)));
}
String identifier() const { return m_identifier ? m_identifier->getStringValue() : String(); }
@@ -39,9 +38,9 @@
CSSValueID listStyleIdent() const { return m_listStyle ? m_listStyle->getValueID() : CSSValueInvalid; }
- void setIdentifier(PassRefPtr<CSSPrimitiveValue> identifier) { m_identifier = identifier; }
- void setListStyle(PassRefPtr<CSSPrimitiveValue> listStyle) { m_listStyle = listStyle; }
- void setSeparator(PassRefPtr<CSSPrimitiveValue> separator) { m_separator = separator; }
+ void setIdentifier(RefPtr<CSSPrimitiveValue>&& identifier) { m_identifier = WTFMove(identifier); }
+ void setListStyle(RefPtr<CSSPrimitiveValue>&& listStyle) { m_listStyle = WTFMove(listStyle); }
+ void setSeparator(RefPtr<CSSPrimitiveValue>&& separator) { m_separator = WTFMove(separator); }
bool equals(const Counter& other) const
{
@@ -58,10 +57,10 @@
}
private:
- Counter(PassRefPtr<CSSPrimitiveValue> identifier, PassRefPtr<CSSPrimitiveValue> listStyle, PassRefPtr<CSSPrimitiveValue> separator)
- : m_identifier(identifier)
- , m_listStyle(listStyle)
- , m_separator(separator)
+ Counter(RefPtr<CSSPrimitiveValue>&& identifier, RefPtr<CSSPrimitiveValue>&& listStyle, RefPtr<CSSPrimitiveValue>&& separator)
+ : m_identifier(WTFMove(identifier))
+ , m_listStyle(WTFMove(listStyle))
+ , m_separator(WTFMove(separator))
{
}
@@ -71,5 +70,3 @@
};
} // namespace WebCore
-
-#endif // Counter_h
Modified: trunk/Source/WebCore/css/Pair.h (201112 => 201113)
--- trunk/Source/WebCore/css/Pair.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/Pair.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -18,16 +18,14 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef Pair_h
-#define Pair_h
+#pragma once
#include <wtf/RefCounted.h>
-#include "CSSPrimitiveValue.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/StringBuilder.h>
namespace WebCore {
+class CSSPrimitiveValue;
+
// A primitive value representing a pair. This is useful for properties like border-radius, background-size/position,
// and border-spacing (all of which are space-separated sets of two values). At the moment we are only using it for
// border-radius and background-size, but (FIXME) border-spacing and background-position could be converted over to use
@@ -73,5 +71,3 @@
};
} // namespace
-
-#endif
Modified: trunk/Source/WebCore/css/Rect.h (201112 => 201113)
--- trunk/Source/WebCore/css/Rect.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/Rect.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -18,8 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef Rect_h
-#define Rect_h
+#pragma once
#include "CSSPrimitiveValue.h"
#include <wtf/RefPtr.h>
@@ -34,10 +33,10 @@
CSSPrimitiveValue* bottom() const { return m_bottom.get(); }
CSSPrimitiveValue* left() const { return m_left.get(); }
- void setTop(PassRefPtr<CSSPrimitiveValue> top) { m_top = top; }
- void setRight(PassRefPtr<CSSPrimitiveValue> right) { m_right = right; }
- void setBottom(PassRefPtr<CSSPrimitiveValue> bottom) { m_bottom = bottom; }
- void setLeft(PassRefPtr<CSSPrimitiveValue> left) { m_left = left; }
+ void setTop(RefPtr<CSSPrimitiveValue>&& top) { m_top = WTFMove(top); }
+ void setRight(RefPtr<CSSPrimitiveValue>&& right) { m_right = WTFMove(right); }
+ void setBottom(RefPtr<CSSPrimitiveValue>&& bottom) { m_bottom = WTFMove(bottom); }
+ void setLeft(RefPtr<CSSPrimitiveValue>&& left) { m_left = WTFMove(left); }
bool equals(const RectBase& other) const
{
@@ -123,5 +122,3 @@
};
} // namespace WebCore
-
-#endif // Rect_h
Modified: trunk/Source/WebCore/css/RuleSet.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/RuleSet.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -42,6 +42,7 @@
#include "StyleRule.h"
#include "StyleRuleImport.h"
#include "StyleSheetContents.h"
+#include "ViewportStyleResolver.h"
#if ENABLE(VIDEO_TRACK)
#include "TextTrackCue.h"
Modified: trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -93,12 +93,11 @@
return list;
}
-RefPtr<SVGPaint> ComputedStyleExtractor::adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint> newPaint, const RenderStyle* style) const
+RefPtr<SVGPaint> ComputedStyleExtractor::adjustSVGPaintForCurrentColor(RefPtr<SVGPaint>&& paint, const RenderStyle* style) const
{
- RefPtr<SVGPaint> paint = newPaint;
if (paint->paintType() == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR || paint->paintType() == SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR)
paint->setColor(style->color());
- return paint;
+ return WTFMove(paint);
}
RefPtr<CSSValue> ComputedStyleExtractor::svgPropertyValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const
Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (201112 => 201113)
--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -503,7 +503,7 @@
auto& primitiveValue = downcast<CSSPrimitiveValue>(currentValue.get());
if (primitiveValue.isShape()) {
ASSERT(!operation);
- operation = ShapeClipPathOperation::create(basicShapeForValue(styleResolver.state().cssToLengthConversionData(), primitiveValue.getShapeValue()));
+ operation = ShapeClipPathOperation::create(basicShapeForValue(styleResolver.state().cssToLengthConversionData(), *primitiveValue.getShapeValue()));
} else {
ASSERT(primitiveValue.getValueID() == CSSValueContentBox
|| primitiveValue.getValueID() == CSSValueBorderBox
@@ -751,7 +751,7 @@
for (auto& currentValue : downcast<CSSValueList>(value)) {
CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(currentValue.get());
if (primitiveValue.isShape())
- shape = basicShapeForValue(styleResolver.state().cssToLengthConversionData(), primitiveValue.getShapeValue());
+ shape = basicShapeForValue(styleResolver.state().cssToLengthConversionData(), *primitiveValue.getShapeValue());
else if (primitiveValue.getValueID() == CSSValueContentBox
|| primitiveValue.getValueID() == CSSValueBorderBox
|| primitiveValue.getValueID() == CSSValuePaddingBox
Modified: trunk/Source/WebCore/css/StyleProperties.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/StyleProperties.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -33,6 +33,7 @@
#include "Document.h"
#include "PropertySetCSSStyleDeclaration.h"
#include "StylePropertyShorthand.h"
+#include "StylePropertyShorthandFunctions.h"
#include "StyleSheetContents.h"
#include <bitset>
#include <wtf/text/StringBuilder.h>
@@ -606,9 +607,9 @@
return result.isEmpty() ? String() : result.toString();
}
-PassRefPtr<CSSValue> StyleProperties::getPropertyCSSValue(CSSPropertyID propertyID) const
+RefPtr<CSSValue> StyleProperties::getPropertyCSSValue(CSSPropertyID propertyID) const
{
- PassRefPtr<CSSValue> value = getPropertyCSSValueInternal(propertyID);
+ RefPtr<CSSValue> value = getPropertyCSSValueInternal(propertyID);
if (value && value->isVariableDependentValue()) {
auto& dependentValue = downcast<CSSVariableDependentValue>(*value);
if (dependentValue.propertyID() != propertyID)
@@ -617,7 +618,7 @@
return value;
}
-PassRefPtr<CSSValue> StyleProperties::getPropertyCSSValueInternal(CSSPropertyID propertyID) const
+RefPtr<CSSValue> StyleProperties::getPropertyCSSValueInternal(CSSPropertyID propertyID) const
{
int foundPropertyIndex = findPropertyIndex(propertyID);
if (foundPropertyIndex == -1)
@@ -751,19 +752,18 @@
return CSSParser::parseCustomPropertyValue(this, propertyName, value, important, cssParserMode(), contextStyleSheet) == CSSParser::ParseResult::Changed;
}
-void MutableStyleProperties::setProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> prpValue, bool important)
+void MutableStyleProperties::setProperty(CSSPropertyID propertyID, RefPtr<CSSValue>&& value, bool important)
{
StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
if (!shorthand.length()) {
- setProperty(CSSProperty(propertyID, prpValue, important));
+ setProperty(CSSProperty(propertyID, WTFMove(value), important));
return;
}
removePropertiesInSet(shorthand.properties(), shorthand.length());
- RefPtr<CSSValue> value = prpValue;
for (unsigned i = 0; i < shorthand.length(); ++i)
- m_propertyVector.append(CSSProperty(shorthand.properties()[i], value, important));
+ m_propertyVector.append(CSSProperty(shorthand.properties()[i], value.copyRef(), important));
}
bool MutableStyleProperties::setProperty(const CSSProperty& property, CSSProperty* slot)
Modified: trunk/Source/WebCore/css/StyleProperties.h (201112 => 201113)
--- trunk/Source/WebCore/css/StyleProperties.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StyleProperties.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -19,13 +19,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef StyleProperties_h
-#define StyleProperties_h
+#pragma once
#include "CSSParserMode.h"
-#include "CSSPrimitiveValue.h"
#include "CSSProperty.h"
-#include "CSSPropertyNames.h"
#include "CSSValueKeywords.h"
#include <memory>
#include <wtf/ListHashSet.h>
@@ -85,7 +82,7 @@
bool isEmpty() const { return !propertyCount(); }
PropertyReference propertyAt(unsigned) const;
- WEBCORE_EXPORT PassRefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
+ WEBCORE_EXPORT RefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
WEBCORE_EXPORT String getPropertyValue(CSSPropertyID) const;
bool propertyIsImportant(CSSPropertyID) const;
String getPropertyShorthand(CSSPropertyID) const;
@@ -152,7 +149,7 @@
String fontValue() const;
void appendFontLonghandValueIfExplicit(CSSPropertyID, StringBuilder& result, String& value) const;
- PassRefPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) const;
+ RefPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) const;
friend class PropertySetCSSStyleDeclaration;
};
@@ -205,7 +202,7 @@
// These expand shorthand properties into multiple properties.
bool setProperty(CSSPropertyID, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
- void setProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important = false);
+ void setProperty(CSSPropertyID, RefPtr<CSSValue>&&, bool important = false);
// These do not. FIXME: This is too messy, we can do better.
bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
@@ -305,5 +302,3 @@
SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ImmutableStyleProperties)
static bool isType(const WebCore::StyleProperties& set) { return !set.isMutable(); }
SPECIALIZE_TYPE_TRAITS_END()
-
-#endif // StyleProperties_h
Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -21,9 +21,8 @@
#include "config.h"
#include "StylePropertyShorthand.h"
+#include "StylePropertyShorthandFunctions.h"
-#include <wtf/StdLibExtras.h>
-
namespace WebCore {
StylePropertyShorthand borderAbridgedShorthand()
Modified: trunk/Source/WebCore/css/StylePropertyShorthand.h (201112 => 201113)
--- trunk/Source/WebCore/css/StylePropertyShorthand.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -19,24 +19,16 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef StylePropertyShorthand_h
-#define StylePropertyShorthand_h
+#pragma once
#include "CSSPropertyNames.h"
-#include "StylePropertyShorthandFunctions.h"
#include <wtf/Vector.h>
namespace WebCore {
class StylePropertyShorthand {
public:
- StylePropertyShorthand()
- : m_properties(0)
- , m_propertiesForInitialization(0)
- , m_length(0)
- , m_shorthandID(CSSPropertyInvalid)
- {
- }
+ StylePropertyShorthand() = default;
template<unsigned numProperties>
StylePropertyShorthand(CSSPropertyID id, const CSSPropertyID (&properties)[numProperties], const StylePropertyShorthand* propertiesForInitialization = nullptr)
@@ -53,10 +45,10 @@
CSSPropertyID id() const { return m_shorthandID; }
private:
- const CSSPropertyID* m_properties;
- const StylePropertyShorthand* m_propertiesForInitialization;
- unsigned m_length;
- CSSPropertyID m_shorthandID;
+ const CSSPropertyID* m_properties { nullptr };
+ const StylePropertyShorthand* m_propertiesForInitialization { nullptr };
+ unsigned m_length { 0 };
+ CSSPropertyID m_shorthandID { CSSPropertyInvalid };
};
// Custom StylePropertyShorthand functions.
@@ -76,5 +68,3 @@
bool isShorthandCSSProperty(CSSPropertyID);
} // namespace WebCore
-
-#endif // StylePropertyShorthand_h
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -303,10 +303,10 @@
}
// This is a simplified style setting function for keyframe styles
-void StyleResolver::addKeyframeStyle(PassRefPtr<StyleRuleKeyframes> rule)
+void StyleResolver::addKeyframeStyle(RefPtr<StyleRuleKeyframes>&& rule)
{
AtomicString s(rule->name());
- m_keyframesRuleMap.set(s.impl(), rule);
+ m_keyframesRuleMap.set(s.impl(), WTFMove(rule));
}
StyleResolver::~StyleResolver()
@@ -1663,7 +1663,7 @@
return parser.parseVariableDependentValue(propID, value, m_state.style()->customProperties());
}
-PassRefPtr<StyleImage> StyleResolver::styleImage(CSSPropertyID property, CSSValue& value)
+RefPtr<StyleImage> StyleResolver::styleImage(CSSPropertyID property, CSSValue& value)
{
if (is<CSSImageValue>(value))
return cachedOrPendingFromValue(property, downcast<CSSImageValue>(value));
@@ -1693,7 +1693,7 @@
return image;
}
-PassRefPtr<StyleImage> StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue& value)
+Ref<StyleImage> StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue& value)
{
if (is<CSSFilterImageValue>(value)) {
// FilterImage needs to calculate FilterOperations.
@@ -2083,7 +2083,7 @@
return true;
}
-PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage, const ResourceLoaderOptions& options)
+RefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage, const ResourceLoaderOptions& options)
{
if (auto imageValue = pendingImage.cssImageValue())
return imageValue->cachedImage(m_state.document().cachedResourceLoader(), options);
@@ -2104,7 +2104,7 @@
return nullptr;
}
-PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage)
+RefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage)
{
ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
options.setContentSecurityPolicyImposition(m_state.element() && m_state.element()->isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
Modified: trunk/Source/WebCore/css/StyleResolver.h (201112 => 201113)
--- trunk/Source/WebCore/css/StyleResolver.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -19,25 +19,17 @@
*
*/
-#ifndef StyleResolver_h
-#define StyleResolver_h
+#pragma once
#include "CSSToLengthConversionData.h"
#include "CSSToStyleMap.h"
-#include "CSSValueList.h"
#include "DocumentRuleSets.h"
#include "InspectorCSSOMWrappers.h"
-#include "LinkHash.h"
#include "MediaQueryEvaluator.h"
#include "RenderStyle.h"
#include "RuleFeature.h"
#include "RuleSet.h"
-#include "RuntimeEnabledFeatures.h"
-#include "ScrollTypes.h"
#include "SelectorChecker.h"
-#include "StyleInheritedData.h"
-#include "StyleRelations.h"
-#include "ViewportStyleResolver.h"
#include <bitset>
#include <memory>
#include <wtf/HashMap.h>
@@ -213,7 +205,7 @@
bool hasViewportDependentMediaQueries() const { return !m_viewportDependentMediaQueryResults.isEmpty(); }
bool hasMediaQueriesAffectedByViewportChange() const;
- void addKeyframeStyle(PassRefPtr<StyleRuleKeyframes>);
+ void addKeyframeStyle(RefPtr<StyleRuleKeyframes>&&);
bool checkRegionStyle(const Element* regionElement);
@@ -463,9 +455,9 @@
State& state() { return m_state; }
- PassRefPtr<StyleImage> styleImage(CSSPropertyID, CSSValue&);
+ RefPtr<StyleImage> styleImage(CSSPropertyID, CSSValue&);
RefPtr<StyleImage> cachedOrPendingFromValue(CSSPropertyID, CSSImageValue&);
- PassRefPtr<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue&);
+ Ref<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue&);
#if ENABLE(CSS_IMAGE_SET)
RefPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, CSSImageSetValue&);
#endif
@@ -497,8 +489,8 @@
void applySVGProperty(CSSPropertyID, CSSValue*);
- PassRefPtr<StyleImage> loadPendingImage(const StylePendingImage&, const ResourceLoaderOptions&);
- PassRefPtr<StyleImage> loadPendingImage(const StylePendingImage&);
+ RefPtr<StyleImage> loadPendingImage(const StylePendingImage&, const ResourceLoaderOptions&);
+ RefPtr<StyleImage> loadPendingImage(const StylePendingImage&);
void loadPendingImages();
#if ENABLE(CSS_SHAPES)
void loadPendingShapeImage(ShapeValue*);
@@ -590,5 +582,3 @@
}
} // namespace WebCore
-
-#endif // StyleResolver_h
Modified: trunk/Source/WebCore/css/StyleSheetList.h (201112 => 201113)
--- trunk/Source/WebCore/css/StyleSheetList.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/StyleSheetList.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -18,12 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef StyleSheetList_h
-#define StyleSheetList_h
+#pragma once
#include <wtf/Forward.h>
#include <wtf/RefCounted.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -56,5 +54,3 @@
};
} // namespace WebCore
-
-#endif // StyleSheetList_h
Modified: trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -27,7 +27,6 @@
#include "WebKitCSSFilterValue.h"
#include "CSSValueList.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/css/WebKitCSSFilterValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/WebKitCSSFilterValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/WebKitCSSFilterValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -27,7 +27,6 @@
#define WebKitCSSFilterValue_h
#include "CSSValueList.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
Modified: trunk/Source/WebCore/css/WebKitCSSTransformValue.cpp (201112 => 201113)
--- trunk/Source/WebCore/css/WebKitCSSTransformValue.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/WebKitCSSTransformValue.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -27,14 +27,13 @@
#include "WebKitCSSTransformValue.h"
#include "CSSValueList.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
namespace WebCore {
// These names must be kept in sync with TransformOperationType.
const char* const transformNamePrefixes[] = {
- 0,
+ nullptr,
"translate(",
"translateX(",
"translateY(",
Modified: trunk/Source/WebCore/css/WebKitCSSTransformValue.h (201112 => 201113)
--- trunk/Source/WebCore/css/WebKitCSSTransformValue.h 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/css/WebKitCSSTransformValue.h 2016-05-18 23:09:09 UTC (rev 201113)
@@ -23,11 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebKitCSSTransformValue_h
-#define WebKitCSSTransformValue_h
+#pragma once
#include "CSSValueList.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
@@ -82,5 +80,3 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(WebKitCSSTransformValue, isWebKitCSSTransformValue())
-
-#endif
Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (201112 => 201113)
--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2016-05-18 23:09:09 UTC (rev 201113)
@@ -31,6 +31,7 @@
#include "Shape.h"
#include "BasicShapeFunctions.h"
+#include "BasicShapes.h"
#include "BoxShape.h"
#include "GraphicsContext.h"
#include "ImageBuffer.h"
Modified: trunk/Source/WebKit2/ChangeLog (201112 => 201113)
--- trunk/Source/WebKit2/ChangeLog 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-18 23:09:09 UTC (rev 201113)
@@ -1,3 +1,12 @@
+2016-05-18 Alex Christensen <achristen...@webkit.org>
+
+ Clean up CSS code
+ https://bugs.webkit.org/show_bug.cgi?id=157808
+
+ Reviewed by Chris Dumez.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+
2016-05-18 Jer Noble <jer.no...@apple.com>
Disable default user gesture requirement for audio playback on Mac
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (201112 => 201113)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-05-18 23:08:16 UTC (rev 201112)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-05-18 23:09:09 UTC (rev 201113)
@@ -90,6 +90,7 @@
#import <WebCore/WebCoreNSStringExtras.h>
#import <WebKitSystemInterface.h>
#import <sys/stat.h>
+#import <wtf/NeverDestroyed.h>
#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WebViewImplIncludes.h>
