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

Side by Side Diff: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp

Issue 2886893008: [DMC #8] Rename DocumentMarkerController::RenderedRectsForMarkers() (Closed)
Patch Set: Reformat FrameView Created 3 years, 7 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
7 * reserved. 7 * reserved.
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 } 386 }
387 } 387 }
388 std::sort(result.begin(), result.end(), 388 std::sort(result.begin(), result.end(),
389 [](const Member<DocumentMarker>& marker1, 389 [](const Member<DocumentMarker>& marker1,
390 const Member<DocumentMarker>& marker2) { 390 const Member<DocumentMarker>& marker2) {
391 return marker1->StartOffset() < marker2->StartOffset(); 391 return marker1->StartOffset() < marker2->StartOffset();
392 }); 392 });
393 return result; 393 return result;
394 } 394 }
395 395
396 Vector<IntRect> DocumentMarkerController::RenderedRectsForMarkers( 396 Vector<IntRect> DocumentMarkerController::RenderedRectsForTextMatchMarkers() {
397 DocumentMarker::MarkerType marker_type) {
398 // Only TextMatch markers can have rendered rects
399 // TODO(rlanday): remove marker_type parameter
400 DCHECK_EQ(marker_type, DocumentMarker::kTextMatch);
401
402 Vector<IntRect> result; 397 Vector<IntRect> result;
403 398 if (!PossiblyHasMarkers(DocumentMarker::kTextMatch))
404 if (!PossiblyHasMarkers(marker_type))
405 return result; 399 return result;
406 DCHECK(!(markers_.IsEmpty())); 400 DCHECK(!(markers_.IsEmpty()));
407 401
408 // outer loop: process each node 402 // outer loop: process each node
409 MarkerMap::iterator end = markers_.end(); 403 MarkerMap::iterator end = markers_.end();
410 for (MarkerMap::iterator node_iterator = markers_.begin(); 404 for (MarkerMap::iterator node_iterator = markers_.begin();
411 node_iterator != end; ++node_iterator) { 405 node_iterator != end; ++node_iterator) {
412 // inner loop; process each marker in this node 406 // inner loop; process each marker in this node
413 const Node& node = *node_iterator->key; 407 const Node& node = *node_iterator->key;
414 if (!node.isConnected()) 408 if (!node.isConnected())
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 } 730 }
737 731
738 } // namespace blink 732 } // namespace blink
739 733
740 #ifndef NDEBUG 734 #ifndef NDEBUG
741 void showDocumentMarkers(const blink::DocumentMarkerController* controller) { 735 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
742 if (controller) 736 if (controller)
743 controller->ShowMarkers(); 737 controller->ShowMarkers();
744 } 738 }
745 #endif 739 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698