[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 16:27:32 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 9a4e50457c7449a662f7e819aefbf8b5e7674afa
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 00:12:00 2010 +0000

    2010-11-23  Cris Neckar  <cdn at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Removed unneeded conversions to RenderBlock.
            https://bugs.webkit.org/show_bug.cgi?id=49896
    
            Test: fast/css/input-search-table-column-crash.html
    
            * rendering/RenderTextControlSingleLine.cpp:
            (WebCore::RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight):
    2010-11-23  Cris Neckar  <cdn at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Test for crash with input type search and table column style.
            https://bugs.webkit.org/show_bug.cgi?id=49896
    
            * fast/css/input-search-table-column-crash-expected.txt: Added.
            * fast/css/input-search-table-column-crash.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72639 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 98cb532..4976e25 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-23  Cris Neckar  <cdn at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Test for crash with input type search and table column style.
+        https://bugs.webkit.org/show_bug.cgi?id=49896
+
+        * fast/css/input-search-table-column-crash-expected.txt: Added.
+        * fast/css/input-search-table-column-crash.html: Added.
+
 2010-11-23  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/fast/parser/form-pointer-2-expected.txt b/LayoutTests/fast/css/input-search-table-column-crash-expected.txt
similarity index 100%
copy from LayoutTests/fast/parser/form-pointer-2-expected.txt
copy to LayoutTests/fast/css/input-search-table-column-crash-expected.txt
diff --git a/LayoutTests/fast/css/input-search-table-column-crash.html b/LayoutTests/fast/css/input-search-table-column-crash.html
new file mode 100644
index 0000000..dc29ccf
--- /dev/null
+++ b/LayoutTests/fast/css/input-search-table-column-crash.html
@@ -0,0 +1,14 @@
+<html>
+    <script>
+        if (window.layoutTestController)
+            layoutTestController.dumpAsText();
+    </script>
+    <style>
+        input[type="search"]::-webkit-search-cancel-button {
+            -webkit-appearance: none; 
+            display: table-column;
+        }
+    </style>
+    <input type="search">
+    PASS
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61e3cab..d3aa029 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-23  Cris Neckar  <cdn at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Removed unneeded conversions to RenderBlock.
+        https://bugs.webkit.org/show_bug.cgi?id=49896
+
+        Test: fast/css/input-search-table-column-crash.html
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight):
+
 2010-11-23  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/rendering/RenderTextControlSingleLine.cpp b/WebCore/rendering/RenderTextControlSingleLine.cpp
index d455ec0..f638907 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.cpp
+++ b/WebCore/rendering/RenderTextControlSingleLine.cpp
@@ -585,16 +585,15 @@ int RenderTextControlSingleLine::preferredDecorationWidthRight() const
 void RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight(int lineHeight)
 {
     if (RenderBox* resultsRenderer = m_resultsButton ? m_resultsButton->renderBox() : 0) {
-        toRenderBlock(resultsRenderer)->computeLogicalHeight();
+        resultsRenderer->computeLogicalHeight();
         setHeight(max(height(),
                   resultsRenderer->borderTop() + resultsRenderer->borderBottom() +
                   resultsRenderer->paddingTop() + resultsRenderer->paddingBottom() +
                   resultsRenderer->marginTop() + resultsRenderer->marginBottom()));
         lineHeight = max(lineHeight, resultsRenderer->height());
     }
-
     if (RenderBox* cancelRenderer = m_cancelButton ? m_cancelButton->renderBox() : 0) {
-        toRenderBlock(cancelRenderer)->computeLogicalHeight();
+        cancelRenderer->computeLogicalHeight();
         setHeight(max(height(),
                   cancelRenderer->borderTop() + cancelRenderer->borderBottom() +
                   cancelRenderer->paddingTop() + cancelRenderer->paddingBottom() +

-- 
WebKit Debian packaging

