| 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 3119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3130 | 3130 |
| 3131 WebDragOperation WebViewImpl::dragTargetDragEnter( | 3131 WebDragOperation WebViewImpl::dragTargetDragEnter( |
| 3132 const WebDragData& webDragData, | 3132 const WebDragData& webDragData, |
| 3133 const WebPoint& clientPoint, | 3133 const WebPoint& clientPoint, |
| 3134 const WebPoint& screenPoint, | 3134 const WebPoint& screenPoint, |
| 3135 WebDragOperationsMask operationsAllowed, | 3135 WebDragOperationsMask operationsAllowed, |
| 3136 int keyModifiers) | 3136 int keyModifiers) |
| 3137 { | 3137 { |
| 3138 ASSERT(!m_currentDragData); | 3138 ASSERT(!m_currentDragData); |
| 3139 | 3139 |
| 3140 m_currentDragData = webDragData; | 3140 m_currentDragData = webDragData.getValue(); |
| 3141 m_operationsAllowed = operationsAllowed; | 3141 m_operationsAllowed = operationsAllowed; |
| 3142 | 3142 |
| 3143 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod
ifiers); | 3143 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyMod
ifiers); |
| 3144 } | 3144 } |
| 3145 | 3145 |
| 3146 WebDragOperation WebViewImpl::dragTargetDragOver( | 3146 WebDragOperation WebViewImpl::dragTargetDragOver( |
| 3147 const WebPoint& clientPoint, | 3147 const WebPoint& clientPoint, |
| 3148 const WebPoint& screenPoint, | 3148 const WebPoint& screenPoint, |
| 3149 WebDragOperationsMask operationsAllowed, | 3149 WebDragOperationsMask operationsAllowed, |
| 3150 int keyModifiers) | 3150 int keyModifiers) |
| (...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4023 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4023 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4024 | 4024 |
| 4025 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4025 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4026 return false; | 4026 return false; |
| 4027 | 4027 |
| 4028 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4028 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4029 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4029 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4030 } | 4030 } |
| 4031 | 4031 |
| 4032 } // namespace blink | 4032 } // namespace blink |
| OLD | NEW |