Skip to content

Commit

Permalink
Cause the MemoryHolder to be destroyed before the member variables of…
Browse files Browse the repository at this point in the history
… the RWHVA are.

The framebuffer_holder_'s destructor, which modifies released_software_frames_ was run after released_software_frames_'s destructor, which causes problems.

BUG=
R=piman@chromium.org

Review URL: https://codereview.chromium.org/24920002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225747 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
jbauman@chromium.org committed Sep 27, 2013
1 parent a5a780c commit cf28493
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions content/browser/renderer_host/render_widget_host_view_aura.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3173,6 +3173,9 @@ RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
// associated with the window, but just in case.
DetachFromInputMethod();
FrameMemoryManager::GetInstance()->RemoveFrame(this);
// The destruction of the holder may call back into the RWHVA, so do it
// early.
framebuffer_holder_ = NULL;
}

void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
Expand Down

0 comments on commit cf28493

Please sign in to comment.