Attachment 9015 Details for Bug 8351 – Improved patch

[patch] Improved patch

8351-2.diff (text/plain), 1.91 KB, created by Rob Buis on 2006-06-25 03:09:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2006-06-25 03:09:32 PDT

Size: 1.91 KB

patch

obsolete

>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 15025)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2006-06-25  Rob Buis  <buis@kde.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8351:
>+        display:none has no effect on <option> element
>+
>+        Simple check for style="display:none" on option elements.
>+
>+        * rendering/DeprecatedRenderSelect.cpp:
>+        (WebCore::DeprecatedRenderSelect::updateFromElement):
>+
> 2006-06-24  David Kilzer  <ddkilzer@kilzer.net>
> 
>         Build fix.  Reviewed by NOBODY.
>Index: WebCore/rendering/DeprecatedRenderSelect.cpp
>===================================================================
>--- WebCore/rendering/DeprecatedRenderSelect.cpp	(revision 15025)
>+++ WebCore/rendering/DeprecatedRenderSelect.cpp	(working copy)
>@@ -25,6 +25,8 @@
> 
> #include "config.h"
> #include "DeprecatedRenderSelect.h"
>+#include "CSSPropertyNames.h"
>+#include "CSSValueKeywords.h"
> 
> #include "HTMLNames.h"
> #include "HTMLOptGroupElement.h"
>@@ -114,6 +116,14 @@ void DeprecatedRenderSelect::updateFromE
> 
>         bool groupEnabled = true;
>         for (listIndex = 0; listIndex < int(listItems.size()); listIndex++) {
>+            if (listItems[listIndex]->style()) {
>+                RefPtr<CSSValue> val = listItems[listIndex]->style()->getPropertyCSSValue(CSS_PROP_DISPLAY);
>+                if (val && val->isPrimitiveValue()) {
>+                    if (static_cast<CSSPrimitiveValue *>(val.get())->getIdent() == CSS_VAL_NONE)
>+                    continue;
>+                }
>+            }
>+
>             if (listItems[listIndex]->hasTagName(optgroupTag)) {
>                 HTMLOptGroupElement* optgroupElement = static_cast<HTMLOptGroupElement*>(listItems[listIndex]);
>                 DeprecatedString label = optgroupElement->getAttribute(labelAttr).deprecatedString();

Flags:

darin: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 8351: 8024 | 8979 | 8980 | 9015 | 95787 | 193498 | 193499 | 193522 | 193530