575641 - [e10s] nsFrameLoader cleanup

Status: RESOLVED FIXED

(Core :: IPC, defect)

Description

[Doug Turner (:dougt)]

>+++ b/content/base/src/nsFrameLoader.cpp
>@@ -542,73 +648,87 @@ nsFrameLoader::Show(PRInt32 marginWidth,
>+    if (presShell)
>+      return true;

PR_TRUE, no?

There are several places in this file that look like this:

  if (!mChildProcess) {
    TryNewProcess();
  }
  if (!mChildProcess) {
    // return error
  }

Seems like the second if should be inside the first, no?

Comment 1

[Doug Turner (:dougt)]

would not block fennec from shipping on this.

Comment 2

[Mike Kristoffersen (:MikeK)]

Attachment: This should fix it

Comment 3

[Doug Turner (:dougt)]

Comment on attachment 484656 [details] [diff] [review]
This should fix it

olli, this looks right, but you touched this code more than I have.  Could you review it?

Comment 4

[Doug Turner (:dougt)]

Comment on attachment 484656 [details] [diff] [review]
This should fix it

minor change, addresses bz review comments.

Comment 5

[Matt Brubeck (:mbrubeck)]

Pushed: http://hg.mozilla.org/mozilla-central/rev/29f9e7e313d0