Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Issue 669943002: Revert of Ensure that the browser’s copy of page id is in sync with the renderer’s. (Closed)

Created:
6 years, 2 months ago by Avi (use Gerrit)
Modified:
6 years, 2 months ago
CC:
chromium-reviews, darin-cc_chromium.org, nasko+codewatch_chromium.org, jam, creis+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Revert of Ensure that the browser’s copy of page id is in sync with the renderer’s. (patchset #1 id:1 of https://codereview.chromium.org/669613005/) Reason for revert: Crashing. Still. Original issue's description: > Ensure that the browser’s copy of page id is in sync with the renderer’s. > > This might-maybe-hope-not crash, and so has debugging statements. > > BUG=407376 > TEST=no crashing, we hope > TBR=rsesek@chromium.org > > Committed: https://crrev.com/31111d18aadc37181a249afa74a62ac46544e12e > Cr-Commit-Position: refs/heads/master@{#300311} TBR=rsesek@chromium.org,creis@chromium.org NOTREECHECKS=true NOTRY=true BUG=407376

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -35 lines) Patch
M chrome/common/crash_keys.cc View 1 chunk +0 lines, -6 lines 0 comments Download
M content/browser/frame_host/render_frame_host_impl.cc View 1 chunk +0 lines, -1 line 0 comments Download
M content/browser/renderer_host/render_view_host_delegate.h View 1 chunk +0 lines, -1 line 0 comments Download
M content/browser/renderer_host/render_view_host_impl.cc View 1 chunk +1 line, -1 line 0 comments Download
M content/browser/web_contents/web_contents_impl.h View 1 chunk +0 lines, -1 line 0 comments Download
M content/browser/web_contents/web_contents_impl.cc View 2 chunks +0 lines, -25 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
Avi (use Gerrit)
Created Revert of Ensure that the browser’s copy of page id is in sync with ...
6 years, 2 months ago (2014-10-21 15:37:08 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/669943002/1
6 years, 2 months ago (2014-10-21 15:39:04 UTC) #2
commit-bot: I haz the power
6 years, 2 months ago (2014-10-21 15:40:35 UTC) #4
Failed to apply patch for content/browser/web_contents/web_contents_impl.h:
While running git apply --index -3 -p1;
  error: patch failed: content/browser/web_contents/web_contents_impl.h:412
  Falling back to three-way merge...
  Applied patch to 'content/browser/web_contents/web_contents_impl.h' with
conflicts.
  U content/browser/web_contents/web_contents_impl.h

Patch:       content/browser/web_contents/web_contents_impl.h
Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h
b/content/browser/web_contents/web_contents_impl.h
index
fba5639f34406fc5e222381dd9163c973d96c42d..31a11bad592c3ffe7ee002a73c062222573c11ad
100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -412,7 +412,6 @@
                                     int error_code) override;
   virtual void RenderViewDeleted(RenderViewHost* render_view_host) override;
   virtual void UpdateState(RenderViewHost* render_view_host,
-                           int32 rvh_page_id,
                            int32 page_id,
                            const PageState& page_state) override;
   virtual void UpdateTargetURL(const GURL& url) override;

Powered by Google App Engine
This is Rietveld 408576698