Diff
Modified: trunk/LayoutTests/ChangeLog (134431 => 134432)
--- trunk/LayoutTests/ChangeLog 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/LayoutTests/ChangeLog 2012-11-13 17:47:00 UTC (rev 134432)
@@ -1,3 +1,16 @@
+2012-11-13 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r134418.
+ http://trac.webkit.org/changeset/134418
+ https://bugs.webkit.org/show_bug.cgi?id=101903
+
+ The newly added test is crashing on cr-win.
+
+ * fast/dom/shadow/pseudoclass-update-indeterminate-input-expected.html: Removed.
+ * fast/dom/shadow/pseudoclass-update-indeterminate-input.html: Removed.
+ * fast/dom/shadow/pseudoclass-update-indeterminate-progress-expected.html: Removed.
+ * fast/dom/shadow/pseudoclass-update-indeterminate-progress.html: Removed.
+
2012-11-13 Raphael Kubo da Costa <[email protected]>
[EFL] Properly skip all HiDPI tests which are currently failing.
Deleted: trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-input-expected.html (134431 => 134432)
--- trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-input-expected.html 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-input-expected.html 2012-11-13 17:47:00 UTC (rev 134432)
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-
-<p>When input became 'indeterminate' state or not-'indeterminate' state, distribution should happen.</p>
-
-<div id="host"><span>separator 1</span><span>separator 2</span><input id="input3" type="checkbox" indeterminate="true"><span>separator 3</span><span>separator 4</span><input id="input5" type="checkbox" indeterminate="true"><span>separator 5</span></div>
-
-<script>
-input3.indeterminate = true;
-input5.indeterminate = true;
-</script>
-
-
-</body>
-</html>
-
Deleted: trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-input.html (134431 => 134432)
--- trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-input.html 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-input.html 2012-11-13 17:47:00 UTC (rev 134432)
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-</head>
-
-<body>
-
-<p>When input became 'indeterminate' state or not-'indeterminate' state, distribution should happen.</p>
-
-<div id="host">
- <input id="input1" type="checkbox">
- <span>separator 1</span>
- <input id="input2" type="checkbox">
- <span>separator 2</span>
- <input id="input3" type="checkbox">
- <span>separator 3</span>
- <input id="input4" type="text">
- <span>separator 4</span>
- <input id="input5" type="text">
- <span>separator 5</span>
- <input id="input6" type="text">
-</div>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-
-input1.indeterminate = true;
-input2.indeterminate = true;
-input4.indeterminate = true;
-input5.indeterminate = true;
-
-var shadowRoot = new WebKitShadowRoot(host);
-shadowRoot.innerHTML = '<content select="span, input:indeterminate"></content>';
-
-setTimeout(function() {
- input1.indeterminate = false;
- input3.indeterminate = true;
- input4.indeterminate = false;
- input6.indeterminate = true;
-
- input2.type = 'text';
- input5.type = 'checkbox';
- testRunner.notifyDone();
-}, 0);
-
-</script>
-</body>
-</html>
-
Deleted: trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-progress-expected.html (134431 => 134432)
--- trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-progress-expected.html 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-progress-expected.html 2012-11-13 17:47:00 UTC (rev 134432)
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<body>
-
-<p>When progress became 'indeterminate' or not-'indeterminate', distribution should happen.</p>
-
-<div id="host"><progress id="progress1"></progress><span>separator</span></div>
-</body>
-</html>
-
Deleted: trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-progress.html (134431 => 134432)
--- trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-progress.html 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/LayoutTests/fast/dom/shadow/pseudoclass-update-indeterminate-progress.html 2012-11-13 17:47:00 UTC (rev 134432)
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-</head>
-
-<body>
-
-<p>When progress became 'indeterminate' or not-'indeterminate', distribution should happen.</p>
-
-<div id="host">
- <progress id="progress1"></progress>
- <span>separator</span>
- <progress id="progress2"></progress>
-</div>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-
-var shadowRoot = new WebKitShadowRoot(host);
-shadowRoot.innerHTML = '<content select="span,progress:indeterminate"></content>';
-progress1.value = '30';
-
-setTimeout(function() {
- progress1.removeAttribute('value');
- progress2.value = '70';
- testRunner.notifyDone();
-}, 0);
-
-</script>
-</body>
-</html>
-
Modified: trunk/Source/WebCore/ChangeLog (134431 => 134432)
--- trunk/Source/WebCore/ChangeLog 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/Source/WebCore/ChangeLog 2012-11-13 17:47:00 UTC (rev 134432)
@@ -1,5 +1,27 @@
2012-11-13 Dimitri Glazkov <[email protected]>
+ Unreviewed, rolling out r134418.
+ http://trac.webkit.org/changeset/134418
+ https://bugs.webkit.org/show_bug.cgi?id=101903
+
+ The newly added test is crashing on cr-win.
+
+ * dom/ElementShadow.cpp:
+ * dom/ElementShadow.h:
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::updateType):
+ (WebCore::HTMLInputElement::setIndeterminate):
+ * html/HTMLProgressElement.cpp:
+ (WebCore::HTMLProgressElement::didElementStateChange):
+ * html/shadow/SelectRuleFeatureSet.cpp:
+ (WebCore::SelectRuleFeatureSet::add):
+ (WebCore::SelectRuleFeatureSet::clear):
+ (WebCore::SelectRuleFeatureSet::collectFeaturesFromSelector):
+ * html/shadow/SelectRuleFeatureSet.h:
+ (SelectRuleFeatureSet):
+
+2012-11-13 Dimitri Glazkov <[email protected]>
+
Unreviewed, rolling out r134391.
http://trac.webkit.org/changeset/134391
https://bugs.webkit.org/show_bug.cgi?id=99660
Modified: trunk/Source/WebCore/dom/ElementShadow.cpp (134431 => 134432)
--- trunk/Source/WebCore/dom/ElementShadow.cpp 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/Source/WebCore/dom/ElementShadow.cpp 2012-11-13 17:47:00 UTC (rev 134432)
@@ -265,21 +265,4 @@
info.addMember(m_distributor);
}
-void invalidateParentDistributionIfNecessary(Element* element, CSSSelector::PseudoType updatedPseudoType)
-{
- ElementShadow* elementShadow = shadowOfParentForDistribution(element);
- if (!elementShadow)
- return;
-
- elementShadow->ensureSelectFeatureSetCollected();
- switch (updatedPseudoType) {
- case CSSSelector::PseudoIndeterminate:
- if (elementShadow->selectRuleFeatureSet().hasSelectorForIndeterminate())
- elementShadow->invalidateDistribution();
- break;
- default:
- ASSERT_NOT_REACHED();
- }
-}
-
} // namespace
Modified: trunk/Source/WebCore/dom/ElementShadow.h (134431 => 134432)
--- trunk/Source/WebCore/dom/ElementShadow.h 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/Source/WebCore/dom/ElementShadow.h 2012-11-13 17:47:00 UTC (rev 134432)
@@ -27,7 +27,6 @@
#ifndef ElementShadow_h
#define ElementShadow_h
-#include "CSSSelector.h"
#include "ContentDistributor.h"
#include "ExceptionCode.h"
#include "SelectRuleFeatureSet.h"
@@ -90,8 +89,6 @@
bool m_shouldCollectSelectFeatureSet : 1;
};
-void invalidateParentDistributionIfNecessary(Element*, CSSSelector::PseudoType updatedPseudoType);
-
inline ShadowRoot* ElementShadow::youngestShadowRoot() const
{
return m_shadowRoots.head();
Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (134431 => 134432)
--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-11-13 17:47:00 UTC (rev 134432)
@@ -35,7 +35,6 @@
#include "CSSValueKeywords.h"
#include "DateTimeChooser.h"
#include "Document.h"
-#include "ElementShadow.h"
#include "EventNames.h"
#include "ExceptionCode.h"
#include "FileInputType.h"
@@ -51,7 +50,6 @@
#include "HTMLParserIdioms.h"
#include "IdTargetObserver.h"
#include "InputType.h"
-#include "InsertionPoint.h"
#include "KeyboardEvent.h"
#include "LocalizedStrings.h"
#include "MouseEvent.h"
@@ -533,9 +531,6 @@
updateFocusAppearance(true);
}
- if (ElementShadow* elementShadow = shadowOfParentForDistribution(this))
- elementShadow->invalidateDistribution();
-
setChangedSinceLastFormControlChangeEvent(false);
addToRadioButtonGroup();
@@ -919,7 +914,6 @@
m_isIndeterminate = newValue;
setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, CSSSelector::PseudoIndeterminate);
if (renderer() && renderer()->style()->hasAppearance())
renderer()->theme()->stateChanged(renderer(), CheckedState);
Modified: trunk/Source/WebCore/html/HTMLProgressElement.cpp (134431 => 134432)
--- trunk/Source/WebCore/html/HTMLProgressElement.cpp 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/Source/WebCore/html/HTMLProgressElement.cpp 2012-11-13 17:47:00 UTC (rev 134432)
@@ -31,7 +31,6 @@
#include "HTMLParserIdioms.h"
#include "ProgressShadowElement.h"
#include "RenderProgress.h"
-#include "SelectRuleFeatureSet.h"
#include "ShadowRoot.h"
#include <wtf/StdLibExtras.h>
@@ -159,10 +158,8 @@
if (RenderProgress* render = renderProgress()) {
bool wasDeterminate = render->isDeterminate();
render->updateFromElement();
- if (wasDeterminate != isDeterminate()) {
+ if (wasDeterminate != isDeterminate())
setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, CSSSelector::PseudoIndeterminate);
- }
}
}
Modified: trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.cpp (134431 => 134432)
--- trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.cpp 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.cpp 2012-11-13 17:47:00 UTC (rev 134432)
@@ -36,27 +36,22 @@
namespace WebCore {
SelectRuleFeatureSet::SelectRuleFeatureSet()
- : m_usesIndeterminate(false)
{
}
void SelectRuleFeatureSet::add(const SelectRuleFeatureSet& featureSet)
{
m_cssRuleFeatureSet.add(featureSet.m_cssRuleFeatureSet);
- m_usesIndeterminate |= featureSet.m_usesIndeterminate;
}
void SelectRuleFeatureSet::clear()
{
m_cssRuleFeatureSet.clear();
- m_usesIndeterminate = false;
}
void SelectRuleFeatureSet::collectFeaturesFromSelector(const CSSSelector* selector)
{
m_cssRuleFeatureSet.collectFeaturesFromSelector(selector);
- if (selector->pseudoType() == CSSSelector::PseudoIndeterminate)
- m_usesIndeterminate = true;
}
}
Modified: trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.h (134431 => 134432)
--- trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.h 2012-11-13 17:27:14 UTC (rev 134431)
+++ trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.h 2012-11-13 17:47:00 UTC (rev 134432)
@@ -47,11 +47,8 @@
bool hasSelectorForClass(const AtomicString&) const;
bool hasSelectorForAttribute(const AtomicString&) const;
- bool hasSelectorForIndeterminate() const { return m_usesIndeterminate; }
-
private:
RuleFeatureSet m_cssRuleFeatureSet;
- bool m_usesIndeterminate;
};
inline bool SelectRuleFeatureSet::hasSelectorForId(const AtomicString& idValue) const
