Title: [151685] trunk
Revision
151685
Author
[email protected]
Date
2013-06-18 10:38:07 -0700 (Tue, 18 Jun 2013)

Log Message

Unreviewed, rolling out r151549.
http://trac.webkit.org/changeset/151549
https://bugs.webkit.org/show_bug.cgi?id=117741

broke selection in the web inspector source after scrolling
(Requested by smfr on #webkit).

Source/WebCore:

* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeRectForRepaint):
* rendering/RenderLayerModelObject.cpp:
* rendering/RenderLayerModelObject.h:

LayoutTests:

* fast/repaint/change-overflow-and-display-of-relative-expected.txt: Removed.
* fast/repaint/change-overflow-and-display-of-relative.html: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (151684 => 151685)


--- trunk/LayoutTests/ChangeLog	2013-06-18 15:16:02 UTC (rev 151684)
+++ trunk/LayoutTests/ChangeLog	2013-06-18 17:38:07 UTC (rev 151685)
@@ -1,3 +1,15 @@
+2013-06-18  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r151549.
+        http://trac.webkit.org/changeset/151549
+        https://bugs.webkit.org/show_bug.cgi?id=117741
+
+        broke selection in the web inspector source after scrolling
+        (Requested by smfr on #webkit).
+
+        * fast/repaint/change-overflow-and-display-of-relative-expected.txt: Removed.
+        * fast/repaint/change-overflow-and-display-of-relative.html: Removed.
+
 2013-06-18  Santosh Mahto  <[email protected]>
 
         <video> element delays document load event for ~ 3 seconds

Deleted: trunk/LayoutTests/fast/repaint/change-overflow-and-display-of-relative-expected.txt (151684 => 151685)


--- trunk/LayoutTests/fast/repaint/change-overflow-and-display-of-relative-expected.txt	2013-06-18 15:16:02 UTC (rev 151684)
+++ trunk/LayoutTests/fast/repaint/change-overflow-and-display-of-relative-expected.txt	2013-06-18 17:38:07 UTC (rev 151685)
@@ -1,10 +0,0 @@
-(repaint rects
-  (rect 8 8 784 40)
-  (rect 8 8 784 200)
-)
-(repaint rects
-  (rect 8 8 784 40)
-  (rect 8 8 784 200)
-  (rect 8 8 784 40)
-)
-

Deleted: trunk/LayoutTests/fast/repaint/change-overflow-and-display-of-relative.html (151684 => 151685)


--- trunk/LayoutTests/fast/repaint/change-overflow-and-display-of-relative.html	2013-06-18 15:16:02 UTC (rev 151684)
+++ trunk/LayoutTests/fast/repaint/change-overflow-and-display-of-relative.html	2013-06-18 17:38:07 UTC (rev 151685)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<style>
-.patient {
-    overflow: hidden;
-    height: 40px;
-    background-color: blue;
-}
-.patient > div {
-   display: none;
-   position: relative;
-}
-</style>
-</head>
-<body>
-<!-- There should not be a red rect. -->
-<div class="patient" id="overflow">
-    <div></div>
-    <div id="display" style="height: 200px; background-color: red;"></div>
-</div>
-<script src=""
-<script>
-    window._onload_ = function() {
-        var overflow = document.getElementById("overflow");
-        var display = document.getElementById("display");
-
-        repaintTest = function() {
-            overflow.style.overflow = "visible";
-            display.style.display = "block";
-        }
-        runRepaintTest();
-
-        function rewrite() {
-            repaintTest = function() {
-                overflow.style.overflow = "hidden";
-                display.style.display = "none";
-            }
-            runRepaintTest();
-        }
-        if (window.testRunner && window.internals)
-            rewrite();
-        else
-            setTimeout(rewrite, 100);
-    };
-</script>
-</body></html>

Modified: trunk/Source/WebCore/ChangeLog (151684 => 151685)


--- trunk/Source/WebCore/ChangeLog	2013-06-18 15:16:02 UTC (rev 151684)
+++ trunk/Source/WebCore/ChangeLog	2013-06-18 17:38:07 UTC (rev 151685)
@@ -1,3 +1,17 @@
+2013-06-18  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r151549.
+        http://trac.webkit.org/changeset/151549
+        https://bugs.webkit.org/show_bug.cgi?id=117741
+
+        broke selection in the web inspector source after scrolling
+        (Requested by smfr on #webkit).
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeRectForRepaint):
+        * rendering/RenderLayerModelObject.cpp:
+        * rendering/RenderLayerModelObject.h:
+
 2013-06-18  Santosh Mahto  <[email protected]>
 
         <video> element delays document load event for ~ 3 seconds

Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (151684 => 151685)


--- trunk/Source/WebCore/rendering/RenderBox.cpp	2013-06-18 15:16:02 UTC (rev 151684)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp	2013-06-18 17:38:07 UTC (rev 151685)
@@ -2037,7 +2037,7 @@
     // FIXME: We ignore the lightweight clipping rect that controls use, since if |o| is in mid-layout,
     // its controlClipRect will be wrong. For overflow clip we use the values cached by the layer.
     rect.setLocation(topLeft);
-    if (shouldUseClipForRepaint(o)) {
+    if (o->hasOverflowClip()) {
         RenderBox* containerBox = toRenderBox(o);
         containerBox->applyCachedClipAndScrollOffsetForRepaint(rect);
         if (rect.isEmpty())

Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (151684 => 151685)


--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp	2013-06-18 15:16:02 UTC (rev 151684)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp	2013-06-18 17:38:07 UTC (rev 151685)
@@ -73,16 +73,6 @@
     return m_layer && m_layer->isSelfPaintingLayer();
 }
 
-// If this has a self painting layer, visual overflow rects of the container doesn't contain this rect.
-// If hasOverflowClip() of the container is changed, the container requests repainting visual overflow rects.
-// Since the overflow rects doesn't contain this rect, the container doesn't request repainting this rect.
-// Therefore, this should request repainting overflowed portion.
-bool RenderLayerModelObject::shouldUseClipForRepaint(RenderObject* container) const
-{
-    ASSERT(container == this->container());
-    return !hasSelfPaintingLayer() && container->hasOverflowClip();
-}
-    
 void RenderLayerModelObject::willBeDestroyed()
 {
     if (isPositioned()) {

Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.h (151684 => 151685)


--- trunk/Source/WebCore/rendering/RenderLayerModelObject.h	2013-06-18 15:16:02 UTC (rev 151684)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.h	2013-06-18 17:38:07 UTC (rev 151685)
@@ -56,8 +56,6 @@
 protected:
     void ensureLayer();
 
-    bool shouldUseClipForRepaint(RenderObject* container) const;
-
     virtual void willBeDestroyed() OVERRIDE;
 
 private:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to