Commit ee1c2323 authored by morrita@chromium.org's avatar morrita@chromium.org

WebDragSource: Added a guard for null [contentView_ window]

BUG=69095
TEST=manual

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71416 0039d316-1c4b-4281-b951-d872f2087c98
parent b557ec27
...@@ -257,7 +257,9 @@ void PromiseWriterTask::Run() { ...@@ -257,7 +257,9 @@ void PromiseWriterTask::Run() {
rvh->DragSourceSystemDragEnded(); rvh->DragSourceSystemDragEnded();
// Convert |screenPoint| to view coordinates and flip it. // Convert |screenPoint| to view coordinates and flip it.
NSPoint localPoint = [self convertScreenPoint:screenPoint]; NSPoint localPoint = NSMakePoint(0, 0);
if ([contentsView_ window])
localPoint = [self convertScreenPoint:screenPoint];
NSRect viewFrame = [contentsView_ frame]; NSRect viewFrame = [contentsView_ frame];
localPoint.y = viewFrame.size.height - localPoint.y; localPoint.y = viewFrame.size.height - localPoint.y;
// Flip |screenPoint|. // Flip |screenPoint|.
...@@ -277,7 +279,9 @@ void PromiseWriterTask::Run() { ...@@ -277,7 +279,9 @@ void PromiseWriterTask::Run() {
RenderViewHost* rvh = [contentsView_ tabContents]->render_view_host(); RenderViewHost* rvh = [contentsView_ tabContents]->render_view_host();
if (rvh) { if (rvh) {
// Convert |screenPoint| to view coordinates and flip it. // Convert |screenPoint| to view coordinates and flip it.
NSPoint localPoint = [self convertScreenPoint:screenPoint]; NSPoint localPoint = NSMakePoint(0, 0);
if ([contentsView_ window])
localPoint = [self convertScreenPoint:screenPoint];
NSRect viewFrame = [contentsView_ frame]; NSRect viewFrame = [contentsView_ frame];
localPoint.y = viewFrame.size.height - localPoint.y; localPoint.y = viewFrame.size.height - localPoint.y;
// Flip |screenPoint|. // Flip |screenPoint|.
......
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