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

Unified Diff: sky/engine/core/editing/FrameSelection.cpp

Issue 845093002: Delete an assortment of unneeded 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/editing/FrameSelection.h ('k') | sky/engine/core/frame/FrameView.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/FrameSelection.cpp
diff --git a/sky/engine/core/editing/FrameSelection.cpp b/sky/engine/core/editing/FrameSelection.cpp
index 07c8186eb915821ef8308d6e078d32731a10ea4a..dfd96aafb6142599bb104d0598e718240ea6600e 100644
--- a/sky/engine/core/editing/FrameSelection.cpp
+++ b/sky/engine/core/editing/FrameSelection.cpp
@@ -83,7 +83,6 @@ FrameSelection::FrameSelection(LocalFrame* frame)
, m_observingVisibleSelection(false)
, m_granularity(CharacterGranularity)
, m_caretBlinkTimer(this, &FrameSelection::caretBlinkTimerFired)
- , m_caretRectDirty(true)
, m_shouldPaintCaret(true)
, m_isCaretBlinkingSuspended(false)
, m_focused(frame && frame->page() && frame->page()->focusController().focusedFrame() == frame)
@@ -1156,7 +1155,6 @@ void FrameSelection::prepareForDestruction()
view->clearSelection();
setSelection(VisibleSelection(), CloseTyping | ClearTypingStyle | DoNotUpdateAppearance);
- m_previousCaretNode.clear();
}
void FrameSelection::setStart(const VisiblePosition &pos, EUserTriggered trigger)
@@ -1209,37 +1207,6 @@ IntRect FrameSelection::absoluteCaretBounds()
return absoluteBoundsForLocalRect(m_selection.start().deprecatedNode(), localCaretRectWithoutUpdate());
}
-static LayoutRect localCaretRect(const VisibleSelection& m_selection, const PositionWithAffinity& caretPosition, RenderObject*& renderer)
-{
- renderer = nullptr;
- if (!isNonOrphanedCaret(m_selection))
- return LayoutRect();
-
- return localCaretRectOfPosition(caretPosition, renderer);
-}
-
-void FrameSelection::invalidateCaretRect()
-{
- if (!m_caretRectDirty)
- return;
- m_caretRectDirty = false;
-
- RenderObject* renderer = nullptr;
- LayoutRect newRect = localCaretRect(m_selection, PositionWithAffinity(m_selection.start(), m_selection.affinity()), renderer);
- Node* newNode = renderer ? renderer->node() : nullptr;
-
- if (!m_caretBlinkTimer.isActive() && newNode == m_previousCaretNode && newRect == m_previousCaretRect)
- return;
-
- if (m_previousCaretNode && m_previousCaretNode->isContentEditable())
- invalidateLocalCaretRect(m_previousCaretNode.get(), m_previousCaretRect);
- if (newNode && newNode->isContentEditable())
- invalidateLocalCaretRect(newNode, newRect);
-
- m_previousCaretNode = newNode;
- m_previousCaretRect = newRect;
-}
-
void FrameSelection::paintCaret(GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect)
{
if (m_selection.isCaret() && m_shouldPaintCaret) {
@@ -1688,8 +1655,6 @@ void FrameSelection::showTreeForThis() const
void FrameSelection::setCaretRectNeedsUpdate()
{
- m_caretRectDirty = true;
-
scheduleVisualUpdate();
}
« no previous file with comments | « sky/engine/core/editing/FrameSelection.h ('k') | sky/engine/core/frame/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698