| commit | a6aefb78f61d48f1b7d836013c99ce5dfd579a39 | [log] [tgz] |
|---|---|---|
| author | iclelland <[email protected]> | Tue Feb 09 18:59:19 2016 |
| committer | Commit bot <[email protected]> | Tue Feb 09 19:00:20 2016 |
| tree | 7fbfad1d3146ff40dd9cd5e1f2ec34f95c648899 | |
| parent | e1fb6b8e4dcdc0b5e7cde84f90428fb0c719b468 [diff] |
Revert of Check that the source and destination WebContents are different before (patchset #1 id:1 of https://codereview.chromium.org/1671293003/ ) Reason for revert: Build is broken: browser_tests on Mac-10.9 Revision range: chromium 374392 : 374398 Failing builders: Mac10.9 Tests (dbg): https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests%20(dbg) This appears to be related to (if not caused by) https://crrev.com/ee16176f11a77d60a77396a05f95bcf36eeddd6f Original issue's description: > Check that the source and destination WebContents are different before > assuming that the proxy will be used for GuestView. > > This fixes a crash where a postMessage to an OOPIF can crash the browser > if the same WebContents is also a GuestView. > > BUG=584714 > > Committed: https://crrev.com/ee16176f11a77d60a77396a05f95bcf36eeddd6f > Cr-Commit-Position: refs/heads/master@{#374394} [email protected],[email protected] # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=584714 Review URL: https://codereview.chromium.org/1685683002 Cr-Commit-Position: refs/heads/master@{#374428}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index d4f6bec..61bddb1 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4281,7 +4281,7 @@ return; } - if (this != source_web_contents && GetBrowserPluginGuest()) { + if (GetBrowserPluginGuest()) { // We create a swapped out RenderView or RenderFrameProxyHost for the // embedder in the guest's render process but we intentionally do not // expose the embedder's opener chain to it.