diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 20:11:04 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 20:11:04 +0000 |
| commit | 2b6b1108f6460e769e5a7a02bc310ef8d8ac1fc0 (patch) | |
| tree | f82bf27290d3cc15c58ad73c2bd0d09d47518324 /chrome | |
| parent | fc5062475b953d2e96dc0ba89a922893e382ef5a (diff) | |
| download | chromium_src-2b6b1108f6460e769e5a7a02bc310ef8d8ac1fc0.zip chromium_src-2b6b1108f6460e769e5a7a02bc310ef8d8ac1fc0.tar.gz chromium_src-2b6b1108f6460e769e5a7a02bc310ef8d8ac1fc0.tar.bz2 | |
[Mac] Revert diagnostics for content popup bug.
Revert pamg's commit.
> Insert diagnostics in an attempt to track down a crash in popup menus
> in RenderWidgetHostViewMac::ShowPopupWithItems().
BUG=31716
TEST=none
Review URL: http://codereview.chromium.org/566018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_mac.h | 4 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_mac.mm | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h index 46e9e8a..4edfa1ef 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.h +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h @@ -116,10 +116,6 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView { void set_parent_view(BaseView* parent_view) { parent_view_ = parent_view; } - // Used only to diagnose the crash in http://crbug.com/31716 - // TODO(pamg): Remove when no longer needed. - void clear_cocoa_view() { cocoa_view_ = nil; } - // These member variables should be private, but the associated ObjC class // needs access to them and can't be made a friend. diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 62eaa1e..a20ff65 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -421,7 +421,6 @@ void RenderWidgetHostViewMac::ShowPopupWithItems( if ([menu_runner menuItemWasChosen]) { // Simulate a menu selection event. - CHECK(cocoa_view_); const WebMouseEvent& mouse_event = WebInputEventFactory::mouseEvent(event, cocoa_view_); render_widget_host_->ForwardMouseEvent(mouse_event); @@ -581,13 +580,6 @@ void RenderWidgetHostViewMac::SetBackground(const SkBitmap& background) { return self; } -// Used only to diagnose the crash in http://crbug.com/31716 -// TODO(pamg): Remove when no longer needed. -- (void)dealloc { - renderWidgetHostView_->clear_cocoa_view(); - [super dealloc]; -} - - (void)setCanBeKeyView:(BOOL)can { canBeKeyView_ = can; } |