| 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 3226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3237 m_page->dragController().performDrag(&dragData); | 3237 m_page->dragController().performDrag(&dragData); |
| 3238 | 3238 |
| 3239 m_dragOperation = WebDragOperationNone; | 3239 m_dragOperation = WebDragOperationNone; |
| 3240 m_currentDragData = nullptr; | 3240 m_currentDragData = nullptr; |
| 3241 } | 3241 } |
| 3242 | 3242 |
| 3243 void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers) | 3243 void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers) |
| 3244 { | 3244 { |
| 3245 Vector<uint32_t> result; | 3245 Vector<uint32_t> result; |
| 3246 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t
raverseNext()) { | 3246 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t
raverseNext()) { |
| 3247 const Vector<DocumentMarker*>& documentMarkers = frame->document()->mark
ers().markers(); | 3247 const WillBeHeapVector<DocumentMarker*>& documentMarkers = frame->docume
nt()->markers().markers(); |
| 3248 for (size_t i = 0; i < documentMarkers.size(); ++i) | 3248 for (size_t i = 0; i < documentMarkers.size(); ++i) |
| 3249 result.append(documentMarkers[i]->hash()); | 3249 result.append(documentMarkers[i]->hash()); |
| 3250 } | 3250 } |
| 3251 markers->assign(result); | 3251 markers->assign(result); |
| 3252 } | 3252 } |
| 3253 | 3253 |
| 3254 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPo
int, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers) | 3254 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPo
int, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers) |
| 3255 { | 3255 { |
| 3256 ASSERT(m_currentDragData); | 3256 ASSERT(m_currentDragData); |
| 3257 | 3257 |
| (...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4064 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4064 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4065 | 4065 |
| 4066 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4066 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4067 return false; | 4067 return false; |
| 4068 | 4068 |
| 4069 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4069 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4070 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4070 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4071 } | 4071 } |
| 4072 | 4072 |
| 4073 } // namespace blink | 4073 } // namespace blink |
| OLD | NEW |