| Index: third_party/WebKit/Source/core/layout/LayoutObject.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| index ac9462f73910d0dbe23ccc828005c2807dda3866..0324292c1553217a1134d7c005385435175a98f7 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| @@ -860,8 +860,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
|
| const ComputedStyle* parentStyle = nullptr) const;
|
| PassRefPtr<ComputedStyle> getUncachedPseudoStyle(
|
| const PseudoStyleRequest&,
|
| - const ComputedStyle* parentStyle = nullptr,
|
| - const ComputedStyle* ownStyle = nullptr) const;
|
| + const ComputedStyle* parentStyle = nullptr) const;
|
|
|
| LayoutView* view() const { return document().layoutView(); }
|
| FrameView* frameView() const { return document().view(); }
|
| @@ -1344,10 +1343,6 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
|
| return style()->visitedDependentColor(colorProperty);
|
| }
|
|
|
| - // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style
|
| - // based off of a given new style, without accessing the cache.
|
| - PassRefPtr<ComputedStyle> uncachedFirstLineStyle(ComputedStyle*) const;
|
| -
|
| virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
|
|
|
| // Return the LayoutBoxModelObject in the container chain which is responsible
|
| @@ -2072,6 +2067,10 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
|
| }
|
|
|
| private:
|
| + // Used only by applyFirstLineChanges to get a first line style based off of a
|
| + // given new style, without accessing the cache.
|
| + PassRefPtr<ComputedStyle> uncachedFirstLineStyle() const;
|
| +
|
| // Adjusts a visual rect in the space of |m_visualRect| to be in the
|
| // space of the |paintInvalidationContainer|, if needed. They can be different
|
| // only if |paintInvalidationContainer| is a composited scroller.
|
|
|