Source/WebCore/dom/TreeScope.cpp - Issue 11410062: Merge 133429 - Shadow DOM should be able to be disabled per context.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/dom/TreeScope.cpp

Issue 11410062: Merge 133429 - Shadow DOM should be able to be disabled per context. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/WebCore/dom/TreeScope.cpp

===================================================================

--- Source/WebCore/dom/TreeScope.cpp (revision 134364)

+++ Source/WebCore/dom/TreeScope.cpp (working copy)

@@ -28,6 +28,7 @@

#include "ComposedShadowTreeWalker.h"

#include "ContainerNode.h"

+#include "ContextFeatures.h"

#include "DOMSelection.h"

#include "DOMWindow.h"

#include "Document.h"

@@ -42,7 +43,6 @@

#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 (RuntimeEnabledFeatures::shadowDOMEnabled()) {

+ if (ContextFeatures::shadowDOMEnabled(rootNode()->document())) {

m_selection = DOMSelection::create(this);

return m_selection.get();

}

« no previous file with comments | « Source/WebCore/dom/Position.cpp ('k') | Source/WebCore/html/HTMLTagNames.in » ('j') | no next file with comments »