Merge 118772 - REGRESSION(r109729): The optgroup element's "disabled" attribute has no effect to re…

Source/WebCore/css/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 1355 matching lines @@
         HTMLProgressElement* thisProgressElement = static_cast<HTMLProgressElement*>(element);
         HTMLProgressElement* otherProgressElement = static_cast<HTMLProgressElement*>(m_element);
         if (thisProgressElement->isDeterminate() != otherProgressElement->isDeterminate())
             return false;
     }
 #endif
 
     if (element->hasTagName(optionTag))
         return false;
 
+    if (element->hasTagName(optgroupTag) && m_element->disabled() != element->disabled())
+        return false;
+
     bool isControl = element->isFormControlElement();
 
     if (isControl != m_element->isFormControlElement())
         return false;
 
     if (isControl && !canShareStyleWithControl(element))
         return false;
 
     if (style->transitions() || style->animations())
         return false;
@@ skipping 4457 matching lines @@
         }
         default:
             ASSERT_NOT_REACHED();
         }
     }
 
     m_pendingImageProperties.clear();
 }
 
 } // namespace WebCore