Changeset 39362 in webkit

Timestamp:

Dec 17, 2008 1:11:31 PM (15 years ago)

Author:

abarth@webkit.org

Message:

WebCore:

2008-12-17 Cary Clark < ​caryclark@google.com>

Reviewed by Darin Adler.
Landed by Adam Barth.

Add ENABLE_TEXT_CARET to permit the ANDROID platform
to invalidate and draw the caret in a separate thread.

• page/Frame.cpp: (WebCore::Frame::clearCaretRectIfNeeded): Body of function does nothing if text caret is disabled. (WebCore::Frame::selectionLayoutChanged): Do nothing if text caret is disabled and the caret only blinked. (WebCore::Frame::caretBlinkTimerFired): (WebCore::Frame::paintCaret): (WebCore::Frame::paintDragCaret): Body of functions does nothing if text caret is disabled.

JavaScriptCore:

2008-12-17 Cary Clark <​caryclark@google.com>

Reviewed by Darin Adler.
Landed by Adam Barth.

Add ENABLE_TEXT_CARET to permit the ANDROID platform
to invalidate and draw the caret in a separate thread.

• wtf/Platform.h: Default ENABLE_TEXT_CARET to 1.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-12-17  Cary Clark  <caryclark@google.com>
+
+        Reviewed by Darin Adler.
+        Landed by Adam Barth.
+
+        Add ENABLE_TEXT_CARET to permit the ANDROID platform
+        to invalidate and draw the caret in a separate thread.
+
+        * wtf/Platform.h:
+        Default ENABLE_TEXT_CARET to 1.
+
 2008-12-17  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -424 +424 @@
 #endif
 
+#if !defined(ENABLE_TEXT_CARET)
+#define ENABLE_TEXT_CARET 1
+#endif
+
 /* CTI only supports x86 at the moment, and has only been tested on Mac and Windows. */
 #if !defined(ENABLE_JIT) && PLATFORM(X86) && (PLATFORM(MAC) || PLATFORM(WIN))

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-17  Cary Clark  < caryclark@google.com>
+
+        Reviewed by Darin Adler.
+        Landed by Adam Barth.
+
+        Add ENABLE_TEXT_CARET to permit the ANDROID platform
+        to invalidate and draw the caret in a separate thread.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::clearCaretRectIfNeeded): Body of
+        function does nothing if text caret is disabled.
+        (WebCore::Frame::selectionLayoutChanged): Do nothing
+        if text caret is disabled and the caret only blinked.
+        (WebCore::Frame::caretBlinkTimerFired):
+        (WebCore::Frame::paintCaret):
+        (WebCore::Frame::paintDragCaret): Body of
+        functions does nothing if text caret is disabled.
+
 2008-12-16  Darin Adler  <darin@apple.com>
 

trunk/WebCore/page/Frame.cpp

@@ -526 +526 @@
 void Frame::clearCaretRectIfNeeded()
 {
+#if ENABLE(TEXT_CARET)
     if (d->m_caretPaint) {
         d->m_caretPaint = false;
         selection()->invalidateCaretRect();
     }
+#endif
 }
 
@@ -576 +578 @@
     bool caretRectChanged = selection()->recomputeCaretRect();
 
+#if ENABLE(TEXT_CARET)
     bool shouldBlink = d->m_caretVisible
         && selection()->isCaret() && selection()->isContentEditable();
@@ -595 +598 @@
         }
     }
+#else
+    if (!caretRectChanged)
+        return;
+#endif
 
     RenderView* view = contentRenderer();
@@ -628 +635 @@
 void Frame::caretBlinkTimerFired(Timer<Frame>*)
 {
+#if ENABLE(TEXT_CARET)
     ASSERT(d->m_caretVisible);
     ASSERT(selection()->isCaret());
@@ -635 +643 @@
     d->m_caretPaint = !caretPaint;
     selection()->invalidateCaretRect();
+#endif
 }
 
 void Frame::paintCaret(GraphicsContext* p, int tx, int ty, const IntRect& clipRect) const
 {
+#if ENABLE(TEXT_CARET)
     if (d->m_caretPaint && d->m_caretVisible)
         selection()->paintCaret(p, tx, ty, clipRect);
+#endif
 }
 
 void Frame::paintDragCaret(GraphicsContext* p, int tx, int ty, const IntRect& clipRect) const
 {
+#if ENABLE(TEXT_CARET)
     SelectionController* dragCaretController = d->m_page->dragCaretController();
     ASSERT(dragCaretController->selection().isCaret());
     if (dragCaretController->selection().start().node()->document()->frame() == this)
         dragCaretController->paintCaret(p, tx, ty, clipRect);
+#endif
 }