From f486d19d62f1bc33246748b14b14a9dfa617b57f Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Thu, 19 Aug 2010 17:55:56 +0100 Subject: Merge WebKit at r65615 : Initial merge by git. Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79 --- WebCore/dom/Element.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'WebCore/dom/Element.cpp') diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp index 0e89e93..849b900 100644 --- a/WebCore/dom/Element.cpp +++ b/WebCore/dom/Element.cpp @@ -50,6 +50,7 @@ #include "RenderLayer.h" #include "RenderView.h" #include "RenderWidget.h" +#include "Settings.h" #include "TextIterator.h" #include "XMLNames.h" #include @@ -90,7 +91,7 @@ NodeRareData* Element::createRareData() return new ElementRareData; } -PassRefPtr Element::createContextualFragment(const String& markup, FragmentScriptingPermission scriptingPermission) +PassRefPtr Element::deprecatedCreateContextualFragment(const String& markup, FragmentScriptingPermission scriptingPermission) { RefPtr fragment = document()->createDocumentFragment(); @@ -101,14 +102,14 @@ PassRefPtr Element::createContextualFragment(const String& mar // FIXME: We should propagate a syntax error exception out here. return 0; } - + // Exceptions are ignored because none ought to happen here. ExceptionCode ignoredExceptionCode; - + // We need to pop and elements and remove to // accommodate folks passing complete HTML documents to make the // child of an element. - + RefPtr nextNode; for (RefPtr node = fragment->firstChild(); node; node = nextNode) { nextNode = node->nextSibling(); @@ -131,7 +132,6 @@ PassRefPtr Element::createContextualFragment(const String& mar ASSERT(!ignoredExceptionCode); } } - return fragment.release(); } -- cgit v1.1