Diff
Modified: trunk/ChangeLog (133840 => 133841)
--- trunk/ChangeLog 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/ChangeLog 2012-11-08 04:00:28 UTC (rev 133841)
@@ -1,3 +1,12 @@
+2012-11-07 Shinya Kawanaka <shin...@chromium.org>
+
+ Unreviewed, rolling out r133428 and r133749
+ https://bugs.webkit.org/show_bug.cgi?id=101533
+
+ These patches might cause memory regression.
+
+ * Source/autotools/symbols.filter:
+
2012-11-07 Shinya Kawanaka <shin...@chromium.org>
[Shadow] Use setPseudo() instead of setShadowPseudoId().
Modified: trunk/LayoutTests/ChangeLog (133840 => 133841)
--- trunk/LayoutTests/ChangeLog 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/LayoutTests/ChangeLog 2012-11-08 04:00:28 UTC (rev 133841)
@@ -1,3 +1,14 @@
+2012-11-07 Shinya Kawanaka <shin...@chromium.org>
+
+ Unreviewed, rolling out r133428 and r133749
+ https://bugs.webkit.org/show_bug.cgi?id=101533
+
+ These patches might cause memory regression.
+
+ * fast/dom/shadow/styling-pseudo-attribute-expected.html: Removed.
+ * fast/dom/shadow/styling-pseudo-attribute.html: Removed.
+ * platform/chromium/TestExpectations:
+
2012-11-07 Hayato Ito <hay...@chromium.org>
Unreviewed gardening.
Deleted: trunk/LayoutTests/fast/dom/shadow/styling-pseudo-attribute-expected.html (133840 => 133841)
--- trunk/LayoutTests/fast/dom/shadow/styling-pseudo-attribute-expected.html 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/LayoutTests/fast/dom/shadow/styling-pseudo-attribute-expected.html 2012-11-08 04:00:28 UTC (rev 133841)
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-#target {
- color: red;
-}
-</style>
-<div><div id="target">foo bar</div></div>
-
-</html>
Deleted: trunk/LayoutTests/fast/dom/shadow/styling-pseudo-attribute.html (133840 => 133841)
--- trunk/LayoutTests/fast/dom/shadow/styling-pseudo-attribute.html 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/LayoutTests/fast/dom/shadow/styling-pseudo-attribute.html 2012-11-08 04:00:28 UTC (rev 133841)
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-#host1::x-foo {
- color: red;
-}
-</style>
-<div id="host1"></div>
-
-<script>
-var shadowRoot1 = new WebKitShadowRoot(host1);
-var div = document.createElement('div');
-div.setAttribute('pseudo', 'x-foo');
-div.appendChild(document.createTextNode('foo bar'));
-
-shadowRoot1.appendChild(div);
-</script>
-
-
-</html>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (133840 => 133841)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-08 04:00:28 UTC (rev 133841)
@@ -4169,6 +4169,11 @@
# This test is consistently leaking state into the next test (object-src-url-allowed.html) after r133069.
webkit.org/b/100955 http/tests/security/contentSecurityPolicy/object-src-none-blocked.html [ Skip ]
+# Temporarily skip these tests since dependant patches were rolled out.
+webkit.org/b/101533 fast/dom/shadow/pseudo-attribute-dynamic.html [ Skip ]
+webkit.org/b/101533 fast/dom/shadow/shadow-pseudo-id.html [ Skip ]
+webkit.org/b/101533 fast/dom/shadow/pseudo-attribute-rendering.html [ Skip ]
+
webkit.org/b/101377 [ Linux Debug ] platform/chromium-linux/fast/text/international/complex-joining-using-gpos.html [ Failure ImageOnlyFailure Pass ]
webkit.org/b/101408 platform/chromium/fast/forms/calendar-picker/calendar-picker-key-operations.html [ Failure Pass ]
Modified: trunk/Source/WebCore/ChangeLog (133840 => 133841)
--- trunk/Source/WebCore/ChangeLog 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/ChangeLog 2012-11-08 04:00:28 UTC (rev 133841)
@@ -1,3 +1,49 @@
+2012-11-07 Shinya Kawanaka <shin...@chromium.org>
+
+ Unreviewed, rolling out r133428 and r133749
+ https://bugs.webkit.org/show_bug.cgi?id=101533
+
+ These patches might cause memory regression.
+
+ * WebCore.exp.in:
+ * dom/Element.cpp:
+ (WebCore::Element::shadowPseudoId):
+ (WebCore):
+ (WebCore::Element::setShadowPseudoId):
+ * dom/Element.h:
+ (Element):
+ * dom/ElementRareData.cpp:
+ (WebCore::ElementRareData::reportMemoryUsage):
+ * dom/ElementRareData.h:
+ (ElementRareData):
+ * html/BaseMultipleFieldsDateAndTimeInputType.cpp:
+ (WebCore::BaseMultipleFieldsDateAndTimeInputType::createShadowSubtree):
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::createShadowSubtree):
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::updatePlaceholderText):
+ * html/RangeInputType.cpp:
+ (WebCore::RangeInputType::createShadowSubtree):
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::createShadowSubtree):
+ (WebCore::TextFieldInputType::updatePlaceholderText):
+ * html/ValidationMessage.cpp:
+ (WebCore::ValidationMessage::buildBubbleTree):
+ * html/shadow/DateTimeEditElement.cpp:
+ (WebCore::DateTimeEditBuilder::visitLiteral):
+ (WebCore::DateTimeEditElement::DateTimeEditElement):
+ * html/shadow/DateTimeFieldElement.cpp:
+ (WebCore::DateTimeFieldElement::initialize):
+ * html/shadow/DateTimeFieldElement.h:
+ (DateTimeFieldElement):
+ * html/shadow/PickerIndicatorElement.cpp:
+ (WebCore::PickerIndicatorElement::PickerIndicatorElement):
+ * html/track/TextTrackCue.cpp:
+ (WebCore::TextTrackCueBox::TextTrackCueBox):
+ (WebCore::TextTrackCue::updateDisplayTree):
+ * testing/Internals.cpp:
+ (WebCore::Internals::setShadowPseudoId):
+
2012-11-07 Ryosuke Niwa <rn...@webkit.org>
Crash in WebCore::RenderLayer::normalFlowList
Modified: trunk/Source/WebCore/WebCore.exp.in (133840 => 133841)
--- trunk/Source/WebCore/WebCore.exp.in 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-11-08 04:00:28 UTC (rev 133841)
@@ -853,9 +853,9 @@
__ZN7WebCore7Console24setShouldPrintExceptionsEb
__ZN7WebCore7Element12setAttributeERKN3WTF12AtomicStringES4_Ri
__ZN7WebCore7Element12setAttributeERKNS_13QualifiedNameERKN3WTF12AtomicStringE
+__ZN7WebCore7Element17setShadowPseudoIdERKN3WTF12AtomicStringERi
__ZN7WebCore7Element21boundsInRootViewSpaceEv
__ZN7WebCore7Element9innerTextEv
-__ZN7WebCore7Element9setPseudoERKN3WTF12AtomicStringE
__ZN7WebCore7IntRect5scaleEf
__ZN7WebCore7IntRect5uniteERKS0_
__ZN7WebCore7IntRect9intersectERKS0_
Modified: trunk/Source/WebCore/dom/Element.cpp (133840 => 133841)
--- trunk/Source/WebCore/dom/Element.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -1354,9 +1354,22 @@
const AtomicString& Element::shadowPseudoId() const
{
- return pseudo();
+ return hasRareData() ? elementRareData()->m_shadowPseudoId : nullAtom;
}
+void Element::setShadowPseudoId(const AtomicString& id, ExceptionCode& ec)
+{
+ if (!hasRareData() && id == nullAtom)
+ return;
+
+ if (!CSSSelector::isCustomPseudoType(id)) {
+ ec = SYNTAX_ERR;
+ return;
+ }
+
+ ensureElementRareData()->m_shadowPseudoId = id;
+}
+
bool Element::childTypeAllowed(NodeType type) const
{
switch (type) {
Modified: trunk/Source/WebCore/dom/Element.h (133840 => 133841)
--- trunk/Source/WebCore/dom/Element.h 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/dom/Element.h 2012-11-08 04:00:28 UTC (rev 133841)
@@ -280,6 +280,7 @@
ShadowRoot* userAgentShadowRoot() const;
virtual const AtomicString& shadowPseudoId() const;
+ void setShadowPseudoId(const AtomicString&, ExceptionCode& = ASSERT_NO_EXCEPTION);
RenderStyle* computedStyle(PseudoId = NOPSEUDO);
Modified: trunk/Source/WebCore/dom/ElementRareData.cpp (133840 => 133841)
--- trunk/Source/WebCore/dom/ElementRareData.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/dom/ElementRareData.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -42,6 +42,7 @@
NodeRareData::reportMemoryUsage(memoryObjectInfo);
info.addMember(m_cachedCollections);
info.addMember(m_computedStyle);
+ info.addMember(m_shadowPseudoId);
info.addMember(m_datasetDOMStringMap);
info.addMember(m_classList);
Modified: trunk/Source/WebCore/dom/ElementRareData.h (133840 => 133841)
--- trunk/Source/WebCore/dom/ElementRareData.h 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2012-11-08 04:00:28 UTC (rev 133841)
@@ -114,6 +114,7 @@
LayoutSize m_minimumSizeForResizing;
RefPtr<RenderStyle> m_computedStyle;
+ AtomicString m_shadowPseudoId;
OwnPtr<DatasetDOMStringMap> m_datasetDOMStringMap;
OwnPtr<ClassList> m_classList;
Modified: trunk/Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -161,7 +161,7 @@
Document* document = element()->document();
RefPtr<HTMLDivElement> container = HTMLDivElement::create(document);
element()->userAgentShadowRoot()->appendChild(container);
- container->setPseudo(dateAndTimeInputContainerPseudoId);
+ container->setShadowPseudoId(dateAndTimeInputContainerPseudoId);
RefPtr<DateTimeEditElement> dateTimeEditElement(DateTimeEditElement::create(document, *this));
m_dateTimeEditElement = dateTimeEditElement.get();
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -118,9 +118,9 @@
Document* document = element()->document();
RefPtr<HTMLDivElement> wrapperElement = HTMLDivElement::create(document);
- wrapperElement->setPseudo(AtomicString("-webkit-color-swatch-wrapper", AtomicString::ConstructFromLiteral));
+ wrapperElement->setShadowPseudoId("-webkit-color-swatch-wrapper");
RefPtr<HTMLDivElement> colorSwatch = HTMLDivElement::create(document);
- colorSwatch->setPseudo(AtomicString("-webkit-color-swatch", AtomicString::ConstructFromLiteral));
+ colorSwatch->setShadowPseudoId("-webkit-color-swatch");
ExceptionCode ec = 0;
wrapperElement->appendChild(colorSwatch.release(), ec);
ASSERT(!ec);
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -544,7 +544,7 @@
if (!m_placeholder) {
RefPtr<HTMLDivElement> placeholder = HTMLDivElement::create(document());
m_placeholder = placeholder.get();
- m_placeholder->setPseudo(AtomicString("-webkit-input-placeholder", AtomicString::ConstructFromLiteral));
+ m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
userAgentShadowRoot()->insertBefore(m_placeholder, innerTextElement()->nextSibling(), ec);
ASSERT(!ec);
}
Modified: trunk/Source/WebCore/html/RangeInputType.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/RangeInputType.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/RangeInputType.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -255,7 +255,7 @@
Document* document = element()->document();
RefPtr<HTMLDivElement> track = HTMLDivElement::create(document);
- track->setPseudo(AtomicString("-webkit-slider-runnable-track", AtomicString::ConstructFromLiteral));
+ track->setShadowPseudoId("-webkit-slider-runnable-track");
ExceptionCode ec = 0;
track->appendChild(SliderThumbElement::create(document), ec);
RefPtr<HTMLElement> container = SliderContainerElement::create(document);
Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -245,7 +245,7 @@
ShadowRoot* shadowRoot = element()->userAgentShadowRoot();
m_container = HTMLDivElement::create(document);
- m_container->setPseudo(AtomicString("-webkit-textfield-decoration-container", AtomicString::ConstructFromLiteral));
+ m_container->setShadowPseudoId("-webkit-textfield-decoration-container");
shadowRoot->appendChild(m_container, ec);
m_innerBlock = TextControlInnerElement::create(document);
@@ -413,7 +413,7 @@
}
if (!m_placeholder) {
m_placeholder = HTMLDivElement::create(element()->document());
- m_placeholder->setPseudo(AtomicString("-webkit-input-placeholder", AtomicString::ConstructFromLiteral));
+ m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
element()->userAgentShadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
ASSERT(!ec);
}
Modified: trunk/Source/WebCore/html/ValidationMessage.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/ValidationMessage.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/ValidationMessage.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -179,7 +179,7 @@
Document* doc = m_element->document();
m_bubble = HTMLDivElement::create(doc);
- m_bubble->setPseudo(AtomicString("-webkit-validation-bubble", AtomicString::ConstructFromLiteral));
+ m_bubble->setShadowPseudoId("-webkit-validation-bubble");
// Need to force position:absolute because RenderMenuList doesn't assume it
// contains non-absolute or non-fixed renderers as children.
m_bubble->setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
@@ -190,26 +190,26 @@
adjustBubblePosition(m_element->boundingBox(), m_bubble.get());
RefPtr<HTMLDivElement> clipper = HTMLDivElement::create(doc);
- clipper->setPseudo(AtomicString("-webkit-validation-bubble-arrow-clipper", AtomicString::ConstructFromLiteral));
+ clipper->setShadowPseudoId("-webkit-validation-bubble-arrow-clipper");
RefPtr<HTMLDivElement> bubbleArrow = HTMLDivElement::create(doc);
- bubbleArrow->setPseudo(AtomicString("-webkit-validation-bubble-arrow", AtomicString::ConstructFromLiteral));
+ bubbleArrow->setShadowPseudoId("-webkit-validation-bubble-arrow");
clipper->appendChild(bubbleArrow.release(), ec);
ASSERT(!ec);
m_bubble->appendChild(clipper.release(), ec);
ASSERT(!ec);
RefPtr<HTMLElement> message = HTMLDivElement::create(doc);
- message->setPseudo(AtomicString("-webkit-validation-bubble-message", AtomicString::ConstructFromLiteral));
+ message->setShadowPseudoId("-webkit-validation-bubble-message");
RefPtr<HTMLElement> icon = HTMLDivElement::create(doc);
- icon->setPseudo(AtomicString("-webkit-validation-bubble-icon", AtomicString::ConstructFromLiteral));
+ icon->setShadowPseudoId("-webkit-validation-bubble-icon");
message->appendChild(icon.release(), ASSERT_NO_EXCEPTION);
RefPtr<HTMLElement> textBlock = HTMLDivElement::create(doc);
- textBlock->setPseudo(AtomicString("-webkit-validation-bubble-text-block", AtomicString::ConstructFromLiteral));
+ textBlock->setShadowPseudoId("-webkit-validation-bubble-text-block");
m_messageHeading = HTMLDivElement::create(doc);
- m_messageHeading->setPseudo(AtomicString("-webkit-validation-bubble-heading", AtomicString::ConstructFromLiteral));
+ m_messageHeading->setShadowPseudoId("-webkit-validation-bubble-heading");
textBlock->appendChild(m_messageHeading, ASSERT_NO_EXCEPTION);
m_messageBody = HTMLDivElement::create(doc);
- m_messageBody->setPseudo(AtomicString("-webkit-validation-bubble-body", AtomicString::ConstructFromLiteral));
+ m_messageBody->setShadowPseudoId("-webkit-validation-bubble-body");
textBlock->appendChild(m_messageBody, ASSERT_NO_EXCEPTION);
message->appendChild(textBlock.release(), ASSERT_NO_EXCEPTION);
m_bubble->appendChild(message.release(), ASSERT_NO_EXCEPTION);
Modified: trunk/Source/WebCore/html/shadow/DateTimeEditElement.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/shadow/DateTimeEditElement.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/shadow/DateTimeEditElement.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -235,7 +235,7 @@
DEFINE_STATIC_LOCAL(AtomicString, textPseudoId, ("-webkit-datetime-edit-text", AtomicString::ConstructFromLiteral));
ASSERT(text.length());
RefPtr<HTMLDivElement> element = HTMLDivElement::create(m_editElement.document());
- element->setPseudo(textPseudoId);
+ element->setShadowPseudoId(textPseudoId);
element->appendChild(Text::create(m_editElement.document(), text));
m_editElement.appendChild(element);
}
@@ -250,8 +250,8 @@
: HTMLDivElement(divTag, document)
, m_editControlOwner(&editControlOwner)
{
- DEFINE_STATIC_LOCAL(AtomicString, dateTimeEditPseudoId, ("-webkit-datetime-edit", AtomicString::ConstructFromLiteral));
- setPseudo(dateTimeEditPseudoId);
+ DEFINE_STATIC_LOCAL(AtomicString, dateTimeEditPseudoId, ("-webkit-datetime-edit"));
+ setShadowPseudoId(dateTimeEditPseudoId);
}
DateTimeEditElement::~DateTimeEditElement()
Modified: trunk/Source/WebCore/html/shadow/DateTimeFieldElement.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -135,12 +135,12 @@
m_fieldOwner->focusOnNextField(*this);
}
-void DateTimeFieldElement::initialize(const AtomicString& pseudo, const String& axHelpText)
+void DateTimeFieldElement::initialize(const AtomicString& shadowPseudoId, const String& axHelpText)
{
setAttribute(aria_helpAttr, axHelpText);
setAttribute(aria_valueminAttr, String::number(minimum()));
setAttribute(aria_valuemaxAttr, String::number(maximum()));
- setPseudo(pseudo);
+ setShadowPseudoId(shadowPseudoId);
appendChild(Text::create(document(), visibleValue()));
}
Modified: trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h (133840 => 133841)
--- trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h 2012-11-08 04:00:28 UTC (rev 133841)
@@ -81,7 +81,7 @@
virtual void didFocus();
void focusOnNextField();
virtual void handleKeyboardEvent(KeyboardEvent*) = 0;
- void initialize(const AtomicString& pseudo, const String& axHelpText);
+ void initialize(const AtomicString& shadowPseudoId, const String& axHelpText);
AtomicString localeIdentifier() const;
virtual int maximum() const = 0;
virtual int minimum() const = 0;
Modified: trunk/Source/WebCore/html/shadow/PickerIndicatorElement.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/shadow/PickerIndicatorElement.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/shadow/PickerIndicatorElement.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -48,7 +48,7 @@
inline PickerIndicatorElement::PickerIndicatorElement(Document* document)
: HTMLDivElement(divTag, document)
{
- setPseudo(AtomicString("-webkit-calendar-picker-indicator", AtomicString::ConstructFromLiteral));
+ setShadowPseudoId("-webkit-calendar-picker-indicator");
}
PassRefPtr<PickerIndicatorElement> PickerIndicatorElement::create(Document* document)
Modified: trunk/Source/WebCore/html/track/TextTrackCue.cpp (133840 => 133841)
--- trunk/Source/WebCore/html/track/TextTrackCue.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/html/track/TextTrackCue.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -95,6 +95,7 @@
: HTMLElement(divTag, document)
, m_cue(cue)
{
+ setShadowPseudoId(shadowPseudoId());
}
TextTrackCue* TextTrackCueBox::getCue() const
@@ -677,10 +678,10 @@
// Clear the contents of the two sets.
m_futureDocumentNodes->removeChildren();
- m_futureDocumentNodes->setPseudo(futureNodesShadowPseudoId());
+ m_futureDocumentNodes->setShadowPseudoId(futureNodesShadowPseudoId());
m_pastDocumentNodes->removeChildren();
- m_pastDocumentNodes->setPseudo(pastNodesShadowPseudoId());
+ m_pastDocumentNodes->setShadowPseudoId(pastNodesShadowPseudoId());
// Update the two sets containing past and future WebVTT objects.
RefPtr<DocumentFragment> referenceTree = getCueAsHTML();
Modified: trunk/Source/WebCore/testing/Internals.cpp (133840 => 133841)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-11-08 04:00:28 UTC (rev 133841)
@@ -537,7 +537,7 @@
return;
}
- return element->setPseudo(id);
+ return element->setShadowPseudoId(id, ec);
}
String Internals::visiblePlaceholder(Element* element)
Modified: trunk/Source/WebKit2/ChangeLog (133840 => 133841)
--- trunk/Source/WebKit2/ChangeLog 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-08 04:00:28 UTC (rev 133841)
@@ -1,3 +1,13 @@
+2012-11-07 Shinya Kawanaka <shin...@chromium.org>
+
+ Unreviewed, rolling out r133428 and r133749
+ https://bugs.webkit.org/show_bug.cgi?id=101533
+
+ These patches might cause memory regression.
+
+ * win/WebKit2.def:
+ * win/WebKit2CFLite.def:
+
2012-11-07 Anders Carlsson <ander...@apple.com>
Add RemoteGraphicsLayer class
Modified: trunk/Source/WebKit2/win/WebKit2.def (133840 => 133841)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-11-08 04:00:28 UTC (rev 133841)
@@ -234,6 +234,7 @@
?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
?setSansSerifFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setScrollbarsSuppressed@ScrollView@WebCore@@QAEX_N0@Z
+ ?setShadowPseudoId@Element@WebCore@@QAEXABVAtomicString@WTF@@AAH@Z
?setDelegatesScrolling@ScrollView@WebCore@@QAEX_N@Z
?setScrollOffsetFromInternals@ScrollableArea@WebCore@@QAEXABVIntPoint@2@@Z
?setSerifFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
@@ -241,7 +242,6 @@
?setStorageBlockingPolicy@Settings@WebCore@@QAEXW4StorageBlockingPolicy@SecurityOrigin@2@@Z
?setSuggestedValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
?setEditingValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
- ?setPseudo@Element@WebCore@@QAEXABVAtomicString@WTF@@@Z
?setResolutionOverride@Settings@WebCore@@QAEXABVIntSize@2@@Z
?setMediaTypeOverride@Settings@WebCore@@QAEXABVString@WTF@@@Z
?settings@Document@WebCore@@QBEPAVSettings@2@XZ
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (133840 => 133841)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-11-08 04:00:28 UTC (rev 133841)
@@ -224,10 +224,10 @@
?setPageScaleFactor@Page@WebCore@@QAEXMABVIntPoint@2@@Z
?setPagination@Page@WebCore@@QAEXABUPagination@2@@Z
?setPictographFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
- ?setPseudo@Element@WebCore@@QAEXABVAtomicString@WTF@@@Z
?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
?setSansSerifFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setScrollbarsSuppressed@ScrollView@WebCore@@QAEX_N0@Z
+ ?setShadowPseudoId@Element@WebCore@@QAEXABVAtomicString@WTF@@AAH@Z
?setDelegatesScrolling@ScrollView@WebCore@@QAEX_N@Z
?setScrollOffsetFromInternals@ScrollableArea@WebCore@@QAEXABVIntPoint@2@@Z
?setSerifFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
Modified: trunk/Source/autotools/symbols.filter (133840 => 133841)
--- trunk/Source/autotools/symbols.filter 2012-11-08 03:50:25 UTC (rev 133840)
+++ trunk/Source/autotools/symbols.filter 2012-11-08 04:00:28 UTC (rev 133841)
@@ -117,7 +117,7 @@
_ZN7WebCore6JSNode6s_infoE;
_ZN7WebCore6toNodeEN3JSC7JSValueE;
_ZN7WebCore7Element20removeShadowRootListEv;
-_ZN7WebCore7Element9setPseudoERKN3WTF12AtomicStringE;
+_ZN7WebCore7Element17setShadowPseudoIdERKN3WTF12AtomicStringERi;
_ZN7WebCore7jsArrayEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_13DOMStringListEEE;
_ZN7WebCore7toRangeEN3JSC7JSValueE;
_ZN7WebCore9DOMWindow4openERKN3WTF6StringERKNS1_12AtomicStringES4_PS0_S8_;
