| Index: Source/core/dom/Element.cpp
|
| diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
|
| index fd8edc04f28a8a212ce5a02adaa6a5efb06933f8..447a9faed74866495c913dadcf38584dbe62b620 100644
|
| --- a/Source/core/dom/Element.cpp
|
| +++ b/Source/core/dom/Element.cpp
|
| @@ -1152,22 +1152,18 @@ void Element::setChangedSinceLastFormControlChangeEvent(bool)
|
|
|
| bool Element::isDisabledFormControl() const
|
| {
|
| -#if ENABLE(DIALOG_ELEMENT)
|
| // FIXME: disabled and inert are separate concepts in the spec, but now we treat them as the same.
|
| // For example, an inert, non-disabled form control should not be grayed out.
|
| if (isInert())
|
| return true;
|
| -#endif
|
| return false;
|
| }
|
|
|
| -#if ENABLE(DIALOG_ELEMENT)
|
| bool Element::isInert() const
|
| {
|
| Element* dialog = document()->activeModalDialog();
|
| return dialog && !containsIncludingShadowDOM(dialog) && !dialog->containsIncludingShadowDOM(this);
|
| }
|
| -#endif
|
|
|
| Node::InsertionNotificationRequest Element::insertedInto(ContainerNode* insertionPoint)
|
| {
|
| @@ -1222,9 +1218,7 @@ void Element::removedFrom(ContainerNode* insertionPoint)
|
| if (Element* after = pseudoElement(AFTER))
|
| after->removedFrom(insertionPoint);
|
|
|
| -#if ENABLE(DIALOG_ELEMENT)
|
| document()->removeFromTopLayer(this);
|
| -#endif
|
| if (containsFullScreenElement())
|
| setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
|
|
|
| @@ -2477,7 +2471,6 @@ void Element::setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(boo
|
| element->setContainsFullScreenElement(flag);
|
| }
|
|
|
| -#if ENABLE(DIALOG_ELEMENT)
|
| bool Element::isInTopLayer() const
|
| {
|
| return hasRareData() && elementRareData()->isInTopLayer();
|
| @@ -2493,7 +2486,6 @@ void Element::setIsInTopLayer(bool inTopLayer)
|
| // top layer position, or in its usual place if not in the top layer.
|
| reattachIfAttached();
|
| }
|
| -#endif
|
|
|
| void Element::webkitRequestPointerLock()
|
| {
|
|
|