| Index: Source/core/frame/FrameView.h
|
| diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
|
| index 72735256e15185e197fcf7c3c533a2e5b6d39b22..4ec797a20a8364ede2081bb9bd675e72e8fff453 100644
|
| --- a/Source/core/frame/FrameView.h
|
| +++ b/Source/core/frame/FrameView.h
|
| @@ -111,7 +111,7 @@ public:
|
| void setLayoutSizeFixedToFrameSize(bool isFixed) { m_layoutSizeFixedToFrameSize = isFixed; }
|
| bool layoutSizeFixedToFrameSize() { return m_layoutSizeFixedToFrameSize; }
|
|
|
| - bool needsFullRepaint() const { return m_doFullRepaint; }
|
| + bool needsFullPaintInvalidation() const { return m_doFullPaintInvalidation; }
|
|
|
| void updateAcceleratedCompositingSettings();
|
|
|
| @@ -263,10 +263,10 @@ public:
|
|
|
| RenderBox* embeddedContentBox() const;
|
|
|
| - void setTracksRepaints(bool);
|
| - bool isTrackingRepaints() const { return m_isTrackingRepaints; }
|
| - void resetTrackedRepaints();
|
| - String trackedRepaintRectsAsText() const;
|
| + void setTracksPaintInvalidations(bool);
|
| + bool isTrackingPaintInvalidations() const { return m_isTrackingPaintInvalidations; }
|
| + void resetTrackedPaintInvalidations();
|
| + String trackedPaintInvalidationRectsAsText() const;
|
|
|
| typedef HashSet<ScrollableArea*> ScrollableAreaSet;
|
| void addScrollableArea(ScrollableArea*);
|
| @@ -368,7 +368,7 @@ private:
|
|
|
| DocumentLifecycle& lifecycle() const;
|
|
|
| - virtual void repaintContentRectangle(const IntRect&) OVERRIDE;
|
| + virtual void invalidatedContentRectangleForPaint(const IntRect&) OVERRIDE;
|
| virtual void contentsResized() OVERRIDE;
|
| virtual void scrollbarExistenceDidChange() OVERRIDE;
|
|
|
| @@ -394,7 +394,7 @@ private:
|
| void didScrollTimerFired(Timer<FrameView>*);
|
|
|
| void updateLayersAndCompositingAfterScrollIfNeeded();
|
| - void updateFixedElementRepaintRectsAfterScroll();
|
| + void updateFixedElementPaintInvalidationRectsAfterScroll();
|
|
|
| bool hasCustomScrollbars() const;
|
| bool shouldUseCustomScrollbars(Element*& customScrollbarElement, LocalFrame*& customScrollbarFrame);
|
| @@ -408,7 +408,7 @@ private:
|
|
|
| void setLayoutSizeInternal(const IntSize&);
|
|
|
| - bool repaintAllowed() const
|
| + bool paintInvalidationAllowed() const
|
| {
|
| if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
|
| return true;
|
| @@ -429,7 +429,7 @@ private:
|
|
|
| RefPtr<LocalFrame> m_frame;
|
|
|
| - bool m_doFullRepaint;
|
| + bool m_doFullPaintInvalidation;
|
|
|
| bool m_canHaveScrollbars;
|
| bool m_cannotBlitToWindow;
|
| @@ -470,8 +470,8 @@ private:
|
|
|
| double m_lastPaintTime;
|
|
|
| - bool m_isTrackingRepaints; // Used for testing.
|
| - Vector<IntRect> m_trackedRepaintRects;
|
| + bool m_isTrackingPaintInvalidations; // Used for testing.
|
| + Vector<IntRect> m_trackedPaintInvalidationRects;
|
|
|
| RefPtr<Node> m_nodeToDraw;
|
| PaintBehavior m_paintBehavior;
|
|
|