Modified: trunk/Source/WebCore/ChangeLog (149653 => 149654)
--- trunk/Source/WebCore/ChangeLog 2013-05-07 00:33:05 UTC (rev 149653)
+++ trunk/Source/WebCore/ChangeLog 2013-05-07 00:45:31 UTC (rev 149654)
@@ -1,3 +1,43 @@
+2013-05-06 Darin Adler <[email protected]>
+
+ Use OwnPtr instead of deleteAllValues in DocumentMarkerController
+ https://bugs.webkit.org/show_bug.cgi?id=115655
+
+ Reviewed by Andreas Kling.
+
+ * dom/DocumentMarkerController.cpp:
+ (WebCore::DocumentMarkerController::~DocumentMarkerController): Added here
+ so the destructor isn't implicitly inline.
+ (WebCore::DocumentMarkerController::detach): Removed now-unneeded code to
+ call deleteAllValues. Also moved code to set m_possiblyExistingMarkerTypes
+ to after clearing m_markers to be consistent with how other functions do it.
+ (WebCore::DocumentMarkerController::addMarker): Changed code to use the
+ add idiom to avoid double hash table lookup. Changed to use adoptPtr since
+ the map now contains OwnPtr.
+ (WebCore::DocumentMarkerController::removeMarkers): Removed explicit calls
+ to delete list since removing the entry from the map now deletes the list.
+ Moved the code to check if m_markers has become empty so it's only called
+ when we actually remove something from m_markers.
+ (WebCore::DocumentMarkerController::markerContainingPoint): Added get().
+ (WebCore::DocumentMarkerController::renderedRectsForMarkers): Added get().
+ (WebCore::DocumentMarkerController::removeMarkers): Changed to use a new
+ interface to removeMarkersFromList. This eliminated the need to copy the
+ entire map when removing markers; instead we can just copy the keys.
+ (WebCore::DocumentMarkerController::removeMarkersFromList): Changed to use
+ an iterator instead of being passed the key/value pair from the map. Also
+ rearranged the logic so there is less repeated code and removed some now-
+ unneeded comments.
+ (WebCore::DocumentMarkerController::repaintMarkers): Added get().
+ (WebCore::DocumentMarkerController::invalidateRenderedRectsForMarkersInRect):
+ Added get().
+ (WebCore::DocumentMarkerController::showMarkers): Added get().
+
+ * dom/DocumentMarkerController.h: Removed implementation of the destructor
+ that called the detach function; that was just sharing the now-unneeded
+ call to deleteAllValues. Changed the type of the map to use an OwnPtr for
+ the value. Changed the interface of removeMarkersFromList to take a map
+ iterator instead of a key/value pair.
+
2013-05-06 Beth Dakin <[email protected]>
Reproducible crash in RenderBoxModelObject::adjustedPositionRelativeToOffsetParent()
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (149653 => 149654)
--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2013-05-07 00:33:05 UTC (rev 149653)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2013-05-07 00:45:31 UTC (rev 149654)
@@ -33,10 +33,7 @@
#include "RenderObject.h"
#include "RenderedDocumentMarker.h"
#include "TextIterator.h"
-
-#ifndef NDEBUG
#include <stdio.h>
-#endif
namespace WebCore {
@@ -50,13 +47,14 @@
{
}
+DocumentMarkerController::~DocumentMarkerController()
+{
+}
+
void DocumentMarkerController::detach()
{
- m_possiblyExistingMarkerTypes = 0;
- if (m_markers.isEmpty())
- return;
- deleteAllValues(m_markers);
m_markers.clear();
+ m_possiblyExistingMarkerTypes = 0;
}
void DocumentMarkerController::addMarker(Range* range, DocumentMarker::MarkerType type, const String& description)
@@ -134,12 +132,11 @@
m_possiblyExistingMarkerTypes.add(newMarker.type());
- MarkerList* list = m_markers.get(node);
+ OwnPtr<MarkerList>& list = m_markers.add(node, nullptr).iterator->value;
if (!list) {
- list = new MarkerList;
+ list = adoptPtr(new MarkerList);
list->append(RenderedDocumentMarker(newMarker));
- m_markers.set(node, list);
} else {
RenderedDocumentMarker toInsert(newMarker);
size_t numMarkers = list->size();
@@ -286,11 +283,9 @@
if (list->isEmpty()) {
m_markers.remove(node);
- delete list;
+ if (m_markers.isEmpty())
+ m_possiblyExistingMarkerTypes = 0;
}
-
- if (m_markers.isEmpty())
- m_possiblyExistingMarkerTypes = 0;
// repaint the affected node
if (docDirty && node->renderer())
@@ -307,7 +302,7 @@
MarkerMap::iterator end = m_markers.end();
for (MarkerMap::iterator nodeIterator = m_markers.begin(); nodeIterator != end; ++nodeIterator) {
// inner loop; process each marker in this node
- MarkerList* list = nodeIterator->value;
+ MarkerList* list = nodeIterator->value.get();
unsigned markerCount = list->size();
for (unsigned markerIndex = 0; markerIndex < markerCount; ++markerIndex) {
RenderedDocumentMarker& marker = list->at(markerIndex);
@@ -395,7 +390,7 @@
MarkerMap::iterator end = m_markers.end();
for (MarkerMap::iterator nodeIterator = m_markers.begin(); nodeIterator != end; ++nodeIterator) {
// inner loop; process each marker in this node
- MarkerList* list = nodeIterator->value;
+ MarkerList* list = nodeIterator->value.get();
unsigned markerCount = list->size();
for (unsigned markerIndex = 0; markerIndex < markerCount; ++markerIndex) {
const RenderedDocumentMarker& marker = list->at(markerIndex);
@@ -422,7 +417,7 @@
MarkerMap::iterator iterator = m_markers.find(node);
if (iterator != m_markers.end())
- removeMarkersFromList(node, iterator->value, markerTypes);
+ removeMarkersFromList(iterator, markerTypes);
}
void DocumentMarkerController::removeMarkers(DocumentMarker::MarkerTypes markerTypes)
@@ -431,25 +426,30 @@
return;
ASSERT(!m_markers.isEmpty());
- // outer loop: process each markered node in the document
- MarkerMap markerMapCopy = m_markers;
- MarkerMap::iterator end = markerMapCopy.end();
- for (MarkerMap::iterator i = markerMapCopy.begin(); i != end; ++i)
- removeMarkersFromList(i->key.get(), i->value, markerTypes);
+ Vector<RefPtr<Node> > nodesWithMarkers;
+ copyKeysToVector(m_markers, nodesWithMarkers);
+ unsigned size = nodesWithMarkers.size();
+ for (unsigned i = 0; i < size; ++i) {
+ MarkerMap::iterator iterator = m_markers.find(nodesWithMarkers[i]);
+ if (iterator != m_markers.end())
+ removeMarkersFromList(iterator, markerTypes);
+ }
+
m_possiblyExistingMarkerTypes.remove(markerTypes);
}
-// This function may release node and vectorPair.
-void DocumentMarkerController::removeMarkersFromList(Node* node, MarkerList* list, DocumentMarker::MarkerTypes markerTypes)
+void DocumentMarkerController::removeMarkersFromList(MarkerMap::iterator iterator, DocumentMarker::MarkerTypes markerTypes)
{
+ bool needsRepainting = false;
+ bool listCanBeRemoved;
+
if (markerTypes == DocumentMarker::AllMarkers()) {
- delete list;
- m_markers.remove(node);
- if (RenderObject* renderer = node->renderer())
- renderer->repaint();
+ needsRepainting = true;
+ listCanBeRemoved = true;
} else {
- bool needsRepaint = false;
- for (size_t i = 0; i != list->size();) {
+ MarkerList* list = iterator->value.get();
+
+ for (size_t i = 0; i != list->size(); ) {
DocumentMarker marker = list->at(i);
// skip nodes that are not of the specified type
@@ -460,26 +460,23 @@
// pitch the old marker
list->remove(i);
- needsRepaint = true;
+ needsRepainting = true;
// i now is the index of the next marker
}
- // Redraw the node if it changed. Do this before the node is removed from m_markers, since
- // m_markers might contain the last reference to the node.
- if (needsRepaint) {
- RenderObject* renderer = node->renderer();
- if (renderer)
- renderer->repaint();
- }
+ listCanBeRemoved = list->isEmpty();
+ }
- // delete the node's list if it is now empty
- if (list->isEmpty()) {
- m_markers.remove(node);
- delete list;
- }
+ if (needsRepainting) {
+ if (RenderObject* renderer = iterator->key->renderer())
+ renderer->repaint();
}
- if (m_markers.isEmpty())
- m_possiblyExistingMarkerTypes = 0;
+
+ if (listCanBeRemoved) {
+ m_markers.remove(iterator);
+ if (m_markers.isEmpty())
+ m_possiblyExistingMarkerTypes = 0;
+ }
}
void DocumentMarkerController::repaintMarkers(DocumentMarker::MarkerTypes markerTypes)
@@ -494,7 +491,7 @@
Node* node = i->key.get();
// inner loop: process each marker in the current node
- MarkerList* list = i->value;
+ MarkerList* list = i->value.get();
bool nodeNeedsRepaint = false;
for (size_t i = 0; i != list->size(); ++i) {
DocumentMarker marker = list->at(i);
@@ -522,7 +519,7 @@
for (MarkerMap::iterator i = m_markers.begin(); i != end; ++i) {
// inner loop: process each rect in the current node
- MarkerList* list = i->value;
+ MarkerList* list = i->value.get();
for (size_t listIndex = 0; listIndex < list->size(); ++listIndex)
list->at(listIndex).invalidate(r);
}
@@ -673,7 +670,7 @@
for (MarkerMap::const_iterator nodeIterator = m_markers.begin(); nodeIterator != end; ++nodeIterator) {
Node* node = nodeIterator->key.get();
fprintf(stderr, "%p", node);
- MarkerList* list = nodeIterator->value;
+ MarkerList* list = nodeIterator->value.get();
for (unsigned markerIndex = 0; markerIndex < list->size(); ++markerIndex) {
const DocumentMarker& marker = list->at(markerIndex);
fprintf(stderr, " %d:[%d:%d](%d)", marker.type(), marker.startOffset(), marker.endOffset(), marker.activeMatch());
@@ -686,7 +683,6 @@
} // namespace WebCore
-
#ifndef NDEBUG
void showDocumentMarkers(const WebCore::DocumentMarkerController* controller)
{
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.h (149653 => 149654)
--- trunk/Source/WebCore/dom/DocumentMarkerController.h 2013-05-07 00:33:05 UTC (rev 149653)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.h 2013-05-07 00:45:31 UTC (rev 149654)
@@ -45,7 +45,7 @@
public:
DocumentMarkerController();
- ~DocumentMarkerController() { detach(); }
+ ~DocumentMarkerController();
void detach();
void addMarker(Range*, DocumentMarker::MarkerType);
@@ -87,9 +87,9 @@
void addMarker(Node*, const DocumentMarker&);
typedef Vector<RenderedDocumentMarker> MarkerList;
- typedef HashMap<RefPtr<Node>, MarkerList*> MarkerMap;
+ typedef HashMap<RefPtr<Node>, OwnPtr<MarkerList> > MarkerMap;
bool possiblyHasMarkers(DocumentMarker::MarkerTypes);
- void removeMarkersFromList(Node*, MarkerList*, DocumentMarker::MarkerTypes);
+ void removeMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes);
MarkerMap m_markers;
// Provide a quick way to determine whether a particular marker type is absent without going through the map.
