Attachment #205979 for bug #118300

View Details Raw Unified Return to Bug 118300

| Differences between



2013-07-03  Zoltan Arvai  <zarvai@inf.u-szeged.hu>

        Fixing guards for !ENABLE(CSS_REGIONS) builds after r152320.

        Reviewed by NOBODY (OOPS!).

        * dom/Element.h:
        * dom/NodeRenderingContext.cpp:
        (WebCore::NodeRenderingContext::elementInsideRegionNeedsRenderer):
        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):

2013-07-02  Ryosuke Niwa  <rniwa@webkit.org>

        Modernize QualifiedName by wrapping gNameCache in a function and using more early exits

Lines 635-643 public: a/Source/WebCore/dom/Element.h_sec1
- a/Source/WebCore/dom/Element.h -1 / +2 lines
635	PassRefPtr<RenderStyle> styleForRenderer();	635	PassRefPtr<RenderStyle> styleForRenderer();
636		636
637	RenderRegion* renderRegion() const;	637	RenderRegion* renderRegion() const;
		638
		639	#if ENABLE(CSS_REGIONS)
638	virtual bool shouldMoveToFlowThread(RenderStyle*) const;	640	virtual bool shouldMoveToFlowThread(RenderStyle*) const;
639		641
640	#if ENABLE(CSS_REGIONS)
641	const AtomicString& webkitRegionOverset() const;	642	const AtomicString& webkitRegionOverset() const;
642	Vector<RefPtr<Range> > webkitGetRegionFlowRanges() const;	643	Vector<RefPtr<Range> > webkitGetRegionFlowRanges() const;
643	#endif	644	#endif




        if (!m_style)
            m_style = element->styleForRenderer();
#if ENABLE(CSS_REGIONS)
        elementInsideRegionNeedsRenderer = element->shouldMoveToFlowThread(m_style.get());
#endif
        // Children of this element will only be allowed to be flowed into other flow-threads if display is NOT none.
        if (element->rendererIsNeeded(*this))
            element->setIsInsideRegion(true);


void NodeRenderingContext::moveToFlowThreadIfNeeded()
{
#if ENABLE(CSS_REGIONS)
    Element* element = toElement(m_node);

    if (!element->shouldMoveToFlowThread(m_style.get()))

    FlowThreadController* flowThreadController = m_node->document()->renderView()->flowThreadController();
    m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName(m_style->flowThread());
    flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRenderer);
#endif
}

bool NodeRenderingContext::isOnEncapsulationBoundary() const

Return to Bug 118300

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +11 lines
		1	2013-07-03 Zoltan Arvai <zarvai@inf.u-szeged.hu>
		2
		3	Fixing guards for !ENABLE(CSS_REGIONS) builds after r152320.
		4
		5	Reviewed by NOBODY (OOPS!).
		6
		7	* dom/Element.h:
		8	* dom/NodeRenderingContext.cpp:
		9	(WebCore::NodeRenderingContext::elementInsideRegionNeedsRenderer):
		10	(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
		11
1	2013-07-02 Ryosuke Niwa <rniwa@webkit.org>	12	2013-07-02 Ryosuke Niwa <rniwa@webkit.org>
2		13
3	Modernize QualifiedName by wrapping gNameCache in a function and using more early exits	14	Modernize QualifiedName by wrapping gNameCache in a function and using more early exits

Lines 207-215 bool NodeRenderingContext::elementInsideRegionNeedsRenderer() a/Source/WebCore/dom/NodeRenderingContext.cpp_sec1
- a/Source/WebCore/dom/NodeRenderingContext.cpp -2 / +4 lines
207		207
208	if (!m_style)	208	if (!m_style)
209	m_style = element->styleForRenderer();	209	m_style = element->styleForRenderer();
210		210	#if ENABLE(CSS_REGIONS)
211	elementInsideRegionNeedsRenderer = element->shouldMoveToFlowThread(m_style.get());	211	elementInsideRegionNeedsRenderer = element->shouldMoveToFlowThread(m_style.get());
212		212	#endif
213	// Children of this element will only be allowed to be flowed into other flow-threads if display is NOT none.	213	// Children of this element will only be allowed to be flowed into other flow-threads if display is NOT none.
214	if (element->rendererIsNeeded(*this))	214	if (element->rendererIsNeeded(*this))
215	element->setIsInsideRegion(true);	215	element->setIsInsideRegion(true);
Lines 220-225 bool NodeRenderingContext::elementInsideRegionNeedsRenderer() a/Source/WebCore/dom/NodeRenderingContext.cpp_sec2
220		220
221	void NodeRenderingContext::moveToFlowThreadIfNeeded()	221	void NodeRenderingContext::moveToFlowThreadIfNeeded()
222	{	222	{
		223	#if ENABLE(CSS_REGIONS)
223	Element* element = toElement(m_node);	224	Element* element = toElement(m_node);
224		225
225	if (!element->shouldMoveToFlowThread(m_style.get()))	226	if (!element->shouldMoveToFlowThread(m_style.get()))
Lines 229-234 void NodeRenderingContext::moveToFlowThreadIfNeeded() a/Source/WebCore/dom/NodeRenderingContext.cpp_sec3
229	FlowThreadController* flowThreadController = m_node->document()->renderView()->flowThreadController();	230	FlowThreadController* flowThreadController = m_node->document()->renderView()->flowThreadController();
230	m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName(m_style->flowThread());	231	m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName(m_style->flowThread());
231	flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRenderer);	232	flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRenderer);
		233	#endif
232	}	234	}
233		235
234	bool NodeRenderingContext::isOnEncapsulationBoundary() const	236	bool NodeRenderingContext::isOnEncapsulationBoundary() const