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

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 3594 matching lines...) Expand 10 before | Expand all | Expand 10 after
3605 3605
3606 WebDragOperation WebViewImpl::dragTargetDragEnter( 3606 WebDragOperation WebViewImpl::dragTargetDragEnter(
3607 const WebDragData& webDragData, 3607 const WebDragData& webDragData,
3608 const WebPoint& clientPoint, 3608 const WebPoint& clientPoint,
3609 const WebPoint& screenPoint, 3609 const WebPoint& screenPoint,
3610 WebDragOperationsMask operationsAllowed, 3610 WebDragOperationsMask operationsAllowed,
3611 int keyModifiers) 3611 int keyModifiers)
3612 { 3612 {
3613 ASSERT(!m_currentDragData); 3613 ASSERT(!m_currentDragData);
3614 3614
3615 m_currentDragData = webDragData.getValue(); 3615 m_currentDragData = DataObject::create(webDragData);
3616 m_operationsAllowed = operationsAllowed; 3616 m_operationsAllowed = operationsAllowed;
3617 3617
3618 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod ifiers); 3618 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod ifiers);
3619 } 3619 }
3620 3620
3621 WebDragOperation WebViewImpl::dragTargetDragOver( 3621 WebDragOperation WebViewImpl::dragTargetDragOver(
3622 const WebPoint& clientPoint, 3622 const WebPoint& clientPoint,
3623 const WebPoint& screenPoint, 3623 const WebPoint& screenPoint,
3624 WebDragOperationsMask operationsAllowed, 3624 WebDragOperationsMask operationsAllowed,
3625 int keyModifiers) 3625 int keyModifiers)
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
4635 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4635 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4636 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4636 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4637 } 4637 }
4638 4638
4639 void WebViewImpl::forceNextWebGLContextCreationToFail() 4639 void WebViewImpl::forceNextWebGLContextCreationToFail()
4640 { 4640 {
4641 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); 4641 WebGLRenderingContext::forceNextWebGLContextCreationToFail();
4642 } 4642 }
4643 4643
4644 } // namespace blink 4644 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698