Commit 652a75d7 authored by Sriram's avatar Sriram Committed by Commit Bot

[RLS] Implement GetTickmarks for RootLayerScrolling

Currently GetTickmarks is not implemented in PLSA so the tickmarks are
not getting painted for RLS flow.
Implemented this function now and updated testExpectations.

BUG=711474

Change-Id: I150dfd413d2ae015e7e9e2dad94d1116df049fb3
Reviewed-on: https://chromium-review.googlesource.com/578831Reviewed-by: default avatarSteve Kobes <skobes@chromium.org>
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Cr-Commit-Position: refs/heads/master@{#490724}
parent 9d7588a3
...@@ -1198,9 +1198,6 @@ crbug.com/504706 [ Linux ] inspector/profiler/heap-snapshot-containment-sorting. ...@@ -1198,9 +1198,6 @@ crbug.com/504706 [ Linux ] inspector/profiler/heap-snapshot-containment-sorting.
# By about a quarter or less of a pixel. # By about a quarter or less of a pixel.
crbug.com/421412 [ Mac ] fast/text/international/bdo-bidi-width.html [ Failure ] crbug.com/421412 [ Mac ] fast/text/international/bdo-bidi-width.html [ Failure ]
crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollbar-tickmarks-styled.html [ Failure ]
crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollbar-tickmarks-styled-after-onload.html [ Failure ]
crbug.com/574283 [ Mac ] fast/scroll-behavior/smooth-scroll/ongoing-smooth-scroll-anchors.html [ Skip ] crbug.com/574283 [ Mac ] fast/scroll-behavior/smooth-scroll/ongoing-smooth-scroll-anchors.html [ Skip ]
crbug.com/574283 [ Mac ] virtual/scroll_customization/fast/scroll-behavior/smooth-scroll/ongoing-smooth-scroll-anchors.html [ Skip ] crbug.com/574283 [ Mac ] virtual/scroll_customization/fast/scroll-behavior/smooth-scroll/ongoing-smooth-scroll-anchors.html [ Skip ]
crbug.com/574283 [ Mac ] virtual/threaded/fast/scroll-behavior/first-scroll-runs-on-compositor.html [ Skip ] crbug.com/574283 [ Mac ] virtual/threaded/fast/scroll-behavior/first-scroll-runs-on-compositor.html [ Skip ]
......
...@@ -2662,7 +2662,9 @@ bool LocalFrameView::IsActive() const { ...@@ -2662,7 +2662,9 @@ bool LocalFrameView::IsActive() const {
} }
void LocalFrameView::InvalidatePaintForTickmarks() { void LocalFrameView::InvalidatePaintForTickmarks() {
if (Scrollbar* scrollbar = VerticalScrollbar()) { ScrollableArea* scrollable_area = LayoutViewportScrollableArea();
DCHECK(scrollable_area);
if (Scrollbar* scrollbar = scrollable_area->VerticalScrollbar()) {
scrollbar->SetNeedsPaintInvalidation( scrollbar->SetNeedsPaintInvalidation(
static_cast<ScrollbarPart>(~kThumbPart)); static_cast<ScrollbarPart>(~kThumbPart));
} }
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include "core/dom/ShadowRoot.h" #include "core/dom/ShadowRoot.h"
#include "core/dom/TaskRunnerHelper.h" #include "core/dom/TaskRunnerHelper.h"
#include "core/editing/FrameSelection.h" #include "core/editing/FrameSelection.h"
#include "core/editing/markers/DocumentMarkerController.h"
#include "core/frame/LocalFrame.h" #include "core/frame/LocalFrame.h"
#include "core/frame/LocalFrameClient.h" #include "core/frame/LocalFrameClient.h"
#include "core/frame/LocalFrameView.h" #include "core/frame/LocalFrameView.h"
...@@ -2059,6 +2060,11 @@ PaintLayerScrollableArea::GetCompositorAnimationTimeline() const { ...@@ -2059,6 +2060,11 @@ PaintLayerScrollableArea::GetCompositorAnimationTimeline() const {
->GetCompositorAnimationTimeline(); ->GetCompositorAnimationTimeline();
} }
void PaintLayerScrollableArea::GetTickmarks(Vector<IntRect>& tickmarks) const {
if (layer_.IsRootLayer())
tickmarks = Box().GetDocument().Markers().LayoutRectsForTextMatchMarkers();
}
PaintLayerScrollableArea* PaintLayerScrollableArea*
PaintLayerScrollableArea::ScrollbarManager::ScrollableArea() { PaintLayerScrollableArea::ScrollbarManager::ScrollableArea() {
return ToPaintLayerScrollableArea(scrollable_area_.Get()); return ToPaintLayerScrollableArea(scrollable_area_.Get());
......
...@@ -294,6 +294,7 @@ class CORE_EXPORT PaintLayerScrollableArea final ...@@ -294,6 +294,7 @@ class CORE_EXPORT PaintLayerScrollableArea final
ScrollBehavior ScrollBehaviorStyle() const override; ScrollBehavior ScrollBehaviorStyle() const override;
CompositorAnimationHost* GetCompositorAnimationHost() const override; CompositorAnimationHost* GetCompositorAnimationHost() const override;
CompositorAnimationTimeline* GetCompositorAnimationTimeline() const override; CompositorAnimationTimeline* GetCompositorAnimationTimeline() const override;
void GetTickmarks(Vector<IntRect>&) const override;
// These are temporary convenience methods. They delegate to Box() methods, // These are temporary convenience methods. They delegate to Box() methods,
// which will be up-to-date when UpdateAfterLayout runs. By contrast, // which will be up-to-date when UpdateAfterLayout runs. By contrast,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment