[webkit-changes] [96102] trunk

Tue, 27 Sep 2011 05:59:33 -0700

Title: [96102] trunk
Revision
96102
Author
commit-qu...@webkit.org
Date
2011-09-27 06:00:21 -0700 (Tue, 27 Sep 2011)

Log Message

Unreviewed, rolling out r96070 and r96075.
http://trac.webkit.org/changeset/96070
http://trac.webkit.org/changeset/96075
https://bugs.webkit.org/show_bug.cgi?id=68893

WK2 tests started crashing after r96070 for SL and Qt
(Requested by torarne on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-09-27

Source/WebCore:

* page/FrameView.cpp:
(WebCore::FrameView::updateScrollCorner):
* platform/ScrollView.cpp:
(WebCore::ScrollView::setHasHorizontalScrollbar):
(WebCore::ScrollView::setHasVerticalScrollbar):
(WebCore::ScrollView::updateScrollbars):
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::invalidateScrollCorner):
* platform/ScrollableArea.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::destroyRootLayer):
* rendering/RenderScrollbarPart.cpp:
(WebCore::RenderScrollbarPart::imageChanged):

LayoutTests:

* compositing/iframes/repaint-after-losing-scrollbars-expected.png:
* platform/qt/Skipped:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (96101 => 96102)


--- trunk/LayoutTests/ChangeLog	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/LayoutTests/ChangeLog	2011-09-27 13:00:21 UTC (rev 96102)
@@ -1,3 +1,16 @@
+2011-09-27  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r96070 and r96075.
+        http://trac.webkit.org/changeset/96070
+        http://trac.webkit.org/changeset/96075
+        https://bugs.webkit.org/show_bug.cgi?id=68893
+
+        WK2 tests started crashing after r96070 for SL and Qt
+        (Requested by torarne on #webkit).
+
+        * compositing/iframes/repaint-after-losing-scrollbars-expected.png:
+        * platform/qt/Skipped:
+
 2011-09-27  Shinichiro Hamaji  <ham...@chromium.org>
 
         [Chromium] Layout Test fast/canvas/webgl/premultiplyalpha-test.html is failing

Modified: trunk/LayoutTests/compositing/iframes/repaint-after-losing-scrollbars-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/qt/Skipped (96101 => 96102)


--- trunk/LayoutTests/platform/qt/Skipped	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/LayoutTests/platform/qt/Skipped	2011-09-27 13:00:21 UTC (rev 96102)
@@ -2377,9 +2377,3 @@
 # editing/selection/select-bidi-run.html fails on Qt
 # https://bugs.webkit.org/show_bug.cgi?id=68854
 editing/selection/select-bidi-run.html
-
-# Two tests fail after r96070
-# https://bugs.webkit.org/show_bug.cgi?id=68872
-fast/loader/stateobjects/pushstate-clears-forward-history.html
-fast/frames/frame-dead-region.html
-

Modified: trunk/Source/WebCore/ChangeLog (96101 => 96102)


--- trunk/Source/WebCore/ChangeLog	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/Source/WebCore/ChangeLog	2011-09-27 13:00:21 UTC (rev 96102)
@@ -1,3 +1,27 @@
+2011-09-27  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r96070 and r96075.
+        http://trac.webkit.org/changeset/96070
+        http://trac.webkit.org/changeset/96075
+        https://bugs.webkit.org/show_bug.cgi?id=68893
+
+        WK2 tests started crashing after r96070 for SL and Qt
+        (Requested by torarne on #webkit).
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::updateScrollCorner):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::setHasHorizontalScrollbar):
+        (WebCore::ScrollView::setHasVerticalScrollbar):
+        (WebCore::ScrollView::updateScrollbars):
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::invalidateScrollCorner):
+        * platform/ScrollableArea.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::destroyRootLayer):
+        * rendering/RenderScrollbarPart.cpp:
+        (WebCore::RenderScrollbarPart::imageChanged):
+
 2011-09-27  Andrey Kosyakov  <ca...@chromium.org>
 
         Web Inspector: JS exception upon clicking on "Word Wrap" checkbox in Settings screen

Modified: trunk/Source/WebCore/page/FrameView.cpp (96101 => 96102)


--- trunk/Source/WebCore/page/FrameView.cpp	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/Source/WebCore/page/FrameView.cpp	2011-09-27 13:00:21 UTC (rev 96102)
@@ -2467,9 +2467,8 @@
 {
     RenderObject* renderer = 0;
     RefPtr<RenderStyle> cornerStyle;
-    IntRect cornerRect = scrollCornerRect();
     
-    if (!cornerRect.isEmpty()) {
+    if (!scrollCornerRect().isEmpty()) {
         // Try the <body> element first as a scroll corner source.
         Document* doc = m_frame->document();
         Element* body = doc ? doc->body() : 0;
@@ -2498,7 +2497,7 @@
         if (!m_scrollCorner)
             m_scrollCorner = new (renderer->renderArena()) RenderScrollbarPart(renderer->document());
         m_scrollCorner->setStyle(cornerStyle.release());
-        invalidateScrollCorner(cornerRect);
+        invalidateScrollCorner();
     } else if (m_scrollCorner) {
         m_scrollCorner->destroy();
         m_scrollCorner = 0;

Modified: trunk/Source/WebCore/platform/ScrollView.cpp (96101 => 96102)


--- trunk/Source/WebCore/platform/ScrollView.cpp	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/Source/WebCore/platform/ScrollView.cpp	2011-09-27 13:00:21 UTC (rev 96102)
@@ -95,7 +95,6 @@
         didAddHorizontalScrollbar(m_horizontalScrollbar.get());
         m_horizontalScrollbar->styleChanged();
     } else if (!hasBar && m_horizontalScrollbar) {
-        m_horizontalScrollbar->invalidate();
         willRemoveHorizontalScrollbar(m_horizontalScrollbar.get());
         removeChild(m_horizontalScrollbar.get());
         m_horizontalScrollbar = 0;
@@ -114,7 +113,6 @@
         didAddVerticalScrollbar(m_verticalScrollbar.get());
         m_verticalScrollbar->styleChanged();
     } else if (!hasBar && m_verticalScrollbar) {
-        m_verticalScrollbar->invalidate();
         willRemoveVerticalScrollbar(m_verticalScrollbar.get());
         removeChild(m_verticalScrollbar.get());
         m_verticalScrollbar = 0;
@@ -449,8 +447,6 @@
         m_inUpdateScrollbars = false;
     }
 
-    IntRect oldScrollCornerRect = scrollCornerRect();
-
     bool hasHorizontalScrollbar = m_horizontalScrollbar;
     bool hasVerticalScrollbar = m_verticalScrollbar;
     
@@ -577,8 +573,6 @@
         frameRectsChanged();
         positionScrollbarLayers();
         updateScrollCorner();
-        if (!m_horizontalScrollbar && !m_verticalScrollbar)
-            invalidateScrollCornerRect(oldScrollCornerRect);
     }
 
     IntPoint scrollPoint = adjustScrollPositionWithinRange(IntPoint(desiredOffset)) + IntSize(m_scrollOrigin.x(), m_scrollOrigin.y());

Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (96101 => 96102)


--- trunk/Source/WebCore/platform/ScrollableArea.cpp	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp	2011-09-27 13:00:21 UTC (rev 96102)
@@ -274,7 +274,7 @@
     invalidateScrollbarRect(scrollbar, rect);
 }
 
-void ScrollableArea::invalidateScrollCorner(const IntRect& rect)
+void ScrollableArea::invalidateScrollCorner()
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (GraphicsLayer* graphicsLayer = layerForScrollCorner()) {
@@ -282,7 +282,7 @@
         return;
     }
 #endif
-    invalidateScrollCornerRect(rect);
+    invalidateScrollCornerRect(scrollCornerRect());
 }
 
 bool ScrollableArea::hasLayerForHorizontalScrollbar() const

Modified: trunk/Source/WebCore/platform/ScrollableArea.h (96101 => 96102)


--- trunk/Source/WebCore/platform/ScrollableArea.h	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/Source/WebCore/platform/ScrollableArea.h	2011-09-27 13:00:21 UTC (rev 96102)
@@ -89,7 +89,7 @@
     void invalidateScrollbar(Scrollbar*, const IntRect&);
     virtual bool isScrollCornerVisible() const = 0;
     virtual IntRect scrollCornerRect() const = 0;
-    void invalidateScrollCorner(const IntRect&);
+    void invalidateScrollCorner();
     virtual void getTickmarks(Vector<IntRect>&) const { }
 
     // This function should be overriden by subclasses to perform the actual

Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (96101 => 96102)


--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2011-09-27 13:00:21 UTC (rev 96102)
@@ -1786,7 +1786,7 @@
 
     if (m_layerForScrollCorner) {
         m_layerForScrollCorner = nullptr;
-        m_renderView->frameView()->invalidateScrollCorner(m_renderView->frameView()->scrollCornerRect());
+        m_renderView->frameView()->invalidateScrollCorner();
     }
 
     if (m_overflowControlsHostLayer) {

Modified: trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp (96101 => 96102)


--- trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp	2011-09-27 12:58:02 UTC (rev 96101)
+++ trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp	2011-09-27 13:00:21 UTC (rev 96102)
@@ -150,7 +150,7 @@
     else {
         if (FrameView* frameView = view()->frameView()) {
             if (frameView->isFrameViewScrollCorner(this)) {
-                frameView->invalidateScrollCorner(frameView->scrollCornerRect());
+                frameView->invalidateScrollCorner();
                 return;
             }
         }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to