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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 925913002: Fixed WebDragData's wrong dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 3576 matching lines...) Expand 10 before | Expand all | Expand 10 after
3587 3587
3588 WebDragOperation WebViewImpl::dragTargetDragEnter( 3588 WebDragOperation WebViewImpl::dragTargetDragEnter(
3589 const WebDragData& webDragData, 3589 const WebDragData& webDragData,
3590 const WebPoint& clientPoint, 3590 const WebPoint& clientPoint,
3591 const WebPoint& screenPoint, 3591 const WebPoint& screenPoint,
3592 WebDragOperationsMask operationsAllowed, 3592 WebDragOperationsMask operationsAllowed,
3593 int keyModifiers) 3593 int keyModifiers)
3594 { 3594 {
3595 ASSERT(!m_currentDragData); 3595 ASSERT(!m_currentDragData);
3596 3596
3597 m_currentDragData = webDragData.getValue(); 3597 m_currentDragData = DataObject::createFromWebDragData(webDragData);
3598 m_operationsAllowed = operationsAllowed; 3598 m_operationsAllowed = operationsAllowed;
3599 3599
3600 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod ifiers); 3600 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod ifiers);
3601 } 3601 }
3602 3602
3603 WebDragOperation WebViewImpl::dragTargetDragOver( 3603 WebDragOperation WebViewImpl::dragTargetDragOver(
3604 const WebPoint& clientPoint, 3604 const WebPoint& clientPoint,
3605 const WebPoint& screenPoint, 3605 const WebPoint& screenPoint,
3606 WebDragOperationsMask operationsAllowed, 3606 WebDragOperationsMask operationsAllowed,
3607 int keyModifiers) 3607 int keyModifiers)
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after
4611 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4611 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4612 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4612 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4613 } 4613 }
4614 4614
4615 void WebViewImpl::forceNextWebGLContextCreationToFail() 4615 void WebViewImpl::forceNextWebGLContextCreationToFail()
4616 { 4616 {
4617 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); 4617 WebGLRenderingContext::forceNextWebGLContextCreationToFail();
4618 } 4618 }
4619 4619
4620 } // namespace blink 4620 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698