diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/dom/Position.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/dom/Position.cpp')
| -rw-r--r-- | Source/WebCore/dom/Position.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/dom/Position.cpp b/Source/WebCore/dom/Position.cpp index 77ecf5f89..9fd2c018c 100644 --- a/Source/WebCore/dom/Position.cpp +++ b/Source/WebCore/dom/Position.cpp @@ -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 @@ Position::Position(PassRefPtr<Node> anchorNode, LegacyEditingOffset offset) , 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 @@ Position::Position(PassRefPtr<Node> anchorNode, AnchorType anchorType) , 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 @@ Position::Position(PassRefPtr<Node> anchorNode, int offset, AnchorType anchorTyp , 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 @@ ContainerNode* Position::findParent(const Node* node) // FIXME: See http://web.ug/82697 #if ENABLE(SHADOW_DOM) - if (ContextFeatures::shadowDOMEnabled(node->document())) + if (RuntimeEnabledFeatures::shadowDOMEnabled()) return node->parentNode(); #endif |