Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 586115 - Cache LoadFrameScript Calls - e10s, r=jst, fb=azakai, a=b-f

Browse Source
This commit is contained in:
Olli Pettay 2010-08-18 13:02:49 +03:00
parent 2950dabb78
commit eb1461f93b
2 changed files with 7 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dom/ipc/TabChild.cpp
View File

@ -121,8 +121,7 @@ public:
TabChild::TabChild(PRUint32 aChromeFlags)
: mCx(nsnull)
, mTabChildGlobal(nsnull)
: mTabChildGlobal(nsnull)
, mChromeFlags(aChromeFlags)
{
printf("creating %d!\n", NS_IsMainThread());
@ -508,12 +507,7 @@ TabChild::~TabChild()
webBrowser->SetContainerWindow(nsnull);
}
if (mCx) {
nsIXPConnect* xpc = nsContentUtils::XPConnect();
if (xpc) {
xpc->ReleaseJSContext(mCx, PR_FALSE);
} else {
JS_DestroyContext(mCx);
}
DestroyCx();
}
mTabChildGlobal->mTabChild = nsnull;
}
@ -1009,55 +1003,7 @@ TabChild::RecvActivateFrameEvent(const nsString& aType, const bool& capture)
bool
TabChild::RecvLoadRemoteScript(const nsString& aURL)
{
nsCString url = NS_ConvertUTF16toUTF8(aURL);
nsCOMPtr<nsIURI> uri;
nsresult rv = NS_NewURI(getter_AddRefs(uri), url);
NS_ENSURE_SUCCESS(rv, true);
NS_NewChannel(getter_AddRefs(mChannel), uri);
NS_ENSURE_TRUE(mChannel, true);
nsCOMPtr<nsIInputStream> input;
mChannel->Open(getter_AddRefs(input));
nsString dataString;
if (input) {
const PRUint32 bufferSize = 256;
char buffer[bufferSize];
nsCString data;
PRUint32 avail = 0;
input->Available(&avail);
PRUint32 read = 0;
if (avail) {
while (NS_SUCCEEDED(input->Read(buffer, bufferSize, &read)) && read) {
data.Append(buffer, read);
read = 0;
}
}
nsScriptLoader::ConvertToUTF16(mChannel, (PRUint8*)data.get(), data.Length(),
EmptyString(), nsnull, dataString);
}
if (!dataString.IsEmpty()) {
JSAutoRequest ar(mCx);
nsCOMPtr<nsPIDOMWindow> w = do_GetInterface(mWebNav);
jsval retval;
JSObject* global = nsnull;
rv = mRootGlobal->GetJSObject(&global);
NS_ENSURE_SUCCESS(rv, false);
JSPrincipals* jsprin = nsnull;
mPrincipal->GetJSPrincipals(mCx, &jsprin);
nsContentUtils::XPConnect()->FlagSystemFilenamePrefix(url.get(), PR_TRUE);
nsContentUtils::ThreadJSContextStack()->Push(mCx);
JSBool ret = JS_EvaluateUCScriptForPrincipals(mCx, global, jsprin,
(jschar*)dataString.get(),
dataString.Length(),
url.get(), 1, &retval);
JSPRINCIPALS_DROP(mCx, jsprin);
JSContext *unused;
nsContentUtils::ThreadJSContextStack()->Pop(&unused);
NS_ENSURE_TRUE(ret, true); // This gives us a useful warning!
}
LoadFrameScriptInternal(aURL);
return true;
}
@ -1180,7 +1126,7 @@ TabChild::InitTabChildGlobal()
xpc->InitClassesWithNewWrappedGlobal(cx, scopeSupports,
NS_GET_IID(nsISupports),
scope->GetPrincipal(), EmptyCString(),
flags, getter_AddRefs(mRootGlobal));
flags, getter_AddRefs(mGlobal));
NS_ENSURE_SUCCESS(rv, false);
nsCOMPtr<nsPIWindowRoot> root = do_QueryInterface(chromeHandler);
@ -1188,11 +1134,11 @@ TabChild::InitTabChildGlobal()
root->SetParentTarget(scope);
JSObject* global = nsnull;
rv = mRootGlobal->GetJSObject(&global);
rv = mGlobal->GetJSObject(&global);
NS_ENSURE_SUCCESS(rv, false);
JS_SetGlobalObject(cx, global);
DidCreateCx();
return true;
}

5
dom/ipc/TabChild.h
View File

@ -144,6 +144,7 @@ protected:
};
class TabChild : public PBrowserChild,
public nsFrameScriptExecutor,
public nsIWebProgressListener2,
public nsIWebBrowserChrome2,
public nsIEmbeddingSiteWindow2,
@ -303,11 +304,7 @@ private:
bool InitTabChildGlobal();
nsCOMPtr<nsIWebNavigation> mWebNav;
nsCOMPtr<nsIXPConnectJSObjectHolder> mRootGlobal;
JSContext* mCx;
nsCOMPtr<nsIChannel> mChannel;
TabChildGlobal* mTabChildGlobal;
nsCOMPtr<nsIPrincipal> mPrincipal;
PRUint32 mChromeFlags;
DISALLOW_EVIL_CONSTRUCTORS(TabChild);