mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
1e24b22ef4
- Bug 1150366 - Remove duplicate d3.js. r=jsantell (71f991da6) - Bug 1175352 - Refactor LoadInfo arguments to be more self contained (r=bent) (3f7d08164) - Bug 1181533 - Add nsCRTGlue.h and prtime.h includes to nsDownloadManager.cpp to fix --disable-safe-browsing build bustage. r=froydnj (af338edf1) - Bug 905127 - Part 1 - Make some functions from nsNetUtil not inline. r=jduell Bug 905127 - Part 2 - remove unnecessary nsNetUtil.h includes r=jduell Bug 905127 - Make some functions from nsNetUtil not inline. r=jduell (bc47d5b3a) - Bug 1117650 - Part 1: Move all CORS tests into dom/security/test. r=sicking (6f727387c) - Bug 1117650 - Part 2: Move all MixedContent tests into dom/security/test. r=tanvi (73f273829) - Bug 1004703 - ignore 'unsafe-inline' if nonce- or hash-source specifed - tests (r=sstamm) (ebf411159) - Bug 921493 - CSP: test whitelisting of scheme-relative sources (r=dveditz) (f0618b189) - Bug 1139569 - Optimize update function for element editors in markup view;r=mratcliffe (c60d38dca) - Partil of Bug 1139644 - Make markupview use sdk timers instead of individual timers for each window;r=pbrosset (8bc1a4d66) - Bug 1146568 - Avoid unsafe CPOW usage warnings in browser_markupview_tag_edit_08.js; r=bgrins Making use of the devtools test frame-script to set the test node's attributes instead of using a CPOW. (61d7eed64) - Bug 1146568 - Avoid unsafe CPOW usage in markupview tests, in assertAttributes helper; r=bgrins (efc492d5d) - Bug 858038 - Allow moving elements in the markupview by drag/drop; r=pbrosset (51d79c15c) - Bug 1139644 - Flash only relevant attributes in markup view when changed;r=pbrosset (29807fa46) - Bug 1147128 - Make sure attribute shows up in markup view after removing and setting to the previous value;r=mratcliffe (1947f7417) - Bug 1147325 - Clear box model timer on markup view destroy. r=pbrosset Prevents 'this._inspector.toolbox is null' spam in mochitest-dt (1d6808b4a) - Bug 921102 - 1 - Linkify URIs in the inspector; r=tromey, miker This first part adds a parser for node attributes which, given some node information and an attribute name, generates a small AST-like array of objects that tells which parts of the attribute (if any) are links, and what they link to. Using this, the markup-view generates the right HTML structure to display these parts as links. This part 1 doesn't yet allow users to follow these links. (c500e270e) - Bug 1139667 - CSP tests for fetch(). r=ckirschb (df030457f) - Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions - tests (r=sstamm) (dee0f2239) - Bug 1117650 - Part 3: Move all CSP tests into dom/security/test. r=sstamm (29c95475c) - Bug 1146566 - 1 - Use devtools common frame-script in markupview tests and add helper; r=bgrins (b10e42468) - Bug 1146566 - 2 - Avoid using CPOWs in test browser_markupview_tag_edit_03.js; r=bgrins This change updates the browser_markupview_tag_edit_03.js test by making use of the getDomElementInfo message listener to retrieve information about the tested nodes without having to go through CPOWs. (07f0ee3ff) - Bug 1036324 - Adds option to walker.parents() to not traverse DocShellTreeItems of different types (24123a5d2) - Bug 921102 - 2 - Markup-view tests for attribute links; r=miker (f6da81799) - Bug 901250 - Add scroll into view menu item for the inspector. r=bgrins (bfc7518b1) - Bug 994055 - Part 1: Add a toggle sidebar panel button to the inspector. r=miker This adds a new icon, next to the searchbox (like in the debugger) to expand or collapse the sidebar panel in the inspector. The state is *not* persisted yet when the toolbox is closed. The button is hidden when the toolbox host switches to 'side'. (87730e20a) - Bug 994055 - Part 2: Add tests for the inspector sidebar toggle button. r=miker (2872c3fbd) - Bug 921102 - 3 - Open/copy markup-view attribute links; r=bgrins This part adds contextual menu items that become enabled when the user right clicks on an attribute that has a link. Depending on the nature of the link, a new tab will be opened or a node selected. The user can also choose to copy the link in the clipboard. (9b93485f6) - Bug 921102 - 4 - Tests for the open/copy links on markup-view attributes; r=bgrins (861ba51f6)
435 lines
13 KiB
C++
435 lines
13 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsXMLContentSink.h"
|
|
#include "nsIFragmentContentSink.h"
|
|
#include "nsIXMLContentSink.h"
|
|
#include "nsContentSink.h"
|
|
#include "nsIExpatSink.h"
|
|
#include "nsIDTD.h"
|
|
#include "nsIDocument.h"
|
|
#include "nsIDOMDocumentFragment.h"
|
|
#include "nsIContent.h"
|
|
#include "nsGkAtoms.h"
|
|
#include "mozilla/dom/NodeInfo.h"
|
|
#include "nsContentCreatorFunctions.h"
|
|
#include "nsError.h"
|
|
#include "nsIConsoleService.h"
|
|
#include "nsIScriptError.h"
|
|
#include "nsTHashtable.h"
|
|
#include "nsHashKeys.h"
|
|
#include "nsTArray.h"
|
|
#include "nsCycleCollectionParticipant.h"
|
|
#include "nsIDocShell.h"
|
|
#include "nsScriptLoader.h"
|
|
#include "mozilla/css/Loader.h"
|
|
#include "mozilla/dom/DocumentFragment.h"
|
|
#include "mozilla/dom/ProcessingInstruction.h"
|
|
|
|
using namespace mozilla::dom;
|
|
|
|
class nsXMLFragmentContentSink : public nsXMLContentSink,
|
|
public nsIFragmentContentSink
|
|
{
|
|
public:
|
|
nsXMLFragmentContentSink();
|
|
|
|
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
|
|
|
|
// nsISupports
|
|
NS_DECL_ISUPPORTS_INHERITED
|
|
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(nsXMLFragmentContentSink,
|
|
nsXMLContentSink)
|
|
|
|
// nsIExpatSink
|
|
NS_IMETHOD HandleDoctypeDecl(const nsAString& aSubset,
|
|
const nsAString& aName,
|
|
const nsAString& aSystemId,
|
|
const nsAString& aPublicId,
|
|
nsISupports* aCatalogData) override;
|
|
NS_IMETHOD HandleProcessingInstruction(const char16_t* aTarget,
|
|
const char16_t* aData) override;
|
|
NS_IMETHOD HandleXMLDeclaration(const char16_t* aVersion,
|
|
const char16_t* aEncoding,
|
|
int32_t aStandalone) override;
|
|
NS_IMETHOD ReportError(const char16_t* aErrorText,
|
|
const char16_t* aSourceText,
|
|
nsIScriptError* aError,
|
|
bool* aRetval) override;
|
|
|
|
// nsIContentSink
|
|
NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode) override;
|
|
NS_IMETHOD DidBuildModel(bool aTerminated) override;
|
|
NS_IMETHOD SetDocumentCharset(nsACString& aCharset) override;
|
|
virtual nsISupports* GetTarget() override;
|
|
NS_IMETHOD DidProcessATokenImpl();
|
|
|
|
// nsIXMLContentSink
|
|
|
|
// nsIFragmentContentSink
|
|
NS_IMETHOD FinishFragmentParsing(nsIDOMDocumentFragment** aFragment) override;
|
|
NS_IMETHOD SetTargetDocument(nsIDocument* aDocument) override;
|
|
NS_IMETHOD WillBuildContent() override;
|
|
NS_IMETHOD DidBuildContent() override;
|
|
NS_IMETHOD IgnoreFirstContainer() override;
|
|
NS_IMETHOD SetPreventScriptExecution(bool aPreventScriptExecution) override;
|
|
|
|
protected:
|
|
virtual ~nsXMLFragmentContentSink();
|
|
|
|
virtual bool SetDocElement(int32_t aNameSpaceID,
|
|
nsIAtom* aTagName,
|
|
nsIContent* aContent) override;
|
|
virtual nsresult CreateElement(const char16_t** aAtts, uint32_t aAttsCount,
|
|
mozilla::dom::NodeInfo* aNodeInfo, uint32_t aLineNumber,
|
|
nsIContent** aResult, bool* aAppendContent,
|
|
mozilla::dom::FromParser aFromParser) override;
|
|
virtual nsresult CloseElement(nsIContent* aContent) override;
|
|
|
|
virtual void MaybeStartLayout(bool aIgnorePendingSheets) override;
|
|
|
|
// nsContentSink overrides
|
|
virtual nsresult ProcessStyleLink(nsIContent* aElement,
|
|
const nsSubstring& aHref,
|
|
bool aAlternate,
|
|
const nsSubstring& aTitle,
|
|
const nsSubstring& aType,
|
|
const nsSubstring& aMedia) override;
|
|
nsresult LoadXSLStyleSheet(nsIURI* aUrl);
|
|
void StartLayout();
|
|
|
|
nsCOMPtr<nsIDocument> mTargetDocument;
|
|
// the fragment
|
|
nsCOMPtr<nsIContent> mRoot;
|
|
bool mParseError;
|
|
};
|
|
|
|
static nsresult
|
|
NewXMLFragmentContentSinkHelper(nsIFragmentContentSink** aResult)
|
|
{
|
|
nsXMLFragmentContentSink* it = new nsXMLFragmentContentSink();
|
|
|
|
NS_ADDREF(*aResult = it);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
NS_NewXMLFragmentContentSink(nsIFragmentContentSink** aResult)
|
|
{
|
|
return NewXMLFragmentContentSinkHelper(aResult);
|
|
}
|
|
|
|
nsXMLFragmentContentSink::nsXMLFragmentContentSink()
|
|
: mParseError(false)
|
|
{
|
|
mRunsToCompletion = true;
|
|
}
|
|
|
|
nsXMLFragmentContentSink::~nsXMLFragmentContentSink()
|
|
{
|
|
}
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXMLFragmentContentSink)
|
|
NS_INTERFACE_MAP_ENTRY(nsIFragmentContentSink)
|
|
NS_INTERFACE_MAP_END_INHERITING(nsXMLContentSink)
|
|
|
|
NS_IMPL_ADDREF_INHERITED(nsXMLFragmentContentSink, nsXMLContentSink)
|
|
NS_IMPL_RELEASE_INHERITED(nsXMLFragmentContentSink, nsXMLContentSink)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_CLASS(nsXMLFragmentContentSink)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXMLFragmentContentSink,
|
|
nsXMLContentSink)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTargetDocument)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRoot)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::WillBuildModel(nsDTDMode aDTDMode)
|
|
{
|
|
if (mRoot) {
|
|
return NS_OK;
|
|
}
|
|
|
|
mState = eXMLContentSinkState_InDocumentElement;
|
|
|
|
NS_ASSERTION(mTargetDocument, "Need a document!");
|
|
|
|
mRoot = new DocumentFragment(mNodeInfoManager);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::DidBuildModel(bool aTerminated)
|
|
{
|
|
nsRefPtr<nsParserBase> kungFuDeathGrip(mParser);
|
|
|
|
// Drop our reference to the parser to get rid of a circular
|
|
// reference.
|
|
mParser = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::SetDocumentCharset(nsACString& aCharset)
|
|
{
|
|
NS_NOTREACHED("fragments shouldn't set charset");
|
|
return NS_OK;
|
|
}
|
|
|
|
nsISupports *
|
|
nsXMLFragmentContentSink::GetTarget()
|
|
{
|
|
return mTargetDocument;
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
bool
|
|
nsXMLFragmentContentSink::SetDocElement(int32_t aNameSpaceID,
|
|
nsIAtom* aTagName,
|
|
nsIContent *aContent)
|
|
{
|
|
// this is a fragment, not a document
|
|
return false;
|
|
}
|
|
|
|
nsresult
|
|
nsXMLFragmentContentSink::CreateElement(const char16_t** aAtts, uint32_t aAttsCount,
|
|
mozilla::dom::NodeInfo* aNodeInfo, uint32_t aLineNumber,
|
|
nsIContent** aResult, bool* aAppendContent,
|
|
FromParser /*aFromParser*/)
|
|
{
|
|
// Claim to not be coming from parser, since we don't do any of the
|
|
// fancy CloseElement stuff.
|
|
nsresult rv = nsXMLContentSink::CreateElement(aAtts, aAttsCount,
|
|
aNodeInfo, aLineNumber,
|
|
aResult, aAppendContent,
|
|
NOT_FROM_PARSER);
|
|
|
|
// When we aren't grabbing all of the content we, never open a doc
|
|
// element, we run into trouble on the first element, so we don't append,
|
|
// and simply push this onto the content stack.
|
|
if (mContentStack.Length() == 0) {
|
|
*aAppendContent = false;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsXMLFragmentContentSink::CloseElement(nsIContent* aContent)
|
|
{
|
|
// don't do fancy stuff in nsXMLContentSink
|
|
if (mPreventScriptExecution &&
|
|
(aContent->IsHTMLElement(nsGkAtoms::script) ||
|
|
aContent->IsSVGElement(nsGkAtoms::script))) {
|
|
nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aContent);
|
|
NS_ASSERTION(sele, "script did QI correctly!");
|
|
sele->PreventExecution();
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
nsXMLFragmentContentSink::MaybeStartLayout(bool aIgnorePendingSheets)
|
|
{
|
|
return;
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::HandleDoctypeDecl(const nsAString & aSubset,
|
|
const nsAString & aName,
|
|
const nsAString & aSystemId,
|
|
const nsAString & aPublicId,
|
|
nsISupports* aCatalogData)
|
|
{
|
|
NS_NOTREACHED("fragments shouldn't have doctype declarations");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::HandleProcessingInstruction(const char16_t *aTarget,
|
|
const char16_t *aData)
|
|
{
|
|
FlushText();
|
|
|
|
const nsDependentString target(aTarget);
|
|
const nsDependentString data(aData);
|
|
|
|
nsRefPtr<ProcessingInstruction> node =
|
|
NS_NewXMLProcessingInstruction(mNodeInfoManager, target, data);
|
|
|
|
// no special processing here. that should happen when the fragment moves into the document
|
|
return AddContentAsLeaf(node);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::HandleXMLDeclaration(const char16_t *aVersion,
|
|
const char16_t *aEncoding,
|
|
int32_t aStandalone)
|
|
{
|
|
NS_NOTREACHED("fragments shouldn't have XML declarations");
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::ReportError(const char16_t* aErrorText,
|
|
const char16_t* aSourceText,
|
|
nsIScriptError *aError,
|
|
bool *_retval)
|
|
{
|
|
NS_PRECONDITION(aError && aSourceText && aErrorText, "Check arguments!!!");
|
|
|
|
// The expat driver should report the error.
|
|
*_retval = true;
|
|
|
|
mParseError = true;
|
|
|
|
#ifdef DEBUG
|
|
// Report the error to stderr.
|
|
fprintf(stderr,
|
|
"\n%s\n%s\n\n",
|
|
NS_LossyConvertUTF16toASCII(aErrorText).get(),
|
|
NS_LossyConvertUTF16toASCII(aSourceText).get());
|
|
#endif
|
|
|
|
// The following code is similar to the cleanup in nsXMLContentSink::ReportError()
|
|
mState = eXMLContentSinkState_InProlog;
|
|
|
|
// Clear the current content
|
|
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(mRoot));
|
|
if (node) {
|
|
for (;;) {
|
|
nsCOMPtr<nsIDOMNode> child, dummy;
|
|
node->GetLastChild(getter_AddRefs(child));
|
|
if (!child)
|
|
break;
|
|
node->RemoveChild(child, getter_AddRefs(dummy));
|
|
}
|
|
}
|
|
|
|
// Clear any buffered-up text we have. It's enough to set the length to 0.
|
|
// The buffer itself is allocated when we're created and deleted in our
|
|
// destructor, so don't mess with it.
|
|
mTextLength = 0;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsXMLFragmentContentSink::ProcessStyleLink(nsIContent* aElement,
|
|
const nsSubstring& aHref,
|
|
bool aAlternate,
|
|
const nsSubstring& aTitle,
|
|
const nsSubstring& aType,
|
|
const nsSubstring& aMedia)
|
|
{
|
|
// don't process until moved to document
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsXMLFragmentContentSink::LoadXSLStyleSheet(nsIURI* aUrl)
|
|
{
|
|
NS_NOTREACHED("fragments shouldn't have XSL style sheets");
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
|
|
void
|
|
nsXMLFragmentContentSink::StartLayout()
|
|
{
|
|
NS_NOTREACHED("fragments shouldn't layout");
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::FinishFragmentParsing(nsIDOMDocumentFragment** aFragment)
|
|
{
|
|
*aFragment = nullptr;
|
|
mTargetDocument = nullptr;
|
|
mNodeInfoManager = nullptr;
|
|
mScriptLoader = nullptr;
|
|
mCSSLoader = nullptr;
|
|
mContentStack.Clear();
|
|
mDocumentURI = nullptr;
|
|
mDocShell = nullptr;
|
|
mDocElement = nullptr;
|
|
mCurrentHead = nullptr;
|
|
if (mParseError) {
|
|
//XXX PARSE_ERR from DOM3 Load and Save would be more appropriate
|
|
mRoot = nullptr;
|
|
mParseError = false;
|
|
return NS_ERROR_DOM_SYNTAX_ERR;
|
|
} else if (mRoot) {
|
|
nsresult rv = CallQueryInterface(mRoot, aFragment);
|
|
mRoot = nullptr;
|
|
return rv;
|
|
} else {
|
|
return NS_OK;
|
|
}
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::SetTargetDocument(nsIDocument* aTargetDocument)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aTargetDocument);
|
|
|
|
mTargetDocument = aTargetDocument;
|
|
mNodeInfoManager = aTargetDocument->NodeInfoManager();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::WillBuildContent()
|
|
{
|
|
PushContent(mRoot);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::DidBuildContent()
|
|
{
|
|
// Note: we need to FlushText() here because if we don't, we might not get
|
|
// an end element to do it for us, so make sure.
|
|
if (!mParseError) {
|
|
FlushText();
|
|
}
|
|
PopContent();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::DidProcessATokenImpl()
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::IgnoreFirstContainer()
|
|
{
|
|
NS_NOTREACHED("XML isn't as broken as HTML");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXMLFragmentContentSink::SetPreventScriptExecution(bool aPrevent)
|
|
{
|
|
mPreventScriptExecution = aPrevent;
|
|
return NS_OK;
|
|
}
|