Diff
Modified: trunk/Source/WebCore/ChangeLog (133903 => 133904)
--- trunk/Source/WebCore/ChangeLog 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/ChangeLog 2012-11-08 17:00:48 UTC (rev 133904)
@@ -1,3 +1,23 @@
+2012-11-08 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r133429.
+ http://trac.webkit.org/changeset/133429
+ https://bugs.webkit.org/show_bug.cgi?id=101173
+
+ Speculative roll out, investigating perf regression.
+
+ * dom/ContextFeatures.cpp:
+ * dom/ContextFeatures.h:
+ * dom/Position.cpp:
+ (WebCore::Position::Position):
+ (WebCore::Position::findParent):
+ * dom/TreeScope.cpp:
+ (WebCore::TreeScope::getSelection):
+ * html/HTMLTagNames.in:
+ * html/shadow/HTMLContentElement.cpp:
+ (WebCore::HTMLContentElement::contentTagName):
+ * page/DOMWindow.idl:
+
2012-11-07 Emil A Eklund <[email protected]>
Fix enclosingLayoutRect calls in InlineFlowBox.h
Modified: trunk/Source/WebCore/dom/ContextFeatures.cpp (133903 => 133904)
--- trunk/Source/WebCore/dom/ContextFeatures.cpp 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/dom/ContextFeatures.cpp 2012-11-08 17:00:48 UTC (rev 133904)
@@ -63,18 +63,6 @@
#endif
}
-bool ContextFeatures::shadowDOMEnabled(Document* document)
-{
-#if ENABLE(SHADOW_DOM)
- if (!document)
- return RuntimeEnabledFeatures::shadowDOMEnabled();
- return document->contextFeatures()->isEnabled(document, ShadowDOM, RuntimeEnabledFeatures::shadowDOMEnabled());
-#else
- UNUSED_PARAM(document);
- return false;
-#endif
-}
-
bool ContextFeatures::styleScopedEnabled(Document* document)
{
#if ENABLE(STYLE_SCOPED)
Modified: trunk/Source/WebCore/dom/ContextFeatures.h (133903 => 133904)
--- trunk/Source/WebCore/dom/ContextFeatures.h 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/dom/ContextFeatures.h 2012-11-08 17:00:48 UTC (rev 133904)
@@ -40,7 +40,6 @@
public:
enum FeatureType {
DialogElement = 0,
- ShadowDOM,
StyleScoped,
PagePopup,
HTMLNotifications,
@@ -54,7 +53,6 @@
static PassRefPtr<ContextFeatures> create(ContextFeaturesClient*);
static bool dialogElementEnabled(Document*);
- static bool shadowDOMEnabled(Document*);
static bool styleScopedEnabled(Document*);
static bool pagePopupEnabled(Document*);
static bool htmlNotificationsEnabled(Document*);
Modified: trunk/Source/WebCore/dom/Position.cpp (133903 => 133904)
--- trunk/Source/WebCore/dom/Position.cpp 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/dom/Position.cpp 2012-11-08 17:00:48 UTC (rev 133904)
@@ -27,13 +27,13 @@
#include "Position.h"
#include "CSSComputedStyleDeclaration.h"
-#include "ContextFeatures.h"
#include "HTMLNames.h"
#include "InlineTextBox.h"
#include "Logging.h"
#include "PositionIterator.h"
#include "RenderBlock.h"
#include "RenderText.h"
+#include "RuntimeEnabledFeatures.h"
#include "Text.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
@@ -82,7 +82,7 @@
, m_isLegacyEditingPosition(true)
{
#if ENABLE(SHADOW_DOM)
- ASSERT((m_anchorNode && ContextFeatures::shadowDOMEnabled(m_anchorNode->document()))
+ ASSERT((m_anchorNode && RuntimeEnabledFeatures::shadowDOMEnabled())
|| !m_anchorNode || !m_anchorNode->isShadowRoot());
#else
ASSERT(!m_anchorNode || !m_anchorNode->isShadowRoot());
@@ -96,7 +96,7 @@
, m_isLegacyEditingPosition(false)
{
#if ENABLE(SHADOW_DOM)
- ASSERT((m_anchorNode && ContextFeatures::shadowDOMEnabled(m_anchorNode->document()))
+ ASSERT((m_anchorNode && RuntimeEnabledFeatures::shadowDOMEnabled())
|| !m_anchorNode || !m_anchorNode->isShadowRoot());
#else
ASSERT(!m_anchorNode || !m_anchorNode->isShadowRoot());
@@ -114,7 +114,7 @@
, m_isLegacyEditingPosition(false)
{
#if ENABLE(SHADOW_DOM)
- ASSERT((m_anchorNode && ContextFeatures::shadowDOMEnabled(m_anchorNode->document()))
+ ASSERT((m_anchorNode && RuntimeEnabledFeatures::shadowDOMEnabled())
|| !m_anchorNode || !editingIgnoresContent(m_anchorNode.get()) || !m_anchorNode->isShadowRoot());
#else
ASSERT(!m_anchorNode || !editingIgnoresContent(m_anchorNode.get()) || !m_anchorNode->isShadowRoot());
@@ -858,7 +858,7 @@
// FIXME: See http://web.ug/82697
#if ENABLE(SHADOW_DOM)
- if (ContextFeatures::shadowDOMEnabled(node->document()))
+ if (RuntimeEnabledFeatures::shadowDOMEnabled())
return node->parentNode();
#endif
Modified: trunk/Source/WebCore/dom/TreeScope.cpp (133903 => 133904)
--- trunk/Source/WebCore/dom/TreeScope.cpp 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2012-11-08 17:00:48 UTC (rev 133904)
@@ -28,7 +28,6 @@
#include "ComposedShadowTreeWalker.h"
#include "ContainerNode.h"
-#include "ContextFeatures.h"
#include "DOMSelection.h"
#include "DOMWindow.h"
#include "Document.h"
@@ -43,6 +42,7 @@
#include "IdTargetObserverRegistry.h"
#include "InsertionPoint.h"
#include "Page.h"
+#include "RuntimeEnabledFeatures.h"
#include "ShadowRoot.h"
#include "TreeScopeAdopter.h"
#include <wtf/Vector.h>
@@ -189,7 +189,7 @@
// as a container. It is now enabled only if runtime Shadow DOM feature is enabled.
// See https://bugs.webkit.org/show_bug.cgi?id=82697
#if ENABLE(SHADOW_DOM)
- if (ContextFeatures::shadowDOMEnabled(rootNode()->document())) {
+ if (RuntimeEnabledFeatures::shadowDOMEnabled()) {
m_selection = DOMSelection::create(this);
return m_selection.get();
}
Modified: trunk/Source/WebCore/html/HTMLTagNames.in (133903 => 133904)
--- trunk/Source/WebCore/html/HTMLTagNames.in 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/html/HTMLTagNames.in 2012-11-08 17:00:48 UTC (rev 133904)
@@ -31,7 +31,7 @@
col interfaceName=HTMLTableColElement
colgroup interfaceName=HTMLTableColElement
command interfaceName=HTMLElement
-content interfaceName=HTMLContentElement, conditional=SHADOW_DOM, contextConditional=shadowDOM
+content interfaceName=HTMLContentElement, conditional=SHADOW_DOM, runtimeConditional=shadowDOM
webkitShadowContent interfaceName=HTMLElement, noConstructor
datalist interfaceName=HTMLDataListElement, conditional=DATALIST_ELEMENT
dd interfaceName=HTMLElement
@@ -97,7 +97,7 @@
optgroup interfaceName=HTMLOptGroupElement
option
output constructorNeedsFormElement
-shadow interfaceName=HTMLShadowElement, conditional=SHADOW_DOM, contextConditional=shadowDOM
+shadow interfaceName=HTMLShadowElement, conditional=SHADOW_DOM, runtimeConditional=shadowDOM
p interfaceName=HTMLParagraphElement
param
plaintext interfaceName=HTMLElement
Modified: trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp (133903 => 133904)
--- trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp 2012-11-08 17:00:48 UTC (rev 133904)
@@ -29,10 +29,10 @@
#include "ContentDistributor.h"
#include "ContentSelectorQuery.h"
-#include "ContextFeatures.h"
#include "ElementShadow.h"
#include "HTMLNames.h"
#include "QualifiedName.h"
+#include "RuntimeEnabledFeatures.h"
#include "ShadowRoot.h"
#include <wtf/StdLibExtras.h>
@@ -40,14 +40,13 @@
using HTMLNames::selectAttr;
-const QualifiedName& HTMLContentElement::contentTagName(Document* document)
+const QualifiedName& HTMLContentElement::contentTagName(Document*)
{
#if ENABLE(SHADOW_DOM)
- if (!ContextFeatures::shadowDOMEnabled(document))
+ if (!RuntimeEnabledFeatures::shadowDOMEnabled())
return HTMLNames::webkitShadowContentTag;
return HTMLNames::contentTag;
#else
- UNUSED_PARAM(document);
return HTMLNames::webkitShadowContentTag;
#endif
}
Modified: trunk/Source/WebCore/page/DOMWindow.idl (133903 => 133904)
--- trunk/Source/WebCore/page/DOMWindow.idl 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2012-11-08 17:00:48 UTC (rev 133904)
@@ -392,9 +392,9 @@
attribute EntityConstructor Entity;
attribute EntityReferenceConstructor EntityReference;
attribute ProcessingInstructionConstructor ProcessingInstruction;
- [Conditional=SHADOW_DOM, V8EnabledPerContext=shadowDOM] attribute ShadowRootConstructor WebKitShadowRoot;
- [Conditional=SHADOW_DOM, V8EnabledPerContext=shadowDOM] attribute HTMLContentElementConstructor HTMLContentElement;
- [Conditional=SHADOW_DOM, V8EnabledPerContext=shadowDOM] attribute HTMLShadowElementConstructor HTMLShadowElement;
+ [Conditional=SHADOW_DOM, V8EnabledAtRuntime=shadowDOM] attribute ShadowRootConstructor WebKitShadowRoot;
+ [Conditional=SHADOW_DOM, V8EnabledAtRuntime=shadowDOM] attribute HTMLContentElementConstructor HTMLContentElement;
+ [Conditional=SHADOW_DOM, V8EnabledAtRuntime=shadowDOM] attribute HTMLShadowElementConstructor HTMLShadowElement;
attribute DOMSelectionConstructor Selection;
attribute DOMWindowConstructor Window;
Modified: trunk/Source/WebKit/chromium/ChangeLog (133903 => 133904)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-08 17:00:48 UTC (rev 133904)
@@ -1,3 +1,14 @@
+2012-11-08 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r133429.
+ http://trac.webkit.org/changeset/133429
+ https://bugs.webkit.org/show_bug.cgi?id=101173
+
+ Speculative roll out, investigating perf regression.
+
+ * src/ContextFeaturesClientImpl.cpp:
+ (WebKit::ContextFeaturesClientImpl::askIfIsEnabled):
+
2012-11-08 Yury Semikhatsky <[email protected]>
Web Inspector: move front-end methods called from native part to InspectorFrontendAPI
Modified: trunk/Source/WebKit/chromium/src/ContextFeaturesClientImpl.cpp (133903 => 133904)
--- trunk/Source/WebKit/chromium/src/ContextFeaturesClientImpl.cpp 2012-11-08 16:45:22 UTC (rev 133903)
+++ trunk/Source/WebKit/chromium/src/ContextFeaturesClientImpl.cpp 2012-11-08 17:00:48 UTC (rev 133904)
@@ -140,7 +140,6 @@
return defaultValue;
switch (type) {
- case ContextFeatures::ShadowDOM:
case ContextFeatures::StyleScoped:
return m_client->allowWebComponents(WebDocument(document), defaultValue);
case ContextFeatures::HTMLNotifications:
