Title: [123418] trunk
Revision
123418
Author
[email protected]
Date
2012-07-23 19:19:13 -0700 (Mon, 23 Jul 2012)

Log Message

[chromium] Show search tickmarks on css-styled scrollbars
https://bugs.webkit.org/show_bug.cgi?id=91949

Reviewed by Adrienne Walker.

This is done by letting RenderScrollbarTheme::paintTickmarks()
delegate to the native ScrollbarTheme. To make this possible,
move paintTickmarks() from ScrollbarThemeComposite to the
superclass ScrollbarTheme.

For testing, add internals.addTextMatchMarker() and add a pixel test.

* platform/ScrollbarTheme.h:
(WebCore::ScrollbarTheme::paintTickmarks):
Moved paintTickmarks() from ScrollbarThemeComposite to here.
* platform/ScrollbarThemeComposite.h:
Remove paintTickmarks().
* platform/chromium/ScrollbarThemeChromium.cpp:
(WebCore::ScrollbarThemeChromium::paintTickmarks):
Switch to drawing tickmarks as vectors, so they can be arbitrarily wide.
* platform/chromium/ScrollbarThemeChromiumMac.h:
(ScrollbarThemeChromiumMac):
Implement paintTickmarks(), so that css-styled scrollbars get tickmarks on mac.
* platform/chromium/ScrollbarThemeChromiumMac.mm:
(WebCore::ScrollbarThemeChromiumMac::paint):
(WebCore::ScrollbarThemeChromiumMac::paintTickmarks):
Implement paintTickmarks(), so that css-styled scrollbars get tickmarks on mac.
* rendering/RenderScrollbarTheme.cpp:
(WebCore::RenderScrollbarTheme::paintTickmarks):
Delegate to the native ScrollbarTheme for tickmark drawing.
(WebCore):
* rendering/RenderScrollbarTheme.h:
(RenderScrollbarTheme):
Override paintTickmarks().

Modified Paths

Added Paths

Diff

Added: trunk/LayoutTests/fast/scrolling/scrollbar-tickmarks-styled-expected.txt (0 => 123418)


--- trunk/LayoutTests/fast/scrolling/scrollbar-tickmarks-styled-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/scrolling/scrollbar-tickmarks-styled-expected.txt	2012-07-24 02:19:13 UTC (rev 123418)
@@ -0,0 +1 @@
+ 

Added: trunk/LayoutTests/fast/scrolling/scrollbar-tickmarks-styled.html (0 => 123418)


--- trunk/LayoutTests/fast/scrolling/scrollbar-tickmarks-styled.html	                        (rev 0)
+++ trunk/LayoutTests/fast/scrolling/scrollbar-tickmarks-styled.html	2012-07-24 02:19:13 UTC (rev 123418)
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<head>
+<style>
+html {
+    font: Ahem 10px;
+    -webkit-font-smoothing: none;
+}
+::-webkit-scrollbar {
+    width: 13px;
+    height: 13px;
+}
+::-webkit-scrollbar-track {
+    background-color:green;
+}
+::-webkit-scrollbar-thumb {
+    background-color:rgba(128, 128, 128, 0.8);  /* Let tickmark shine through */
+}
+</style>
+<script>
+function highlight()
+{
+    var range = document.createRange();
+    var elt = document.getElementById('elt');
+    range.selectNodeContents(elt);
+    if (window.internals) {
+        window.internals.addTextMatchMarker(range, true);
+    }
+    if (window.testRunner)
+        testRunner.dumpAsText(true);
+}
+</script>
+</head>
+<body _onload_="highlight();">
+
+<div style="height:600px"></div>
+<span id="elt" style="position:absolute; top:300px">&nbsp;</span>
+
+</body>
+</html>

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (123417 => 123418)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-07-24 02:19:13 UTC (rev 123418)
@@ -3594,6 +3594,9 @@
 // Flaky
 BUGWK90746 : fast/multicol/column-span-parent-continuation-crash.html = PASS TIMEOUT
 
+// Needs image
+BUGTHAKIS WIN LINUX : fast/scrolling/scrollbar-tickmarks-styled.html = IMAGE
+
 // Flaky
 BUGWK90896 WIN DEBUG : fast/js/dfg-cross-global-object-inline-new-array-literal.html = PASS TEXT
 

Added: trunk/LayoutTests/platform/chromium-mac/fast/scrolling/scrollbar-tickmarks-styled-expected.png (0 => 123418)


--- trunk/LayoutTests/platform/chromium-mac/fast/scrolling/scrollbar-tickmarks-styled-expected.png	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium-mac/fast/scrolling/scrollbar-tickmarks-styled-expected.png	2012-07-24 02:19:13 UTC (rev 123418)
@@ -0,0 +1,7 @@
+\x89PNG
+
+
+IHDR X\x9Av\x82p)tEXtchecksum28781127a5bece628eedf2589b2344f1\x9D!t\xA3IDATx\x9C\xED\xDB\xC1
+AAFQO,\x84Ft\xA6
+\xBA\xD4\xB1
+X\xE2\x8A\xE4\x9C\xF5\xF7\x92{3y\xCBc\xAC&O\xC7\xE9\x96X\xE3\x80g\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90 @f\xF3\xEB\x80\xFFu\xD8\xCE\xED\xF0\x91\xDD\xFE\xB5\xDD\xED*@\x80ݮ\xAFo\xF0\xB6\xCB}n\xEF't #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8 #@\x80\x8C2\xC8,c\x8C\xF1\xEB#\x80\xFF\xB3\x9C\x97\xE9o\xBC\x80d\x90 @F\x80d\x90 @F\x80d\x90 @F\x80d\x90yj1j\xC9\xD2S\x88IEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (123417 => 123418)


--- trunk/Source/WebCore/ChangeLog	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/ChangeLog	2012-07-24 02:19:13 UTC (rev 123418)
@@ -1,3 +1,40 @@
+2012-07-23  Nico Weber  <[email protected]>
+
+        [chromium] Show search tickmarks on css-styled scrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=91949
+
+        Reviewed by Adrienne Walker.
+
+        This is done by letting RenderScrollbarTheme::paintTickmarks()
+        delegate to the native ScrollbarTheme. To make this possible,
+        move paintTickmarks() from ScrollbarThemeComposite to the
+        superclass ScrollbarTheme.
+
+        For testing, add internals.addTextMatchMarker() and add a pixel test.
+
+        * platform/ScrollbarTheme.h:
+        (WebCore::ScrollbarTheme::paintTickmarks):
+        Moved paintTickmarks() from ScrollbarThemeComposite to here.
+        * platform/ScrollbarThemeComposite.h:
+        Remove paintTickmarks().
+        * platform/chromium/ScrollbarThemeChromium.cpp:
+        (WebCore::ScrollbarThemeChromium::paintTickmarks):
+        Switch to drawing tickmarks as vectors, so they can be arbitrarily wide.
+        * platform/chromium/ScrollbarThemeChromiumMac.h:
+        (ScrollbarThemeChromiumMac):
+        Implement paintTickmarks(), so that css-styled scrollbars get tickmarks on mac.
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+        (WebCore::ScrollbarThemeChromiumMac::paintTickmarks):
+        Implement paintTickmarks(), so that css-styled scrollbars get tickmarks on mac.
+        * rendering/RenderScrollbarTheme.cpp:
+        (WebCore::RenderScrollbarTheme::paintTickmarks):
+        Delegate to the native ScrollbarTheme for tickmark drawing.
+        (WebCore):
+        * rendering/RenderScrollbarTheme.h:
+        (RenderScrollbarTheme):
+        Override paintTickmarks().
+
 2012-07-23  Brian Anderson  <[email protected]>
 
         [chromium] Use shallow flushes that don't glFlush

Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (123417 => 123418)


--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp	2012-07-24 02:19:13 UTC (rev 123418)
@@ -92,7 +92,7 @@
 }
 
 
-void DocumentMarkerController::addTextMatchMarker(Range* range, bool activeMatch)
+void DocumentMarkerController::addTextMatchMarker(const Range* range, bool activeMatch)
 {
     // Use a TextIterator to visit the potentially multiple nodes the range covers.
     for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {

Modified: trunk/Source/WebCore/dom/DocumentMarkerController.h (123417 => 123418)


--- trunk/Source/WebCore/dom/DocumentMarkerController.h	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.h	2012-07-24 02:19:13 UTC (rev 123418)
@@ -50,7 +50,7 @@
     void addMarker(Range*, DocumentMarker::MarkerType, const String& description);
     void addMarkerToNode(Node*, unsigned startOffset, unsigned length, DocumentMarker::MarkerType);
     void addMarkerToNode(Node*, unsigned startOffset, unsigned length, DocumentMarker::MarkerType, PassRefPtr<DocumentMarkerDetails>);
-    void addTextMatchMarker(Range*, bool activeMatch);
+    void addTextMatchMarker(const Range*, bool activeMatch);
 
     void copyMarkers(Node* srcNode, unsigned startOffset, int length, Node* dstNode, int delta);
     bool hasMarkers(Range*, DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());

Modified: trunk/Source/WebCore/dom/Range.cpp (123417 => 123418)


--- trunk/Source/WebCore/dom/Range.cpp	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/dom/Range.cpp	2012-07-24 02:19:13 UTC (rev 123418)
@@ -1582,7 +1582,7 @@
     return m_end.container()->traverseNextSibling();
 }
 
-IntRect Range::boundingBox()
+IntRect Range::boundingBox() const
 {
     IntRect result;
     Vector<IntRect> rects;
@@ -1593,7 +1593,7 @@
     return result;
 }
 
-void Range::textRects(Vector<IntRect>& rects, bool useSelectionHeight, RangeInFixedPosition* inFixed)
+void Range::textRects(Vector<IntRect>& rects, bool useSelectionHeight, RangeInFixedPosition* inFixed) const
 {
     Node* startContainer = m_start.container();
     Node* endContainer = m_end.container();

Modified: trunk/Source/WebCore/dom/Range.h (123417 => 123418)


--- trunk/Source/WebCore/dom/Range.h	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/dom/Range.h	2012-07-24 02:19:13 UTC (rev 123418)
@@ -112,7 +112,7 @@
 
     ShadowRoot* shadowRoot() const;
 
-    IntRect boundingBox();
+    IntRect boundingBox() const;
     
     enum RangeInFixedPosition {
         NotFixedPosition,
@@ -121,7 +121,7 @@
     };
     
     // Not transform-friendly
-    void textRects(Vector<IntRect>&, bool useSelectionHeight = false, RangeInFixedPosition* = 0);
+    void textRects(Vector<IntRect>&, bool useSelectionHeight = false, RangeInFixedPosition* = 0) const;
     // Transform-friendly
     void textQuads(Vector<FloatQuad>&, bool useSelectionHeight = false, RangeInFixedPosition* = 0) const;
     void getBorderAndTextQuads(Vector<FloatQuad>&) const;

Modified: trunk/Source/WebCore/platform/ScrollbarTheme.h (123417 => 123418)


--- trunk/Source/WebCore/platform/ScrollbarTheme.h	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/platform/ScrollbarTheme.h	2012-07-24 02:19:13 UTC (rev 123418)
@@ -86,6 +86,7 @@
     virtual void paintScrollCorner(ScrollView*, GraphicsContext* context, const IntRect& cornerRect) { defaultPaintScrollCorner(context, cornerRect); }
     static void defaultPaintScrollCorner(GraphicsContext* context, const IntRect& cornerRect) { context->fillRect(cornerRect, Color::white, ColorSpaceDeviceRGB); }
 
+    virtual void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) { }
     virtual void paintOverhangAreas(ScrollView*, GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) { }
 
 #if USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)

Modified: trunk/Source/WebCore/platform/ScrollbarThemeComposite.h (123417 => 123418)


--- trunk/Source/WebCore/platform/ScrollbarThemeComposite.h	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/platform/ScrollbarThemeComposite.h	2012-07-24 02:19:13 UTC (rev 123418)
@@ -60,7 +60,6 @@
     virtual void paintTrackPiece(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart) { }
     virtual void paintButton(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart) { }
     virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) { }
-    virtual void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) { }
 
     virtual IntRect constrainTrackRectToTrackPieces(ScrollbarThemeClient*, const IntRect& rect) { return rect; }
 };

Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp (123417 => 123418)


--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp	2012-07-24 02:19:13 UTC (rev 123418)
@@ -113,15 +113,9 @@
     if (!tickmarks.size())
         return;
 
-    // Get the image for the tickmarks.
-    DEFINE_STATIC_LOCAL(RefPtr<Image>, dash, (Image::loadPlatformResource("tickmarkDash")));
-    if (dash->isNull()) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
+    GraphicsContextStateSaver stateSaver(*context);
+    context->setShouldAntialias(false);
 
-    context->save();
-
     for (Vector<IntRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
         // Calculate how far down (in %) the tick-mark should appear.
         const float percent = static_cast<float>(i->y()) / scrollbar->totalSize();
@@ -129,11 +123,14 @@
         // Calculate how far down (in pixels) the tick-mark should appear.
         const int yPos = rect.y() + (rect.height() * percent);
 
-        IntPoint tick(scrollbar->x(), yPos);
-        context->drawImage(dash.get(), ColorSpaceDeviceRGB, tick);
-    }
+        context->setFillColor(Color(0xCC, 0xAA, 0x00, 0xFF), ColorSpaceDeviceRGB);
+        FloatRect tickRect(rect.x(), yPos, rect.width(), 3);
+        context->fillRect(tickRect);
 
-    context->restore();
+        context->setFillColor(Color(0xFF, 0xDD, 0x00, 0xFF), ColorSpaceDeviceRGB);
+        FloatRect tickStroke(rect.x(), yPos + 1, rect.width(), 1);
+        context->fillRect(tickStroke);
+    }
 }
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h (123417 => 123418)


--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h	2012-07-24 02:19:13 UTC (rev 123418)
@@ -39,6 +39,7 @@
     virtual bool paint(ScrollbarThemeClient*, GraphicsContext*, const IntRect& damageRect);
 
     virtual void paintOverhangAreas(ScrollView*, GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect);
+    virtual void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) OVERRIDE;
     
 private:
     void paintGivenTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, const Vector<IntRect>&);

Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm (123417 => 123418)


--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm	2012-07-24 02:19:13 UTC (rev 123418)
@@ -227,7 +227,7 @@
     }
     // The ends are rounded and the thumb doesn't go there.
     tickmarkTrackRect.inflateY(-tickmarkTrackRect.width());
-    // Inset by 2 on the left and 3 on the right.
+    // Inset a bit.
     tickmarkTrackRect.setX(tickmarkTrackRect.x() + 2);
     tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 5);
     paintGivenTickmarks(drawingContext, scrollbar, tickmarkTrackRect, tickmarks);
@@ -409,5 +409,25 @@
     }
 }
 
+void ScrollbarThemeChromiumMac::paintTickmarks(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
+{
+    // Note: This is only used for css-styled scrollbars on mac.
+    if (scrollbar->orientation() != VerticalScrollbar)
+        return;
 
+    if (rect.height() <= 0 || rect.width() <= 0)
+        return;
+
+    Vector<IntRect> tickmarks;
+    scrollbar->getTickmarks(tickmarks);
+    if (!tickmarks.size())
+        return;
+
+    // Inset a bit.
+    IntRect tickmarkTrackRect = rect;
+    tickmarkTrackRect.setX(tickmarkTrackRect.x() + 1);
+    tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 2);
+    paintGivenTickmarks(context, scrollbar, tickmarkTrackRect, tickmarks);
 }
+
+}

Modified: trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp (123417 => 123418)


--- trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp	2012-07-24 02:19:13 UTC (rev 123418)
@@ -138,4 +138,9 @@
     toRenderScrollbar(scrollbar)->paintPart(context, ThumbPart, rect);
 }
 
+void RenderScrollbarTheme::paintTickmarks(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
+{
+    ScrollbarTheme::theme()->paintTickmarks(context, scrollbar, rect);
 }
+
+}

Modified: trunk/Source/WebCore/rendering/RenderScrollbarTheme.h (123417 => 123418)


--- trunk/Source/WebCore/rendering/RenderScrollbarTheme.h	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/rendering/RenderScrollbarTheme.h	2012-07-24 02:19:13 UTC (rev 123418)
@@ -73,6 +73,7 @@
     virtual void paintTrackPiece(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart);
     virtual void paintButton(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart);
     virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRect&);
+    virtual void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) OVERRIDE;
 
     virtual IntRect constrainTrackRectToTrackPieces(ScrollbarThemeClient*, const IntRect&);
 };

Modified: trunk/Source/WebCore/testing/Internals.cpp (123417 => 123418)


--- trunk/Source/WebCore/testing/Internals.cpp	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/testing/Internals.cpp	2012-07-24 02:19:13 UTC (rev 123418)
@@ -624,6 +624,12 @@
     return marker->description();
 }
 
+void Internals::addTextMatchMarker(const Range* range, bool isActive)
+{
+    range->ownerDocument()->updateLayoutIgnorePendingStylesheets();
+    range->ownerDocument()->markers()->addTextMatchMarker(range, isActive);
+}
+
 void Internals::setScrollViewPosition(Document* document, long x, long y, ExceptionCode& ec)
 {
     if (!document || !document->view()) {

Modified: trunk/Source/WebCore/testing/Internals.h (123417 => 123418)


--- trunk/Source/WebCore/testing/Internals.h	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/testing/Internals.h	2012-07-24 02:19:13 UTC (rev 123418)
@@ -117,6 +117,7 @@
     unsigned markerCountForNode(Node*, const String&, ExceptionCode&);
     PassRefPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
     String markerDescriptionForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
+    void addTextMatchMarker(const Range*, bool isActive);
 
     void setScrollViewPosition(Document*, long x, long y, ExceptionCode&);
     void setPagination(Document* document, const String& mode, int gap, ExceptionCode& ec) { setPagination(document, mode, gap, 0, ec); }

Modified: trunk/Source/WebCore/testing/Internals.idl (123417 => 123418)


--- trunk/Source/WebCore/testing/Internals.idl	2012-07-24 02:13:19 UTC (rev 123417)
+++ trunk/Source/WebCore/testing/Internals.idl	2012-07-24 02:19:13 UTC (rev 123418)
@@ -86,6 +86,7 @@
         unsigned long markerCountForNode(in Node node, in DOMString markerType) raises(DOMException);
         Range markerRangeForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException);
         DOMString markerDescriptionForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException);
+        void addTextMatchMarker(in Range range, in boolean isActive);
 
         void setScrollViewPosition(in Document document, in long x, in long y) raises(DOMException);
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to