Attachment #9032167 for bug #1342012

Attachment #9032167: bug1342012-12-associate-decoded-classic-scripts for bug #1342012

View | Details | Raw Unified | Return to bug 1342012
Collapse All | Expand All





  explicit AutoSetProcessingScriptTag(nsIScriptContext* aContext)
      : mContext(aContext), mOldTag(mContext->GetProcessingScriptTag()) {
    mContext->SetProcessingScriptTag(true);
  }

  ~AutoSetProcessingScriptTag() { mContext->SetProcessingScriptTag(mOldTag); }
};

static nsresult ExecuteCompiledScript(JSContext* aCx,
                                      ScriptLoadRequest* aRequest,
                                      nsJSUtils::ExecutionContext& aExec) {
  JS::Rooted<JSScript*> script(aCx, aExec.GetScript());

  // Create a ClassicScript object and associate it with the
  // JSScript.
  RefPtr<ClassicScript> classicScript = new ClassicScript(
    aRequest->mFetchOptions, aRequest->mBaseURL);
  classicScript->AssociateWithScript(script);

  return aExec.ExecScript();
}

nsresult ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest) {
  using namespace mozilla::Telemetry;
  MOZ_ASSERT(aRequest->IsReadyToRun());

  // We need a document to evaluate scripts.
  if (!mDocument) {
    return NS_ERROR_FAILURE;
  }


      if (NS_SUCCEEDED(rv)) {
        if (aRequest->IsBytecode()) {
          TRACE_FOR_TEST(aRequest->Element(), "scriptloader_execute");
          nsJSUtils::ExecutionContext exec(cx, global);
          if (aRequest->mOffThreadToken) {
            LOG(("ScriptLoadRequest (%p): Decode Bytecode & Join and Execute",
                 aRequest));
            rv = exec.JoinDecode(&aRequest->mOffThreadToken);
          } else {
            LOG(("ScriptLoadRequest (%p): Decode Bytecode and Execute",
                 aRequest));
            rv = exec.Decode(options, aRequest->mScriptBytecode,
                             aRequest->mBytecodeOffset);
          }

          if (rv == NS_OK) {
            rv = ExecuteCompiledScript(cx, aRequest, exec);
          }

          // We do not expect to be saving anything when we already have some
          // bytecode.
          MOZ_ASSERT(!aRequest->mCacheInfo);
        } else {
          MOZ_ASSERT(aRequest->IsSource());
          JS::Rooted<JSScript*> script(cx);
          bool encodeBytecode = ShouldCacheBytecode(aRequest);


                } else {
                  rv = NS_ERROR_OUT_OF_MEMORY;
                }
              }
            }

            if (rv == NS_OK) {
              script = exec.GetScript();
              rv = ExecuteCompiledScript(cx, aRequest, exec);
              // Create a ClassicScript object and associate it with the
              // JSScript.
              RefPtr<ClassicScript> classicScript = new ClassicScript(
                  aRequest->mFetchOptions, aRequest->mBaseURL);
              classicScript->AssociateWithScript(script);

              rv = exec.ExecScript();
            }
          }

          // Queue the current script load request to later save the bytecode.
          if (script && encodeBytecode) {
            aRequest->SetScript(script);
            TRACE_FOR_TEST(aRequest->Element(), "scriptloader_encode");
            MOZ_ASSERT(aRequest->mBytecodeOffset ==

Return to bug 1342012