Changeset 37220 in webkit

Timestamp:

Oct 2, 2008 5:43:39 PM (16 years ago)

Author:

Simon Fraser

Message:

2008-10-01 Simon Fraser <Simon Fraser>

Reviewed by Dave Hyatt

Fix RenderFileUploadControl::setStyle() and
RenderMenuList::setStyle() to not touch the style; replace
with html4.css and CSSStyleSelector changes.

​https://bugs.webkit.org/show_bug.cgi?id=21287

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::adjustRenderStyle):
• css/html4.css:
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::setStyle):
• rendering/RenderFileUploadControl.cpp:
• rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::setStyle):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (1 diff)
• css/html4.css (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderFileUploadControl.cpp (modified) (1 diff)
• rendering/RenderMenuList.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-01  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dave Hyatt
+
+        Fix RenderFileUploadControl::setStyle() and 
+        RenderMenuList::setStyle() to not touch the style; replace
+        with html4.css and CSSStyleSelector changes.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21287
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::adjustRenderStyle):
+        * css/html4.css:
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::setStyle):
+        * rendering/RenderFileUploadControl.cpp:
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::setStyle):
+
 2008-10-01  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -1463 +1463 @@
         if (style->overflowY() != OVISIBLE && style->overflowY() != OHIDDEN) 
             style->setOverflowY(OVISIBLE);
+    }
+
+    // Menulists should have visible overflow
+    if (style->appearance() == MenulistAppearance) {
+        style->setOverflowX(OVISIBLE);
+        style->setOverflowY(OVISIBLE);
     }
 

trunk/WebCore/css/html4.css

@@ -379 +379 @@
 input[type="file"] {
     -webkit-box-align: baseline;
+    text-align: start !important;
 }
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -147 +147 @@
 }
 
-void RenderBlock::setStyle(RenderStyle* _style)
-{
-    setReplaced(_style->isDisplayReplacedType());
-
-    RenderFlow::setStyle(_style);
+void RenderBlock::setStyle(RenderStyle* newStyle)
+{
+    setReplaced(newStyle->isDisplayReplacedType());
+
+    RenderFlow::setStyle(newStyle);
 
     // FIXME: We could save this call when the change only affected non-inherited properties

trunk/WebCore/rendering/RenderFileUploadControl.cpp

@@ -74 +74 @@
 void RenderFileUploadControl::setStyle(RenderStyle* newStyle)
 {
-    // Force text-align to match the direction
-    if (newStyle->direction() == LTR)
-        newStyle->setTextAlign(LEFT);
-    else
-        newStyle->setTextAlign(RIGHT);
-
     RenderBlock::setStyle(newStyle);
     if (m_button)

trunk/WebCore/rendering/RenderMenuList.cpp

@@ -123 +123 @@
     
     // Don't allow overflow on menu lists.
-    newStyle->setOverflowX(OVISIBLE);
-    newStyle->setOverflowY(OVISIBLE);
+    ASSERT(newStyle->overflowX() == OVISIBLE);
+    ASSERT(newStyle->overflowY() == OVISIBLE);
     
     RenderBlock::setStyle(newStyle);