Title: [152346] trunk/Source/WebCore
- Revision
- 152346
- Author
- [email protected]
- Date
- 2013-07-03 03:00:59 -0700 (Wed, 03 Jul 2013)
Log Message
Unreviewed build fix after r152320 and r152345 for build configurations that enable
SVG support but disable CSS regions support.
* svg/SVGElement.cpp: Wrap shouldMoveToFlowThread override into the ENABLE(CSS_REGIONS) build guard.
* svg/SVGElement.h: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152345 => 152346)
--- trunk/Source/WebCore/ChangeLog 2013-07-03 09:02:43 UTC (rev 152345)
+++ trunk/Source/WebCore/ChangeLog 2013-07-03 10:00:59 UTC (rev 152346)
@@ -1,3 +1,11 @@
+2013-07-03 Zan Dobersek <[email protected]>
+
+ Unreviewed build fix after r152320 and r152345 for build configurations that enable
+ SVG support but disable CSS regions support.
+
+ * svg/SVGElement.cpp: Wrap shouldMoveToFlowThread override into the ENABLE(CSS_REGIONS) build guard.
+ * svg/SVGElement.h: Ditto.
+
2013-07-03 Radu Stavila <[email protected]>
[CSS Regions] Improve implementation of elements in region being flowed to another flow thread
Modified: trunk/Source/WebCore/svg/SVGElement.cpp (152345 => 152346)
--- trunk/Source/WebCore/svg/SVGElement.cpp 2013-07-03 09:02:43 UTC (rev 152345)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2013-07-03 10:00:59 UTC (rev 152346)
@@ -460,11 +460,13 @@
return false;
}
+#if ENABLE(CSS_REGIONS)
bool SVGElement::shouldMoveToFlowThread(RenderStyle* styleToUse) const
{
// Allow only svg root elements to be directly collected by a render flow thread.
return parentNode() && !parentNode()->isSVGElement() && hasTagName(SVGNames::svgTag) && Element::shouldMoveToFlowThread(styleToUse);
}
+#endif
void SVGElement::sendSVGLoadEventIfPossible(bool sendParentLoadEvents)
{
Modified: trunk/Source/WebCore/svg/SVGElement.h (152345 => 152346)
--- trunk/Source/WebCore/svg/SVGElement.h 2013-07-03 09:02:43 UTC (rev 152345)
+++ trunk/Source/WebCore/svg/SVGElement.h 2013-07-03 10:00:59 UTC (rev 152346)
@@ -120,7 +120,9 @@
virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture) OVERRIDE;
virtual bool removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture) OVERRIDE;
+#if ENABLE(CSS_REGIONS)
virtual bool shouldMoveToFlowThread(RenderStyle*) const OVERRIDE;
+#endif
protected:
SVGElement(const QualifiedName&, Document*, ConstructionType = CreateSVGElement);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
