wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 765780 part 2. Simplify the docshell code that was trying to enable script in subframes of designMode documents. r=ehsan

Browse Source 
I'm leaving the editing session APIs for enabling/disabling script and finding out whether the editing session has done that, in case someone else is using it.
This commit is contained in:
Boris Zbarsky 2013-04-08 17:04:20 -04:00
parent 80b63872a5
commit 8ad789d7ec
4 changed files with 22 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
docshell/base/nsDocShell.cpp
View File

@ -2886,6 +2886,13 @@ nsDocShell::GetParent(nsIDocShellTreeItem ** aParent)
return NS_OK;
}
already_AddRefed<nsDocShell>
nsDocShell::GetParentDocshell()
{
nsCOMPtr<nsIDocShell> docshell = do_QueryInterface(GetAsSupports(mParent));
return static_cast<nsDocShell*>(docshell.forget().get());
}
nsresult
nsDocShell::SetDocLoaderParent(nsDocLoader * aParent)
{
@ -12436,91 +12443,16 @@ nsDocShell::GetCanExecuteScripts(bool *aResult)
NS_ENSURE_ARG_POINTER(aResult);
*aResult = false; // disallow by default
nsCOMPtr<nsIDocShell> docshell = this;
nsCOMPtr<nsIDocShellTreeItem> globalObjTreeItem =
do_QueryInterface(docshell);
nsRefPtr<nsDocShell> docshell = this;
do {
nsresult rv = docshell->GetAllowJavascript(aResult);
if (NS_FAILED(rv)) return rv;
if (!*aResult) {
return NS_OK;
}
if (globalObjTreeItem)
{
nsCOMPtr<nsIDocShellTreeItem> treeItem(globalObjTreeItem);
nsCOMPtr<nsIDocShellTreeItem> parentItem;
bool firstPass = true;
bool lookForParents = false;
// Walk up the docshell tree to see if any containing docshell disallows scripts
do
{
nsresult rv = docshell->GetAllowJavascript(aResult);
if (NS_FAILED(rv)) return rv;
if (!*aResult) {
nsDocShell* realDocshell = static_cast<nsDocShell*>(docshell.get());
if (realDocshell->mContentViewer) {
nsIDocument* doc = realDocshell->mContentViewer->GetDocument();
if (doc && doc->HasFlag(NODE_IS_EDITABLE) &&
realDocshell->mEditorData) {
nsCOMPtr<nsIEditingSession> editSession;
realDocshell->mEditorData->GetEditingSession(getter_AddRefs(editSession));
bool jsDisabled = false;
if (editSession &&
NS_SUCCEEDED(rv = editSession->GetJsAndPluginsDisabled(&jsDisabled))) {
if (firstPass) {
if (jsDisabled) {
// We have a docshell which has been explicitly set
// to design mode, so we disallow scripts.
return NS_OK;
}
// The docshell was not explicitly set to design mode,
// so it must be so because a parent was explicitly
// set to design mode. We don't need to look at higher
// docshells.
*aResult = true;
break;
} else if (lookForParents && jsDisabled) {
// If a parent was explicitly set to design mode,
// we should allow script execution on the child.
*aResult = true;
break;
}
// If the child docshell allows scripting, and the
// parent is inside design mode, we don't need to look
// further.
*aResult = true;
return NS_OK;
}
NS_WARNING("The editing session does not work?");
return NS_FAILED(rv) ? rv : NS_ERROR_FAILURE;
}
if (firstPass) {
// Don't be too hard on docshells on the first pass.
// There may be a parent docshell which has been set
// to design mode, so look for it.
lookForParents = true;
} else {
// We have a docshell which disallows scripts
// and is not editable, so we shouldn't allow
// scripts at all.
return NS_OK;
}
}
} else if (lookForParents) {
// The parent docshell was not explicitly set to design
// mode, so js on the child docshell was disabled for
// another reason. Therefore, we need to disable js.
*aResult = false;
return NS_OK;
}
firstPass = false;
treeItem->GetParent(getter_AddRefs(parentItem));
treeItem.swap(parentItem);
docshell = do_QueryInterface(treeItem);
#ifdef DEBUG
if (treeItem && !docshell) {
NS_ERROR("cannot get a docshell from a treeItem!");
}
#endif // DEBUG
} while (treeItem && docshell);
}
docshell = docshell->GetParentDocshell();
} while (docshell);
return NS_OK;
}

3
docshell/base/nsDocShell.h
View File

@ -643,6 +643,9 @@ protected:
nsIChannel* GetCurrentDocChannel();
bool ShouldBlockLoadingForBackButton();
// Convenience method for getting our parent docshell. Can return null
already_AddRefed<nsDocShell> GetParentDocshell();
protected:
// Override the parent setter from nsDocLoader
virtual nsresult SetDocLoaderParent(nsDocLoader * aLoader);

5
docshell/base/nsIDocShell.idl
View File

@ -528,10 +528,7 @@ interface nsIDocShell : nsIDocShellTreeItem
/**
* Whether this docshell can execute scripts based on its hierarchy.
* The rule of thumb here is that we disable js if this docshell or any
* of its parents disallow scripting, unless the only reason for js being
* disabled in this docshell is a parent docshell having a document that
* is in design mode. In that case, we explicitly allow scripting on the
* current docshell.
* of its parents disallow scripting.
*/
readonly attribute boolean canExecuteScripts;

4
editor/composer/test/test_bug519928.html
View File

@ -65,7 +65,7 @@ addLoadEvent(function() {
expectJSAllowed(true, enterDesignMode, function() {
expectJSAllowed(true, leaveDesignMode, function() {
expectJSAllowed(false, disableJS, function() {
expectJSAllowed(true, enterDesignMode, function() {
expectJSAllowed(false, enterDesignMode, function() {
expectJSAllowed(false, leaveDesignMode, function() {
expectJSAllowed(true, enableJS, function() {
testDocumentDisabledJS();
@ -94,7 +94,7 @@ function testDocumentDisabledJS() {
document.designMode = "off";
iframe.contentDocument.designMode = "off";
// Javascriont enabled on the main iframe
// Javascript enabled on the main iframe
enableJS();
var doc = iframe.contentDocument;