Diff
Modified: trunk/Source/WebCore/ChangeLog (194416 => 194417)
--- trunk/Source/WebCore/ChangeLog 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/ChangeLog 2015-12-25 05:37:22 UTC (rev 194417)
@@ -1,5 +1,30 @@
2015-12-24 Simon Fraser <[email protected]>
+ Use an enum for RenderElement's baseTypeFlags
+ https://bugs.webkit.org/show_bug.cgi?id=152553
+
+ Reviewed by Zalan Bujtas.
+
+ Use an enum, rather than unsigned, for the BaseTypeFlags bit mask.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::RenderBlock):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::RenderBox):
+ * rendering/RenderBox.h:
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::RenderBoxModelObject):
+ * rendering/RenderBoxModelObject.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::RenderElement):
+ * rendering/RenderElement.h:
+ * rendering/RenderLayerModelObject.cpp:
+ (WebCore::RenderLayerModelObject::RenderLayerModelObject):
+ * rendering/RenderLayerModelObject.h:
+
+2015-12-24 Simon Fraser <[email protected]>
+
Remove the unused #define _USE_MATH_DEFINES
https://bugs.webkit.org/show_bug.cgi?id=152034
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-12-25 05:37:22 UTC (rev 194417)
@@ -181,12 +181,12 @@
bool m_hadVerticalLayoutOverflow;
};
-RenderBlock::RenderBlock(Element& element, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderBlock::RenderBlock(Element& element, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderBox(element, WTF::move(style), baseTypeFlags | RenderBlockFlag)
{
}
-RenderBlock::RenderBlock(Document& document, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderBlock::RenderBlock(Document& document, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderBox(document, WTF::move(style), baseTypeFlags | RenderBlockFlag)
{
}
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2015-12-25 05:37:22 UTC (rev 194417)
@@ -60,8 +60,8 @@
friend class LineLayoutState;
protected:
- RenderBlock(Element&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
- RenderBlock(Document&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
+ RenderBlock(Element&, Ref<RenderStyle>&&, BaseTypeFlags);
+ RenderBlock(Document&, Ref<RenderStyle>&&, BaseTypeFlags);
virtual ~RenderBlock();
public:
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-12-25 05:37:22 UTC (rev 194417)
@@ -117,7 +117,7 @@
&& (documentElementRenderer == bodyElementRenderer->parent());
}
-RenderBox::RenderBox(Element& element, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderBox::RenderBox(Element& element, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderBoxModelObject(element, WTF::move(style), baseTypeFlags)
, m_minPreferredLogicalWidth(-1)
, m_maxPreferredLogicalWidth(-1)
@@ -126,7 +126,7 @@
setIsBox();
}
-RenderBox::RenderBox(Document& document, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderBox::RenderBox(Document& document, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderBoxModelObject(document, WTF::move(style), baseTypeFlags)
, m_minPreferredLogicalWidth(-1)
, m_maxPreferredLogicalWidth(-1)
Modified: trunk/Source/WebCore/rendering/RenderBox.h (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderBox.h 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-12-25 05:37:22 UTC (rev 194417)
@@ -628,8 +628,8 @@
const RenderBox* findEnclosingScrollableContainer() const;
protected:
- RenderBox(Element&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
- RenderBox(Document&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
+ RenderBox(Element&, Ref<RenderStyle>&&, BaseTypeFlags);
+ RenderBox(Document&, Ref<RenderStyle>&&, BaseTypeFlags);
virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-12-25 05:37:22 UTC (rev 194417)
@@ -166,12 +166,12 @@
return view().imageQualityController().shouldPaintAtLowQuality(context, this, image, layer, size);
}
-RenderBoxModelObject::RenderBoxModelObject(Element& element, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderBoxModelObject::RenderBoxModelObject(Element& element, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderLayerModelObject(element, WTF::move(style), baseTypeFlags | RenderBoxModelObjectFlag)
{
}
-RenderBoxModelObject::RenderBoxModelObject(Document& document, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderBoxModelObject::RenderBoxModelObject(Document& document, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderLayerModelObject(document, WTF::move(style), baseTypeFlags | RenderBoxModelObjectFlag)
{
}
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-12-25 05:37:22 UTC (rev 194417)
@@ -236,8 +236,8 @@
void suspendAnimations(double time = 0);
protected:
- RenderBoxModelObject(Element&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
- RenderBoxModelObject(Document&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
+ RenderBoxModelObject(Element&, Ref<RenderStyle>&&, BaseTypeFlags);
+ RenderBoxModelObject(Document&, Ref<RenderStyle>&&, BaseTypeFlags);
virtual void willBeDestroyed() override;
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-12-25 05:37:22 UTC (rev 194417)
@@ -81,7 +81,7 @@
return map;
}
-inline RenderElement::RenderElement(ContainerNode& elementOrDocument, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+inline RenderElement::RenderElement(ContainerNode& elementOrDocument, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderObject(elementOrDocument)
, m_baseTypeFlags(baseTypeFlags)
, m_ancestorLineBoxDirty(false)
@@ -103,12 +103,12 @@
{
}
-RenderElement::RenderElement(Element& element, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderElement::RenderElement(Element& element, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderElement(static_cast<ContainerNode&>(element), WTF::move(style), baseTypeFlags)
{
}
-RenderElement::RenderElement(Document& document, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderElement::RenderElement(Document& document, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderElement(static_cast<ContainerNode&>(document), WTF::move(style), baseTypeFlags)
{
}
Modified: trunk/Source/WebCore/rendering/RenderElement.h (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderElement.h 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2015-12-25 05:37:22 UTC (rev 194417)
@@ -218,17 +218,19 @@
bool childRequiresTable(const RenderObject& child) const;
protected:
- enum BaseTypeFlags {
- RenderLayerModelObjectFlag = 1 << 0,
- RenderBoxModelObjectFlag = 1 << 1,
- RenderInlineFlag = 1 << 2,
- RenderReplacedFlag = 1 << 3,
- RenderBlockFlag = 1 << 4,
- RenderBlockFlowFlag = 1 << 5,
+ enum BaseTypeFlag {
+ RenderLayerModelObjectFlag = 1 << 0,
+ RenderBoxModelObjectFlag = 1 << 1,
+ RenderInlineFlag = 1 << 2,
+ RenderReplacedFlag = 1 << 3,
+ RenderBlockFlag = 1 << 4,
+ RenderBlockFlowFlag = 1 << 5,
};
+
+ typedef unsigned BaseTypeFlags;
- RenderElement(Element&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
- RenderElement(Document&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
+ RenderElement(Element&, Ref<RenderStyle>&&, BaseTypeFlags);
+ RenderElement(Document&, Ref<RenderStyle>&&, BaseTypeFlags);
bool layerCreationAllowedForSubtree() const;
@@ -276,7 +278,7 @@
void paintOutline(PaintInfo&, const LayoutRect&);
private:
- RenderElement(ContainerNode&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
+ RenderElement(ContainerNode&, Ref<RenderStyle>&&, BaseTypeFlags);
void node() const = delete;
void nonPseudoNode() const = delete;
void generatingNode() const = delete;
Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2015-12-25 05:37:22 UTC (rev 194417)
@@ -36,12 +36,12 @@
bool RenderLayerModelObject::s_hadTransform = false;
bool RenderLayerModelObject::s_layerWasSelfPainting = false;
-RenderLayerModelObject::RenderLayerModelObject(Element& element, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderLayerModelObject::RenderLayerModelObject(Element& element, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderElement(element, WTF::move(style), baseTypeFlags | RenderLayerModelObjectFlag)
{
}
-RenderLayerModelObject::RenderLayerModelObject(Document& document, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
+RenderLayerModelObject::RenderLayerModelObject(Document& document, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
: RenderElement(document, WTF::move(style), baseTypeFlags | RenderLayerModelObjectFlag)
{
}
Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.h (194416 => 194417)
--- trunk/Source/WebCore/rendering/RenderLayerModelObject.h 2015-12-24 20:47:50 UTC (rev 194416)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.h 2015-12-25 05:37:22 UTC (rev 194417)
@@ -52,8 +52,8 @@
virtual bool isScrollableOrRubberbandableBox() const { return false; }
protected:
- RenderLayerModelObject(Element&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
- RenderLayerModelObject(Document&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
+ RenderLayerModelObject(Element&, Ref<RenderStyle>&&, BaseTypeFlags);
+ RenderLayerModelObject(Document&, Ref<RenderStyle>&&, BaseTypeFlags);
void createLayer();
