Commit f517b3f8 authored by dpapad@chromium.org's avatar dpapad@chromium.org

Fixing browser crash in the linux tab dragging code.

BUG=106772
TEST=NONE


Review URL: http://codereview.chromium.org/8918021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114144 0039d316-1c4b-4281-b951-d872f2087c98
parent 936c6f5f
...@@ -98,7 +98,8 @@ TabContentsWrapper* DragData::GetSourceTabContentsWrapper() { ...@@ -98,7 +98,8 @@ TabContentsWrapper* DragData::GetSourceTabContentsWrapper() {
} }
TabContents* DragData::GetSourceTabContents() { TabContents* DragData::GetSourceTabContents() {
return GetSourceTabData()->contents_->tab_contents(); TabContentsWrapper* contents = GetSourceTabData()->contents_;
return contents ? contents->tab_contents(): NULL;
} }
DraggedTabData* DragData::GetSourceTabData() { DraggedTabData* DragData::GetSourceTabData() {
......
...@@ -86,7 +86,8 @@ void DraggedTabControllerGtk::CaptureDragInfo(const gfx::Point& mouse_offset) { ...@@ -86,7 +86,8 @@ void DraggedTabControllerGtk::CaptureDragInfo(const gfx::Point& mouse_offset) {
void DraggedTabControllerGtk::Drag() { void DraggedTabControllerGtk::Drag() {
if (!drag_data_->GetSourceTabData()->tab_ || if (!drag_data_->GetSourceTabData()->tab_ ||
!drag_data_->GetSourceTabContentsWrapper()) { !drag_data_->GetSourceTabContentsWrapper() ||
!drag_data_->GetSourceTabContents()) {
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment