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

Sun Feb 20 23:28:18 UTC 2011

The following commit has been merged in the webkit-1.3 branch:
commit 5ddfb04e2e83b50ead9eeb663cfa657727e2fa51
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 21:34:34 2011 +0000

    2011-01-20  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Eric Seidel.
    
            RenderTableSection's setNeedsCellRecalc needs to null check table()
            https://bugs.webkit.org/show_bug.cgi?id=52770
    
            Tests ::-webkit-scrollbar-corner inside a table.
    
            * fast/css-generated-content/table-with-scrollbar-corner-expected.txt: Added.
            * fast/css-generated-content/table-with-scrollbar-corner.html: Added.
    2011-01-20  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Eric "Baller" Seidel.
    
            RenderTableSection's setNeedsCellRecalc needs to null check table()
            https://bugs.webkit.org/show_bug.cgi?id=52770
    
            Null checks table() before deferencing it in RenderTableSection::setNeedsCellRecalc.
            This can be null during detach().  Test constructed by Eric Seidel.
    
            Test: fast/css-generated-content/table-with-scrollbar-corner.html
    
            * rendering/RenderTableSection.cpp:
            (WebCore::RenderTableSection::setNeedsCellRecalc):
            * rendering/RenderTableSection.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 302fb8d..0fd91a5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-20  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        RenderTableSection's setNeedsCellRecalc needs to null check table()
+        https://bugs.webkit.org/show_bug.cgi?id=52770
+
+        Tests ::-webkit-scrollbar-corner inside a table.
+
+        * fast/css-generated-content/table-with-scrollbar-corner-expected.txt: Added.
+        * fast/css-generated-content/table-with-scrollbar-corner.html: Added.
+
 2011-01-20  Michael Saboff  <msaboff at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/fast/css-generated-content/table-with-scrollbar-corner-expected.txt b/LayoutTests/fast/css-generated-content/table-with-scrollbar-corner-expected.txt
new file mode 100644
index 0000000..b2e78c2
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/table-with-scrollbar-corner-expected.txt
@@ -0,0 +1 @@
+PASS, no crash
diff --git a/LayoutTests/fast/css-generated-content/table-with-scrollbar-corner.html b/LayoutTests/fast/css-generated-content/table-with-scrollbar-corner.html
new file mode 100644
index 0000000..34dbd75
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/table-with-scrollbar-corner.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<style>
+::-webkit-scrollbar-corner { zoom: reset; }
+* {overflow:hidden}
+</style>
+<table><tr>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+document.body.innerHTML = "PASS, no crash";
+</script>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c975d66..6eb8cb7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-20  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Eric "Baller" Seidel.
+
+        RenderTableSection's setNeedsCellRecalc needs to null check table()
+        https://bugs.webkit.org/show_bug.cgi?id=52770
+
+        Null checks table() before deferencing it in RenderTableSection::setNeedsCellRecalc.
+        This can be null during detach().  Test constructed by Eric Seidel.
+
+        Test: fast/css-generated-content/table-with-scrollbar-corner.html
+
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::setNeedsCellRecalc):
+        * rendering/RenderTableSection.h:
+
 2011-01-20  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Rob Buis.
diff --git a/Source/WebCore/rendering/RenderTableSection.cpp b/Source/WebCore/rendering/RenderTableSection.cpp
index a0b6b9e..fa557bc 100644
--- a/Source/WebCore/rendering/RenderTableSection.cpp
+++ b/Source/WebCore/rendering/RenderTableSection.cpp
@@ -1083,6 +1083,13 @@ void RenderTableSection::recalcCells()
     setNeedsLayout(true);
 }
 
+void RenderTableSection::setNeedsCellRecalc()
+{
+    m_needsCellRecalc = true;
+    if (RenderTable* t = table())
+        t->setNeedsSectionRecalc();
+}
+
 void RenderTableSection::clearGrid()
 {
     int rows = m_gridRows;
diff --git a/Source/WebCore/rendering/RenderTableSection.h b/Source/WebCore/rendering/RenderTableSection.h
index fac6a84..cc969e8 100644
--- a/Source/WebCore/rendering/RenderTableSection.h
+++ b/Source/WebCore/rendering/RenderTableSection.h
@@ -114,11 +114,7 @@ public:
     }
 
     bool needsCellRecalc() const { return m_needsCellRecalc; }
-    void setNeedsCellRecalc()
-    {
-        m_needsCellRecalc = true;
-        table()->setNeedsSectionRecalc();
-    }
+    void setNeedsCellRecalc();
 
     int getBaseline(int row) { return m_grid[row].baseline; }
 

-- 
WebKit Debian packaging

