Changeset 108103 in webkit

Timestamp:

Feb 17, 2012 11:58:56 AM (12 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions]Implement NamedFlow::overflow
​https://bugs.webkit.org/show_bug.cgi?id=78880

Reviewed by David Hyatt.

Source/WebCore:

Test: fast/regions/webkit-named-flow-overflow.html

• dom/WebKitNamedFlow.cpp:

(WebCore::WebKitNamedFlow::WebKitNamedFlow):
(WebCore::WebKitNamedFlow::overflow):
(WebCore):

• dom/WebKitNamedFlow.h:

(WebCore):
(WebCore::WebKitNamedFlow::create):
(WebKitNamedFlow):

• dom/WebKitNamedFlow.idl:
• rendering/RenderFlowThread.cpp:

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

• rendering/RenderFlowThread.h:

LayoutTests:

• fast/regions/resources/helper.js:

(testContentToRegionsMapping):

• fast/regions/resources/region-style.css:
• fast/regions/webkit-named-flow-overflow-expected.txt: Added.
• fast/regions/webkit-named-flow-overflow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/resources/helper.js (modified) (1 diff)
• LayoutTests/fast/regions/resources/region-style.css (modified) (1 diff)
• LayoutTests/fast/regions/webkit-named-flow-overflow-expected.txt (added)
• LayoutTests/fast/regions/webkit-named-flow-overflow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/WebKitNamedFlow.cpp (modified) (2 diffs)
• Source/WebCore/dom/WebKitNamedFlow.h (modified) (1 diff)
• Source/WebCore/dom/WebKitNamedFlow.idl (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-17  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Implement NamedFlow::overflow
+        https://bugs.webkit.org/show_bug.cgi?id=78880
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/resources/helper.js:
+        (testContentToRegionsMapping):
+        * fast/regions/resources/region-style.css:
+        * fast/regions/webkit-named-flow-overflow-expected.txt: Added.
+        * fast/regions/webkit-named-flow-overflow.html: Added.
+
 2012-02-17  Joe Thomas  <joethomas@motorola.com>
 

trunk/LayoutTests/fast/regions/resources/helper.js

@@ -128 +128 @@
     return !results.length && !debug;
 }
+
+function logMessage(message, success)
+{
+    var pElem = document.createElement("p");
+
+    var spanElement = document.createElement("span");
+    spanElement.className = success ? "pass" : "fail";
+    var spanTextNode = success ? document.createTextNode("PASS") : document.createTextNode("FAIL");
+    spanElement.appendChild(spanTextNode);
+    pElem.appendChild(spanElement);
+
+    var textNode = document.createTextNode(message);
+    pElem.appendChild(textNode);
+        document.getElementById("console").appendChild(pElem);
+}
+
+function logPassMessage(message)
+{
+    logMessage(message, true);
+}
+
+function logFailMessage(message)
+{
+    var logMsg = "" + message;
+    if (logMsg.length > 0)
+        logMsg = " : " + logMsg;
+    logMessage(logMsg, false);
+}
+
+function assert(expression, failMessage)
+{
+    expression ? logPassMessage("") : logFailMessage(failMessage);
+}

trunk/LayoutTests/fast/regions/resources/region-style.css

@@ -38 +38 @@
 }
 
+.pass {
+    font-weight: bold;
+    color: green;
+}
+
+.fail {
+    font-weight: bold;
+    color: red;
+}

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-17  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Implement NamedFlow::overflow
+        https://bugs.webkit.org/show_bug.cgi?id=78880
+
+        Reviewed by David Hyatt.
+
+        Test: fast/regions/webkit-named-flow-overflow.html
+
+        * dom/WebKitNamedFlow.cpp:
+        (WebCore::WebKitNamedFlow::WebKitNamedFlow):
+        (WebCore::WebKitNamedFlow::overflow):
+        (WebCore):
+        * dom/WebKitNamedFlow.h:
+        (WebCore):
+        (WebCore::WebKitNamedFlow::create):
+        (WebKitNamedFlow):
+        * dom/WebKitNamedFlow.idl:
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::RenderFlowThread):
+        (WebCore::RenderFlowThread::ensureNamedFlow):
+        (WebCore::RenderFlowThread::computeOverflowStateForRegions):
+        * rendering/RenderFlowThread.h:
+
 2012-02-17  Joe Thomas  <joethomas@motorola.com>
 

trunk/Source/WebCore/dom/WebKitNamedFlow.cpp

@@ -31 +31 @@
 #include "WebKitNamedFlow.h"
 
+#include "RenderFlowThread.h"
+
 namespace WebCore {
 
-WebKitNamedFlow::WebKitNamedFlow()
+WebKitNamedFlow::WebKitNamedFlow(RenderFlowThread* parentFlowThread)
+: m_parentFlowThread(parentFlowThread)
 {
 }
@@ -41 +44 @@
 }
 
+bool WebKitNamedFlow::overflow() const
+{
+    m_parentFlowThread->document()->updateLayoutIgnorePendingStylesheets();
+    return m_parentFlowThread->overflow();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/dom/WebKitNamedFlow.h

@@ -36 +36 @@
 namespace WebCore {
 
+class RenderFlowThread;
+
 class WebKitNamedFlow : public RefCounted<WebKitNamedFlow> {
 public:
-    static PassRefPtr<WebKitNamedFlow> create()
+    static PassRefPtr<WebKitNamedFlow> create(RenderFlowThread* parentFlowThread)
     {
-        return adoptRef(new WebKitNamedFlow);
+        return adoptRef(new WebKitNamedFlow(parentFlowThread));
     }
 
     ~WebKitNamedFlow();
 
+    bool overflow() const;
 private:
-    WebKitNamedFlow();
+    WebKitNamedFlow(RenderFlowThread*);
+
+    RenderFlowThread* m_parentFlowThread;
 };
 

trunk/Source/WebCore/dom/WebKitNamedFlow.idl

@@ -32 +32 @@
         JSGenerateToJSObject
     ] WebKitNamedFlow {
+        readonly attribute boolean overflow;
     };
 }

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -52 +52 @@
     , m_regionsHaveUniformLogicalWidth(true)
     , m_regionsHaveUniformLogicalHeight(true)
+    , m_overflow(false)
 {
     setIsAnonymous(false);
@@ -868 +869 @@
 {
     if (!m_namedFlow)
-        m_namedFlow = WebKitNamedFlow::create();
+        m_namedFlow = WebKitNamedFlow::create(this);
 
     return m_namedFlow.get();
@@ -898 +899 @@
         region->setRegionState(state);
     }
+
+    // With the regions overflow state computed we can also set the overflow for the named flow.
+    RenderRegion* lastReg = lastRegion();
+    m_overflow = lastReg && (lastReg->regionState() == RenderRegion::RegionOverflow);
 }
 

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -136 +136 @@
     void computeOverflowStateForRegions(LayoutUnit oldClientAfterEdge);
 
+    bool overflow() const { return m_overflow; }
 private:
     virtual const char* renderName() const { return "RenderFlowThread"; }
@@ -196 +197 @@
     bool m_regionsHaveUniformLogicalWidth;
     bool m_regionsHaveUniformLogicalHeight;
+    bool m_overflow;
     RefPtr<WebKitNamedFlow> m_namedFlow;
 };