[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-60-g76add97

Sun Oct 17 22:26:56 UTC 2010

The following commit has been merged in the debian/unstable branch:
commit 4a23812e8e0c66c5e11d12ac975e7e3fee30c17d
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 12 23:38:39 2010 +0000

    2010-07-12  Tony Chang  <tony at chromium.org>
    
            Reviewed by David Hyatt.
    
            crash in FrameView::detachCustomScrollbars
            https://bugs.webkit.org/show_bug.cgi?id=41196
    
            * scrollbars/hidden-iframe-scrollbar-crash-expected.txt: Added.
            * scrollbars/hidden-iframe-scrollbar-crash.html: Added.
    2010-07-12  Tony Chang  <tony at chromium.org>
    
            Reviewed by David Hyatt.
    
            crash in FrameView::detachCustomScrollbars
            https://bugs.webkit.org/show_bug.cgi?id=41196
    
            Test: scrollbars/hidden-iframe-scrollbar-crash.html
    
            * page/FrameView.cpp:
            (WebCore::FrameView::detachCustomScrollbars):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cd9ee7e..630376d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-12  Tony Chang  <tony at chromium.org>
+
+        Reviewed by David Hyatt.
+
+        crash in FrameView::detachCustomScrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=41196
+
+        * scrollbars/hidden-iframe-scrollbar-crash-expected.txt: Added.
+        * scrollbars/hidden-iframe-scrollbar-crash.html: Added.
+
 2010-07-02  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/scrollbars/hidden-iframe-scrollbar-crash-expected.txt b/LayoutTests/scrollbars/hidden-iframe-scrollbar-crash-expected.txt
new file mode 100644
index 0000000..f6ef408
--- /dev/null
+++ b/LayoutTests/scrollbars/hidden-iframe-scrollbar-crash-expected.txt
@@ -0,0 +1,4 @@
+
+This tests to make sure that an iframe with custom scrollbars that is hidden does not crash the browser when unloaded. The test passes if it does not crash.
+
+PASSED
diff --git a/LayoutTests/scrollbars/hidden-iframe-scrollbar-crash.html b/LayoutTests/scrollbars/hidden-iframe-scrollbar-crash.html
new file mode 100644
index 0000000..d2872e3
--- /dev/null
+++ b/LayoutTests/scrollbars/hidden-iframe-scrollbar-crash.html
@@ -0,0 +1,38 @@
+<style>
+::-webkit-scrollbar {
+  width: 16px;
+}
+</style>
+
+<body>
+<iframe id="iframe" width="1"></iframe>
+<p>This tests to make sure that an iframe with custom scrollbars that is
+hidden does not crash the browser when unloaded.  The test passes if it does
+not crash.</p>
+</body>
+
+<script>
+function runTest()
+{
+    if (document.location.search == "?done") {
+        document.body.appendChild(document.createTextNode("PASSED"));
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+        return;
+    }
+
+    if (window.layoutTestController) {
+        layoutTestController.waitUntilDone();
+        layoutTestController.dumpAsText();
+    }
+
+    setTimeout(function() {
+      document.getElementById("iframe").style.display = "none";
+
+      // Unload the page to see if the crash is triggered.
+      document.location.href = "?done";
+    }, 0);
+}
+
+runTest();
+</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1ff99a2..b5a0feb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-12  Tony Chang  <tony at chromium.org>
+
+        Reviewed by David Hyatt.
+
+        crash in FrameView::detachCustomScrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=41196
+
+        Test: scrollbars/hidden-iframe-scrollbar-crash.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::detachCustomScrollbars):
+
 2010-07-02  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index d38f655..8b82fc3 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -260,11 +260,11 @@ void FrameView::detachCustomScrollbars()
         return;
 
     Scrollbar* horizontalBar = horizontalScrollbar();
-    if (horizontalBar && horizontalBar->isCustomScrollbar() && !toRenderScrollbar(horizontalBar)->owningRenderer()->isRenderPart())
+    if (horizontalBar && horizontalBar->isCustomScrollbar())
         setHasHorizontalScrollbar(false);
 
     Scrollbar* verticalBar = verticalScrollbar();
-    if (verticalBar && verticalBar->isCustomScrollbar() && !toRenderScrollbar(verticalBar)->owningRenderer()->isRenderPart())
+    if (verticalBar && verticalBar->isCustomScrollbar())
         setHasVerticalScrollbar(false);
 
     if (m_scrollCorner) {

-- 
WebKit Debian packaging

