Source/core/dom/DocumentMarkerController.h - Issue 576073003: Removal of more temporary Range objects.

Side by Side Diff: Source/core/dom/DocumentMarkerController.h

Issue 576073003: Removal of more temporary Range objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fix build; accidentally removed .get() call Created 6 years, 3 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 | « no previous file | Source/core/dom/DocumentMarkerController.cpp » ('j') | no next file with comments »

OLD	NEW
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 reserved.	6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.

7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)	7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)

8 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	8 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

9 *	9 *

10 * This library is free software; you can redistribute it and/or	10 * This library is free software; you can redistribute it and/or

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 WTF_MAKE_NONCOPYABLE(DocumentMarkerController); WTF_MAKE_FAST_ALLOCATED_WILL _BE_REMOVED;	57 WTF_MAKE_NONCOPYABLE(DocumentMarkerController); WTF_MAKE_FAST_ALLOCATED_WILL _BE_REMOVED;

58 DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DocumentMarkerController);	58 DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DocumentMarkerController);

59 public:	59 public:

60	60

61 DocumentMarkerController();	61 DocumentMarkerController();

62	62

63 void clear();	63 void clear();

64 void addMarker(Range*, DocumentMarker::MarkerType);	64 void addMarker(Range*, DocumentMarker::MarkerType);

65 void addMarker(Range*, DocumentMarker::MarkerType, const String& description );	65 void addMarker(Range*, DocumentMarker::MarkerType, const String& description );

66 void addMarker(Range*, DocumentMarker::MarkerType, const String& description , uint32_t hash);	66 void addMarker(Range*, DocumentMarker::MarkerType, const String& description , uint32_t hash);

	67 void addMarker(const Position& start, const Position& end, DocumentMarker::M arkerType);

	68 void addMarker(const Position& start, const Position& end, DocumentMarker::M arkerType, const String& description);

67 void addTextMatchMarker(const Range*, bool activeMatch);	69 void addTextMatchMarker(const Range*, bool activeMatch);

68	70

69 void copyMarkers(Node* srcNode, unsigned startOffset, int length, Node* dstN ode, int delta);	71 void copyMarkers(Node* srcNode, unsigned startOffset, int length, Node* dstN ode, int delta);

70 bool hasMarkers(Range*, DocumentMarker::MarkerTypes = DocumentMarker::AllMar kers());	72 bool hasMarkers(Range*, DocumentMarker::MarkerTypes = DocumentMarker::AllMar kers());

71	73

72 void prepareForDestruction();	74 void prepareForDestruction();

73 // When a marker partially overlaps with range, if removePartiallyOverlappin gMarkers is true, we completely	75 // When a marker partially overlaps with range, if removePartiallyOverlappin gMarkers is true, we completely

74 // remove the marker. If the argument is false, we will adjust the span of t he marker so that it retains	76 // remove the marker. If the argument is false, we will adjust the span of t he marker so that it retains

75 // the portion that is outside of the range.	77 // the portion that is outside of the range.

76 enum RemovePartiallyOverlappingMarkerOrNot { DoNotRemovePartiallyOverlapping Marker, RemovePartiallyOverlappingMarker };	78 enum RemovePartiallyOverlappingMarkerOrNot { DoNotRemovePartiallyOverlapping Marker, RemovePartiallyOverlappingMarker };

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
115 DocumentMarker::MarkerTypes m_possiblyExistingMarkerTypes;	117 DocumentMarker::MarkerTypes m_possiblyExistingMarkerTypes;

116 };	118 };

117	119

118 } // namespace blink	120 } // namespace blink

119	121

120 #ifndef NDEBUG	122 #ifndef NDEBUG

121 void showDocumentMarkers(const blink::DocumentMarkerController*);	123 void showDocumentMarkers(const blink::DocumentMarkerController*);

122 #endif	124 #endif

123	125

124 #endif // DocumentMarkerController_h	126 #endif // DocumentMarkerController_h

OLD	NEW