[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

Sun Feb 20 22:49:11 UTC 2011

The following commit has been merged in the webkit-1.3 branch:
commit acfd01cc22d3bdd1b317c63f3015fd4ea2234981
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 21:28:13 2011 +0000

    2011-01-11  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            RefPtr the FrameView to prevent scrollbar from getting deleted inside
            its scroll event.
            https://bugs.webkit.org/show_bug.cgi?id=52238
    
            Test: scrollbars/scrollable-iframe-remove-crash.html
    
            * page/DOMWindow.cpp:
            (WebCore::DOMWindow::scrollTo):
    2011-01-11  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Tests that we do not crash when we remove scrollable iframe when executing
            inside its scroll event.
            https://bugs.webkit.org/show_bug.cgi?id=52238
    
            * scrollbars/scrollable-iframe-remove-crash-expected.txt: Added.
            * scrollbars/scrollable-iframe-remove-crash.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f059c58..70f852b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-11  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Tests that we do not crash when we remove scrollable iframe when executing
+        inside its scroll event.
+        https://bugs.webkit.org/show_bug.cgi?id=52238
+
+        * scrollbars/scrollable-iframe-remove-crash-expected.txt: Added.
+        * scrollbars/scrollable-iframe-remove-crash.html: Added.
+
 2011-01-11  Martin Robinson  <mrobinson at igalia.com>
 
         Remove some GTK+-specific baselines. GTK+ now enough feature parity with the Mac
diff --git a/LayoutTests/scrollbars/scrollable-iframe-remove-crash-expected.txt b/LayoutTests/scrollbars/scrollable-iframe-remove-crash-expected.txt
new file mode 100644
index 0000000..b670fd5
--- /dev/null
+++ b/LayoutTests/scrollbars/scrollable-iframe-remove-crash-expected.txt
@@ -0,0 +1 @@
+Scrolled by JavaScript scrollTo(): PASS
diff --git a/LayoutTests/scrollbars/scrollable-iframe-remove-crash.html b/LayoutTests/scrollbars/scrollable-iframe-remove-crash.html
new file mode 100644
index 0000000..0d7fce1
--- /dev/null
+++ b/LayoutTests/scrollbars/scrollable-iframe-remove-crash.html
@@ -0,0 +1,27 @@
+<html>
+<script>
+if (window.layoutTestController)
+{
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+
+function scrollEventFired()
+{
+    document.getElementById('console').innerHTML = "Scrolled by JavaScript scrollTo(): PASS";
+ 
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+}
+
+function runTest()
+{
+    window.frames[0].onscroll = scrollEventFired;
+    window.frames[0].scrollTo(0, 50);
+}
+</script>
+<junk id="console">
+<iframe onload="runTest();" src="resources/scrollable-iframe.html">
+</junk>
+</html>
+
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3c34a83..537373d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-11  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        RefPtr the FrameView to prevent scrollbar from getting deleted inside
+        its scroll event.
+        https://bugs.webkit.org/show_bug.cgi?id=52238
+
+        Test: scrollbars/scrollable-iframe-remove-crash.html
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::scrollTo):
+
 2011-01-08  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by David Hyatt.
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index 02140d5..1c6dc73 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1339,7 +1339,7 @@ void DOMWindow::scrollTo(int x, int y) const
 
     m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
-    FrameView* view = m_frame->view();
+    RefPtr<FrameView> view = m_frame->view();
     if (!view)
         return;
 

-- 
WebKit Debian packaging

