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

Unified Diff: sky/engine/core/dom/DocumentMarkerController.cpp

Issue 840403003: First pass at deleting paint invalidation code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/dom/DocumentMarkerController.h ('k') | sky/engine/core/editing/Editor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/DocumentMarkerController.cpp
diff --git a/sky/engine/core/dom/DocumentMarkerController.cpp b/sky/engine/core/dom/DocumentMarkerController.cpp
index 5cda6a138eed3ca1e26f34fcde32e3ad23a0d56a..0be3d7e40da8d123d9bd7e525f23dce90f132420 100644
--- a/sky/engine/core/dom/DocumentMarkerController.cpp
+++ b/sky/engine/core/dom/DocumentMarkerController.cpp
@@ -225,10 +225,6 @@ void DocumentMarkerController::addMarker(Node* node, const DocumentMarker& newMa
list->insert(pos - list->begin(), RenderedDocumentMarker::create(toInsert));
}
}
-
- // repaint the affected node
- if (node->renderer())
- node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
}
void DocumentMarkerController::mergeOverlapping(MarkerList* list, DocumentMarker& toInsert)
@@ -286,10 +282,6 @@ void DocumentMarkerController::copyMarkers(Node* srcNode, unsigned startOffset,
addMarker(dstNode, *marker);
}
}
-
- // repaint the affected node
- if (docDirty && dstNode->renderer())
- dstNode->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
}
void DocumentMarkerController::removeMarkers(Node* node, unsigned startOffset, int length, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker)
@@ -367,10 +359,6 @@ void DocumentMarkerController::removeMarkers(Node* node, unsigned startOffset, i
if (m_markers.isEmpty())
m_possiblyExistingMarkerTypes = 0;
}
-
- // repaint the affected node
- if (docDirty && node->renderer())
- node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
}
DocumentMarker* DocumentMarkerController::markerContainingPoint(const LayoutPoint& point, DocumentMarker::MarkerType markerType)
@@ -570,11 +558,6 @@ void DocumentMarkerController::removeMarkersFromList(MarkerMap::iterator iterato
nodeCanBeRemoved = emptyListsCount == DocumentMarker::MarkerTypeIndexesCount;
}
- if (needsRepainting) {
- if (RenderObject* renderer = iterator->key->renderer())
- renderer->doNotUseInvalidatePaintForWholeRendererSynchronously();
- }
-
if (nodeCanBeRemoved) {
m_markers.remove(iterator);
if (m_markers.isEmpty())
@@ -582,33 +565,6 @@ void DocumentMarkerController::removeMarkersFromList(MarkerMap::iterator iterato
}
}
-void DocumentMarkerController::repaintMarkers(DocumentMarker::MarkerTypes markerTypes)
-{
- if (!possiblyHasMarkers(markerTypes))
- return;
- ASSERT(!m_markers.isEmpty());
-
- // outer loop: process each markered node in the document
- MarkerMap::iterator end = m_markers.end();
- for (MarkerMap::iterator i = m_markers.begin(); i != end; ++i) {
- const Node* node = i->key;
-
- // inner loop: process each marker in the current node
- MarkerLists* markers = i->value.get();
- for (size_t markerListIndex = 0; markerListIndex < DocumentMarker::MarkerTypeIndexesCount; ++markerListIndex) {
- OwnPtr<MarkerList>& list = (*markers)[markerListIndex];
- if (!list || list->isEmpty() || !markerTypes.contains((*list->begin())->type()))
- continue;
-
- // cause the node to be redrawn
- if (RenderObject* renderer = node->renderer()) {
- renderer->doNotUseInvalidatePaintForWholeRendererSynchronously();
- break;
- }
- }
- }
-}
-
void DocumentMarkerController::invalidateRenderedRectsForMarkersInRect(const LayoutRect& r)
{
// outer loop: process each markered node in the document
@@ -653,10 +609,6 @@ void DocumentMarkerController::shiftMarkers(Node* node, unsigned startOffset, in
(*marker)->invalidate();
}
}
-
- // repaint the affected node
- if (docDirty && node->renderer())
- node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
}
void DocumentMarkerController::setMarkersActive(Range* range, bool active)
@@ -697,10 +649,6 @@ void DocumentMarkerController::setMarkersActive(Node* node, unsigned startOffset
(*marker)->setActiveMatch(active);
docDirty = true;
}
-
- // repaint the affected node
- if (docDirty && node->renderer())
- node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
}
bool DocumentMarkerController::hasMarkers(Range* range, DocumentMarker::MarkerTypes markerTypes)
« no previous file with comments | « sky/engine/core/dom/DocumentMarkerController.h ('k') | sky/engine/core/editing/Editor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698