Changeset 107650 in webkit

Timestamp:

Feb 13, 2012 5:34:31 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Implement Element.webkitRegionOverflow

[CSSRegions][CSSOM] Implement Element.regionOverflow
​https://bugs.webkit.org/show_bug.cgi?id=77863

Patch by Raul Hudea <​rhudea@adobe.com> on 2012-02-13
Reviewed by David Hyatt.

Source/WebCore:

On each layout, compute the overflowState for each region belonging to the flow thread

Tests: fast/regions/element-region-overflow-state-vertical-rl.html

fast/regions/element-region-overflow-state.html

• dom/Element.cpp:

(WebCore::Element::webkitRegionOverflow):
(WebCore):

• dom/Element.h:
• dom/Element.idl:
• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeOverflow):

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::computeOverflowStateForRegions):
(WebCore):

• rendering/RenderFlowThread.h:
• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::RenderRegion):

• rendering/RenderRegion.h:

(RenderRegion):
(WebCore::RenderRegion::regionState):
(WebCore::RenderRegion::setRegionState):

LayoutTests:

• fast/regions/element-region-overflow-state-expected.txt: Added.
• fast/regions/element-region-overflow-state-vertical-rl-expected.txt: Added.
• fast/regions/element-region-overflow-state-vertical-rl.html: Added.
• fast/regions/element-region-overflow-state.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/element-region-overflow-state-expected.txt (added)
• LayoutTests/fast/regions/element-region-overflow-state-vertical-rl-expected.txt (added)
• LayoutTests/fast/regions/element-region-overflow-state-vertical-rl.html (added)
• LayoutTests/fast/regions/element-region-overflow-state.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/Element.idl (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-13  Raul Hudea  <rhudea@adobe.com>
+
+        Implement Element.webkitRegionOverflow
+
+        [CSSRegions][CSSOM] Implement Element.regionOverflow
+        https://bugs.webkit.org/show_bug.cgi?id=77863
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/element-region-overflow-state-expected.txt: Added.
+        * fast/regions/element-region-overflow-state-vertical-rl-expected.txt: Added.
+        * fast/regions/element-region-overflow-state-vertical-rl.html: Added.
+        * fast/regions/element-region-overflow-state.html: Added.
+
 2012-02-13  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-13  Raul Hudea  <rhudea@adobe.com>
+
+        Implement Element.webkitRegionOverflow
+
+        [CSSRegions][CSSOM] Implement Element.regionOverflow
+        https://bugs.webkit.org/show_bug.cgi?id=77863
+
+        Reviewed by David Hyatt.
+
+        On each layout, compute the overflowState for each region belonging to the flow thread
+
+        Tests: fast/regions/element-region-overflow-state-vertical-rl.html
+               fast/regions/element-region-overflow-state.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::webkitRegionOverflow):
+        (WebCore):
+        * dom/Element.h:
+        * dom/Element.idl:
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeOverflow):
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::computeOverflowStateForRegions):
+        (WebCore):
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::RenderRegion):
+        * rendering/RenderRegion.h:
+        (RenderRegion):
+        (WebCore::RenderRegion::regionState):
+        (WebCore::RenderRegion::setRegionState):
+
 2012-02-13  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -58 +58 @@
 #include "Page.h"
 #include "RenderLayer.h"
+#include "RenderRegion.h"
 #include "RenderView.h"
 #include "RenderWidget.h"
@@ -1990 +1991 @@
 }
 
+const AtomicString& Element::webkitRegionOverflow() const
+{
+    if (renderer() && renderer()->isRenderRegion()) {
+        RenderRegion* region = toRenderRegion(renderer());
+        switch (region->regionState()) {
+        case RenderRegion::RegionFit:
+            DEFINE_STATIC_LOCAL(AtomicString, fitState, ("fit"));
+            return fitState;
+        case RenderRegion::RegionEmpty:
+            DEFINE_STATIC_LOCAL(AtomicString, emptyState, ("empty"));
+            return emptyState;
+        case RenderRegion::RegionOverflow:
+            DEFINE_STATIC_LOCAL(AtomicString, overflowState, ("overflow"));
+            return overflowState;
+        default:
+            break;
+        }
+    }
+    DEFINE_STATIC_LOCAL(AtomicString, undefinedState, ("undefined"));
+    return undefinedState;
+}
+
 #ifndef NDEBUG
 bool Element::fastAttributeLookupAllowed(const QualifiedName& name) const

trunk/Source/WebCore/dom/Element.h

@@ -403 +403 @@
     PassRefPtr<Attribute> createAttribute(const QualifiedName&, const AtomicString& value);
 
+    const AtomicString& webkitRegionOverflow() const;
+
 protected:
     Element(const QualifiedName& tagName, Document* document, ConstructionType type)

trunk/Source/WebCore/dom/Element.idl

@@ -134 +134 @@
         [V8EnabledAtRuntime] void webkitRequestFullScreen(in [Optional=DefaultIsUndefined] unsigned short flags);
 #endif
+
+        // CSS Regions API
+        readonly attribute DOMString webkitRegionOverflow;
 
 #if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1506 +1506 @@
     // Add visual overflow from theme.
     addVisualOverflowFromTheme();
+
+    if (isRenderFlowThread())
+        enclosingRenderFlowThread()->computeOverflowStateForRegions(oldClientAfterEdge);
 }
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -873 +873 @@
 }
 
+void RenderFlowThread::computeOverflowStateForRegions(LayoutUnit oldClientAfterEdge)
+{
+    LayoutUnit height = oldClientAfterEdge;
+    // FIXME: the visual overflow of middle region (if it is the last one to contain any content in a render flow thread)
+    // might not be taken into account because the render flow thread height is greater that that regions height + its visual overflow
+    // because of how computeLogicalHeight is implemented for RenderFlowThread (as a sum of all regions height).
+    // This means that the middle region will be marked as fit (even if it has visual overflow flowing into the next region)
+    if (hasRenderOverflow())
+        height = isHorizontalWritingMode() ? visualOverflowRect().maxY() : visualOverflowRect().maxX();
+
+    for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
+        RenderRegion* region = *iter;
+        if (!region->isValid()) {
+            region->setRegionState(RenderRegion::RegionUndefined);
+            continue;
+        }
+        LayoutUnit flowMin = height - (isHorizontalWritingMode() ? region->regionRect().y() : region->regionRect().x());
+        LayoutUnit flowMax = height - (isHorizontalWritingMode() ? region->regionRect().maxY() : region->regionRect().maxX());
+        RenderRegion::RegionState state = RenderRegion::RegionFit;
+        if (flowMin <= 0)
+            state = RenderRegion::RegionEmpty;
+        if (flowMax > 0)
+            state = RenderRegion::RegionOverflow;
+        region->setRegionState(state);
+    }
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -134 +134 @@
                                       const RenderRegion* newStartRegion = 0, const RenderRegion* newEndRegion = 0);
     WebKitNamedFlow* ensureNamedFlow();
+    void computeOverflowStateForRegions(LayoutUnit oldClientAfterEdge);
 
 private:

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -48 +48 @@
     , m_isValid(false)
     , m_hasCustomRegionStyle(false)
+    , m_regionState(RegionUndefined)
 {
 }

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -82 +82 @@
 
     void clearBoxStyleInRegion(const RenderBox*);
+
+    enum RegionState {
+        RegionUndefined,
+        RegionEmpty,
+        RegionFit,
+        RegionOverflow
+    };
+
+    RegionState regionState() const { return isValid() ? m_regionState : RegionUndefined; }
+    void setRegionState(RegionState regionState) { m_regionState = regionState; }
 private:
     virtual const char* renderName() const { return "RenderRegion"; }
@@ -110 +120 @@
     bool m_isValid;
     bool m_hasCustomRegionStyle;
+    RegionState m_regionState;
 };