Changeset 24083 in webkit

Timestamp:

Jul 6, 2007 7:35:07 PM (17 years ago)

Author:

bdash

Message:

2007-07-06 Mitz Pettel <​mitz@webkit.org>

Reviewed by Beth.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14536 Unnecessary layout done when mousing down in text field

No test possible because there is no change in functionality.

• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::setStyle): Reset the height and the width in the old style to avoid getting a layout hint as a result of having mutated the old style during layout. (WebCore::RenderTextControl::layout): Update children's layout if an inner block's dimensions should change. This need for layout was previously masked by the bug.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-06  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Beth.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14536
+          Unnecessary layout done when mousing down in text field
+
+        No test possible because there is no change in functionality.
+
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::setStyle): Reset the height and the width in
+        the old style to avoid getting a layout hint as a result of having mutated
+        the old style during layout.
+        (WebCore::RenderTextControl::layout): Update children's layout if an inner
+        block's dimensions should change. This need for layout was previously masked
+        by the bug.
+
 2007-07-06  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -83 +83 @@
 {
     RenderBlock::setStyle(style);
-    if (m_innerBlock)
+    if (m_innerBlock) {
+        // We may have set the width and the height in the old style in layout(). Reset them now to avoid
+        // getting a spurious layout hint.
+        m_innerBlock->renderer()->style()->setHeight(Length());
+        m_innerBlock->renderer()->style()->setWidth(Length());
         m_innerBlock->renderer()->setStyle(createInnerBlockStyle(style));
+    }
 
     if (m_innerText) {
         RenderBlock* textBlockRenderer = static_cast<RenderBlock*>(m_innerText->renderer());
         RenderStyle* textBlockStyle = createInnerTextStyle(style);
+        // We may have set the width and the height in the old style in layout(). Reset them now to avoid
+        // getting a spurious layout hint.
+        textBlockRenderer->style()->setHeight(Length());
+        textBlockRenderer->style()->setWidth(Length());
         textBlockRenderer->setStyle(textBlockStyle);
         for (Node* n = m_innerText->firstChild(); n; n = n->traverseNextNode(m_innerText.get())) {
@@ -666 +675 @@
     int textBlockHeight = m_height - paddingTop() - paddingBottom() - borderTop() - borderBottom();
     int currentTextBlockHeight = m_innerText->renderer()->height();
-    if (m_multiLine || m_innerBlock || currentTextBlockHeight > m_height)
+    if (m_multiLine || m_innerBlock || currentTextBlockHeight > m_height) {
+        if (textBlockHeight != currentTextBlockHeight)
+            relayoutChildren = true;
         m_innerText->renderer()->style()->setHeight(Length(textBlockHeight, Fixed));
-    if (m_innerBlock)
+    }
+    if (m_innerBlock) {
+        if (textBlockHeight != m_innerBlock->renderer()->height())
+            relayoutChildren = true;
         m_innerBlock->renderer()->style()->setHeight(Length(textBlockHeight, Fixed));
+    }
 
     int oldWidth = m_width;
@@ -689 +704 @@
     int textBlockWidth = m_width - paddingLeft() - paddingRight() - borderLeft() - borderRight() -
                          m_innerText->renderer()->paddingLeft() - m_innerText->renderer()->paddingRight() - searchExtrasWidth;
+    if (textBlockWidth != m_innerText->renderer()->width())
+        relayoutChildren = true;
     m_innerText->renderer()->style()->setWidth(Length(textBlockWidth, Fixed));
-    if (m_innerBlock)
-        m_innerBlock->renderer()->style()->setWidth(Length(m_width - paddingLeft() - paddingRight() - borderLeft() - borderRight(), Fixed));
+    if (m_innerBlock) {
+        int innerBlockWidth = m_width - paddingLeft() - paddingRight() - borderLeft() - borderRight();
+        if (innerBlockWidth != m_innerBlock->renderer()->width())
+            relayoutChildren = true;
+        m_innerBlock->renderer()->style()->setWidth(Length(innerBlockWidth, Fixed));
+    }
 
     RenderBlock::layoutBlock(relayoutChildren);