| OLD | NEW |
| 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 3630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3641 | 3641 |
| 3642 WebDragOperation WebViewImpl::dragTargetDragEnter( | 3642 WebDragOperation WebViewImpl::dragTargetDragEnter( |
| 3643 const WebDragData& webDragData, | 3643 const WebDragData& webDragData, |
| 3644 const WebPoint& clientPoint, | 3644 const WebPoint& clientPoint, |
| 3645 const WebPoint& screenPoint, | 3645 const WebPoint& screenPoint, |
| 3646 WebDragOperationsMask operationsAllowed, | 3646 WebDragOperationsMask operationsAllowed, |
| 3647 int keyModifiers) | 3647 int keyModifiers) |
| 3648 { | 3648 { |
| 3649 ASSERT(!m_currentDragData); | 3649 ASSERT(!m_currentDragData); |
| 3650 | 3650 |
| 3651 m_currentDragData = webDragData.getValue(); | 3651 m_currentDragData = DataObject::create(webDragData); |
| 3652 m_operationsAllowed = operationsAllowed; | 3652 m_operationsAllowed = operationsAllowed; |
| 3653 | 3653 |
| 3654 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod
ifiers); | 3654 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod
ifiers); |
| 3655 } | 3655 } |
| 3656 | 3656 |
| 3657 WebDragOperation WebViewImpl::dragTargetDragOver( | 3657 WebDragOperation WebViewImpl::dragTargetDragOver( |
| 3658 const WebPoint& clientPoint, | 3658 const WebPoint& clientPoint, |
| 3659 const WebPoint& screenPoint, | 3659 const WebPoint& screenPoint, |
| 3660 WebDragOperationsMask operationsAllowed, | 3660 WebDragOperationsMask operationsAllowed, |
| 3661 int keyModifiers) | 3661 int keyModifiers) |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4671 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4671 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4672 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4672 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4673 } | 4673 } |
| 4674 | 4674 |
| 4675 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4675 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4676 { | 4676 { |
| 4677 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4677 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4678 } | 4678 } |
| 4679 | 4679 |
| 4680 } // namespace blink | 4680 } // namespace blink |
| OLD | NEW |