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

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

Issue 181693003: Have Document::markers() return a reference (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
« no previous file with comments | « Source/web/WebFrameImpl.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3148 matching lines...) Expand 10 before | Expand all | Expand 10 after
3159 m_page->dragController().performDrag(&dragData); 3159 m_page->dragController().performDrag(&dragData);
3160 3160
3161 m_dragOperation = WebDragOperationNone; 3161 m_dragOperation = WebDragOperationNone;
3162 m_currentDragData = nullptr; 3162 m_currentDragData = nullptr;
3163 } 3163 }
3164 3164
3165 void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers) 3165 void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers)
3166 { 3166 {
3167 Vector<uint32_t> result; 3167 Vector<uint32_t> result;
3168 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t raverseNext()) { 3168 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t raverseNext()) {
3169 const Vector<DocumentMarker*>& documentMarkers = frame->document()->mark ers()->markers(); 3169 const Vector<DocumentMarker*>& documentMarkers = frame->document()->mark ers().markers();
3170 for (size_t i = 0; i < documentMarkers.size(); ++i) 3170 for (size_t i = 0; i < documentMarkers.size(); ++i)
3171 result.append(documentMarkers[i]->hash()); 3171 result.append(documentMarkers[i]->hash());
3172 } 3172 }
3173 markers->assign(result); 3173 markers->assign(result);
3174 } 3174 }
3175 3175
3176 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPo int, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers) 3176 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPo int, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers)
3177 { 3177 {
3178 ASSERT(m_currentDragData); 3178 ASSERT(m_currentDragData);
3179 3179
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
3982 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3982 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3983 3983
3984 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3984 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3985 return false; 3985 return false;
3986 3986
3987 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3987 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3988 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3988 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3989 } 3989 }
3990 3990
3991 } // namespace blink 3991 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebFrameImpl.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698