Revert of Temporarily let DocumentMakerController use invalidatePaint…

…ForWholeRenderer (patchset #3 id:60001 of https://codereview.chromium.org/499493003/) Reason for revert: We have fixed the RenderText invalidation issue (crbug.com/394133). Original issue's description: > Temporarily let DocumentMakerController use invalidatePaintForWholeRenderer > > setShouldDoFullPaintInvalidation doesn't work for RenderText yet. > > BUG=405501 > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=180877 [email protected],[email protected],[email protected] BUG=405501 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=182089 Review URL: https://codereview.chromium.org/574773002 git-svn-id: svn://svn.chromium.org/blink/trunk@182181 bbb929c8-8fbe-4397-9dbb-9b2b20218538
yoavweiss · Sep 17, 2014 · 9837810 · 9837810
1 parent 2510800
commit 9837810
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Source/core/dom/DocumentMarkerController.cpp b/Source/core/dom/DocumentMarkerController.cpp
@@ -235,7 +235,7 @@ void DocumentMarkerController::addMarker(Node* node, const DocumentMarker& newMa
 
     // repaint the affected node
     if (node->renderer())
-        node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
+        node->renderer()->setShouldDoFullPaintInvalidation(true);
 }
 
 void DocumentMarkerController::mergeOverlapping(MarkerList* list, DocumentMarker& toInsert)
@@ -296,7 +296,7 @@ void DocumentMarkerController::copyMarkers(Node* srcNode, unsigned startOffset,
 
     // repaint the affected node
     if (docDirty && dstNode->renderer())
-        dstNode->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
+        dstNode->renderer()->setShouldDoFullPaintInvalidation(true);
 }
 
 void DocumentMarkerController::removeMarkers(Node* node, unsigned startOffset, int length, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker)
@@ -377,7 +377,7 @@ void DocumentMarkerController::removeMarkers(Node* node, unsigned startOffset, i
 
     // repaint the affected node
     if (docDirty && node->renderer())
-        node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
+        node->renderer()->setShouldDoFullPaintInvalidation(true);
 }
 
 DocumentMarker* DocumentMarkerController::markerContainingPoint(const LayoutPoint& point, DocumentMarker::MarkerType markerType)
@@ -586,7 +586,7 @@ void DocumentMarkerController::removeMarkersFromList(MarkerMap::iterator iterato
 
     if (needsRepainting) {
         if (RenderObject* renderer = iterator->key->renderer())
-            renderer->doNotUseInvalidatePaintForWholeRendererSynchronously();
+            renderer->setShouldDoFullPaintInvalidation(true);
     }
 
     if (nodeCanBeRemoved) {
@@ -616,7 +616,7 @@ void DocumentMarkerController::repaintMarkers(DocumentMarker::MarkerTypes marker
 
             // cause the node to be redrawn
             if (RenderObject* renderer = node->renderer()) {
-                renderer->doNotUseInvalidatePaintForWholeRendererSynchronously();
+                renderer->setShouldDoFullPaintInvalidation(true);
                 break;
             }
         }
@@ -670,7 +670,7 @@ void DocumentMarkerController::shiftMarkers(Node* node, unsigned startOffset, in
 
     // repaint the affected node
     if (docDirty && node->renderer())
-        node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
+        node->renderer()->setShouldDoFullPaintInvalidation(true);
 }
 
 void DocumentMarkerController::setMarkersActive(Range* range, bool active)
@@ -714,7 +714,7 @@ void DocumentMarkerController::setMarkersActive(Node* node, unsigned startOffset
 
     // repaint the affected node
     if (docDirty && node->renderer())
-        node->renderer()->doNotUseInvalidatePaintForWholeRendererSynchronously();
+        node->renderer()->setShouldDoFullPaintInvalidation(true);
 }
 
 bool DocumentMarkerController::hasMarkers(Range* range, DocumentMarker::MarkerTypes markerTypes)

diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h
@@ -1079,8 +1079,6 @@ class RenderObject : public NoBaseWillBeGarbageCollectedFinalized<RenderObject>,
     void setNeedsOverflowRecalcAfterStyleChange();
     void markContainingBlocksForOverflowRecalc();
 
-    // FIXME: This is temporary for cases that setShouldDoFullPaintInvalidation(true) doesn't work yet.
-    void doNotUseInvalidatePaintForWholeRendererSynchronously() const { invalidatePaintForWholeRenderer(); }
     virtual LayoutRect viewRect() const;
 
     // FIXME: make this not public.