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

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

Issue 169323002: Oilpan: Move core/clipboard/ to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
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 3115 matching lines...) Expand 10 before | Expand all | Expand 10 after
3126 3126
3127 WebDragOperation WebViewImpl::dragTargetDragEnter( 3127 WebDragOperation WebViewImpl::dragTargetDragEnter(
3128 const WebDragData& webDragData, 3128 const WebDragData& webDragData,
3129 const WebPoint& clientPoint, 3129 const WebPoint& clientPoint,
3130 const WebPoint& screenPoint, 3130 const WebPoint& screenPoint,
3131 WebDragOperationsMask operationsAllowed, 3131 WebDragOperationsMask operationsAllowed,
3132 int keyModifiers) 3132 int keyModifiers)
3133 { 3133 {
3134 ASSERT(!m_currentDragData); 3134 ASSERT(!m_currentDragData);
3135 3135
3136 m_currentDragData = webDragData; 3136 m_currentDragData = webDragData.getValue();
3137 m_operationsAllowed = operationsAllowed; 3137 m_operationsAllowed = operationsAllowed;
3138 3138
3139 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod ifiers); 3139 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod ifiers);
3140 } 3140 }
3141 3141
3142 WebDragOperation WebViewImpl::dragTargetDragOver( 3142 WebDragOperation WebViewImpl::dragTargetDragOver(
3143 const WebPoint& clientPoint, 3143 const WebPoint& clientPoint,
3144 const WebPoint& screenPoint, 3144 const WebPoint& screenPoint,
3145 WebDragOperationsMask operationsAllowed, 3145 WebDragOperationsMask operationsAllowed,
3146 int keyModifiers) 3146 int keyModifiers)
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
3985 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3985 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3986 3986
3987 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3987 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3988 return false; 3988 return false;
3989 3989
3990 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3990 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3991 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3991 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3992 } 3992 }
3993 3993
3994 } // namespace blink 3994 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698