OLD | NEW |
---|---|
1 /* | 1 /* |
2 Copyright (C) 1997 Martin Jones (mjones@kde.org) | 2 Copyright (C) 1997 Martin Jones (mjones@kde.org) |
3 (C) 1998 Waldo Bastian (bastian@kde.org) | 3 (C) 1998 Waldo Bastian (bastian@kde.org) |
4 (C) 1998, 1999 Torben Weis (weis@kde.org) | 4 (C) 1998, 1999 Torben Weis (weis@kde.org) |
5 (C) 1999 Lars Knoll (knoll@kde.org) | 5 (C) 1999 Lars Knoll (knoll@kde.org) |
6 (C) 1999 Antti Koivisto (koivisto@kde.org) | 6 (C) 1999 Antti Koivisto (koivisto@kde.org) |
7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. | 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. |
8 | 8 |
9 This library is free software; you can redistribute it and/or | 9 This library is free software; you can redistribute it and/or |
10 modify it under the terms of the GNU Library General Public | 10 modify it under the terms of the GNU Library General Public |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
197 bool safeToPropagateScrollToParent() const { return m_safeToPropagateScrollT oParent; } | 197 bool safeToPropagateScrollToParent() const { return m_safeToPropagateScrollT oParent; } |
198 void setSafeToPropagateScrollToParent(bool isSafe) { m_safeToPropagateScroll ToParent = isSafe; } | 198 void setSafeToPropagateScrollToParent(bool isSafe) { m_safeToPropagateScroll ToParent = isSafe; } |
199 | 199 |
200 void addPart(RenderPart*); | 200 void addPart(RenderPart*); |
201 void removePart(RenderPart*); | 201 void removePart(RenderPart*); |
202 | 202 |
203 void updateWidgetPositions(); | 203 void updateWidgetPositions(); |
204 | 204 |
205 void addPartToUpdate(RenderEmbeddedObject&); | 205 void addPartToUpdate(RenderEmbeddedObject&); |
206 | 206 |
207 void paintContents(GraphicsContext*, const IntRect& damageRect); | |
208 void setPaintBehavior(PaintBehavior); | 207 void setPaintBehavior(PaintBehavior); |
209 PaintBehavior paintBehavior() const; | 208 PaintBehavior paintBehavior() const; |
209 void setIsPainting(bool val) { m_isPainting = val; } | |
210 bool isPainting() const; | 210 bool isPainting() const; |
211 void setLastPaintTime(double val) { m_lastPaintTime = val; } | |
211 bool hasEverPainted() const { return m_lastPaintTime; } | 212 bool hasEverPainted() const { return m_lastPaintTime; } |
212 void setNodeToDraw(Node*); | 213 void setNodeToDraw(Node*); |
213 | 214 Node* nodeToDraw() { return m_nodeToDraw.get(); } |
214 void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangA rea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect); | |
215 void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect); | |
216 void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&); | |
217 | 215 |
218 Color documentBackgroundColor() const; | 216 Color documentBackgroundColor() const; |
219 | 217 |
220 static double currentFrameTimeStamp() { return s_currentFrameTimeStamp; } | 218 static double currentFrameTimeStamp() { return s_currentFrameTimeStamp; } |
219 void setCurrentFrameTimeStamp(double val) { s_currentFrameTimeStamp = val; } | |
221 | 220 |
222 void updateLayoutAndStyleForPainting(); | 221 void updateLayoutAndStyleForPainting(); |
223 void updateLayoutAndStyleIfNeededRecursive(); | 222 void updateLayoutAndStyleIfNeededRecursive(); |
224 | 223 |
225 void invalidateTreeIfNeededRecursive(); | 224 void invalidateTreeIfNeededRecursive(); |
226 | 225 |
227 void incrementVisuallyNonEmptyCharacterCount(unsigned); | 226 void incrementVisuallyNonEmptyCharacterCount(unsigned); |
228 void incrementVisuallyNonEmptyPixelCount(const IntSize&); | 227 void incrementVisuallyNonEmptyPixelCount(const IntSize&); |
229 void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; } | 228 void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; } |
230 void enableAutoSizeMode(const IntSize& minSize, const IntSize& maxSize); | 229 void enableAutoSizeMode(const IntSize& minSize, const IntSize& maxSize); |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
355 | 354 |
356 // Functions for child manipulation and inspection. | 355 // Functions for child manipulation and inspection. |
357 const ChildrenWidgetSet* children() const { return &m_children; } | 356 const ChildrenWidgetSet* children() const { return &m_children; } |
358 void addChild(PassRefPtrWillBeRawPtr<Widget>); | 357 void addChild(PassRefPtrWillBeRawPtr<Widget>); |
359 void removeChildInternal(Widget*); | 358 void removeChildInternal(Widget*); |
360 | 359 |
361 // If the scroll view does not use a native widget, then it will have cross- platform Scrollbars. These functions | 360 // If the scroll view does not use a native widget, then it will have cross- platform Scrollbars. These functions |
362 // can be used to obtain those scrollbars. | 361 // can be used to obtain those scrollbars. |
363 virtual Scrollbar* horizontalScrollbar() const override { return m_horizonta lScrollbar.get(); } | 362 virtual Scrollbar* horizontalScrollbar() const override { return m_horizonta lScrollbar.get(); } |
364 virtual Scrollbar* verticalScrollbar() const override { return m_verticalScr ollbar.get(); } | 363 virtual Scrollbar* verticalScrollbar() const override { return m_verticalScr ollbar.get(); } |
364 RenderScrollbarPart* scrollCorner() { return m_scrollCorner; } | |
365 | 365 |
366 void positionScrollbarLayers(); | 366 void positionScrollbarLayers(); |
367 | 367 |
368 // Functions for setting and retrieving the scrolling mode in each axis (hor izontal/vertical). The mode has values of | 368 // Functions for setting and retrieving the scrolling mode in each axis (hor izontal/vertical). The mode has values of |
369 // AlwaysOff, AlwaysOn, and Auto. AlwaysOff means never show a scrollbar, Al waysOn means always show a scrollbar. | 369 // AlwaysOff, AlwaysOn, and Auto. AlwaysOff means never show a scrollbar, Al waysOn means always show a scrollbar. |
370 // Auto means show a scrollbar only when one is needed. | 370 // Auto means show a scrollbar only when one is needed. |
371 // Note that for platforms with native widgets, these modes are considered a dvisory. In other words the underlying native | 371 // Note that for platforms with native widgets, these modes are considered a dvisory. In other words the underlying native |
372 // widget may choose not to honor the requested modes. | 372 // widget may choose not to honor the requested modes. |
373 void setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode verticalM ode, bool horizontalLock = false, bool verticalLock = false); | 373 void setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode verticalM ode, bool horizontalLock = false, bool verticalLock = false); |
374 void setHorizontalScrollbarMode(ScrollbarMode mode, bool lock = false) { set ScrollbarModes(mode, verticalScrollbarMode(), lock, verticalScrollbarLock()); } | 374 void setHorizontalScrollbarMode(ScrollbarMode mode, bool lock = false) { set ScrollbarModes(mode, verticalScrollbarMode(), lock, verticalScrollbarLock()); } |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
448 | 448 |
449 bool scroll(ScrollDirection, ScrollGranularity); | 449 bool scroll(ScrollDirection, ScrollGranularity); |
450 | 450 |
451 // Scroll the actual contents of the view (either blitting or invalidating a s needed). | 451 // Scroll the actual contents of the view (either blitting or invalidating a s needed). |
452 void scrollContents(const IntSize& scrollDelta); | 452 void scrollContents(const IntSize& scrollDelta); |
453 | 453 |
454 // This gives us a means of blocking painting on our scrollbars until the fi rst layout has occurred. | 454 // This gives us a means of blocking painting on our scrollbars until the fi rst layout has occurred. |
455 void setScrollbarsSuppressed(bool suppressed, bool repaintOnUnsuppress = fal se); | 455 void setScrollbarsSuppressed(bool suppressed, bool repaintOnUnsuppress = fal se); |
456 bool scrollbarsSuppressed() const { return m_scrollbarsSuppressed; } | 456 bool scrollbarsSuppressed() const { return m_scrollbarsSuppressed; } |
457 | 457 |
458 bool drawPanScrollIcon() { return m_shouldDrawPanScrollIcon; } | |
459 | |
458 IntPoint rootViewToContents(const IntPoint&) const; | 460 IntPoint rootViewToContents(const IntPoint&) const; |
459 IntPoint contentsToRootView(const IntPoint&) const; | 461 IntPoint contentsToRootView(const IntPoint&) const; |
460 IntRect rootViewToContents(const IntRect&) const; | 462 IntRect rootViewToContents(const IntRect&) const; |
461 IntRect contentsToRootView(const IntRect&) const; | 463 IntRect contentsToRootView(const IntRect&) const; |
462 | 464 |
463 // Event coordinates are assumed to be in the coordinate space of a window t hat contains | 465 // Event coordinates are assumed to be in the coordinate space of a window t hat contains |
464 // the entire widget hierarchy. It is up to the platform to decide what the precise definition | 466 // the entire widget hierarchy. It is up to the platform to decide what the precise definition |
465 // of containing window is. (For example on Mac it is the containing NSWindo w.) | 467 // of containing window is. (For example on Mac it is the containing NSWindo w.) |
466 IntPoint windowToContents(const IntPoint&) const; | 468 IntPoint windowToContents(const IntPoint&) const; |
467 FloatPoint windowToContents(const FloatPoint&) const; | 469 FloatPoint windowToContents(const FloatPoint&) const; |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
502 | 504 |
503 virtual IntPoint convertSelfToChild(const Widget* child, const IntPoint& poi nt) const override | 505 virtual IntPoint convertSelfToChild(const Widget* child, const IntPoint& poi nt) const override |
504 { | 506 { |
505 IntPoint newPoint = point; | 507 IntPoint newPoint = point; |
506 if (!isFrameViewScrollbar(child)) | 508 if (!isFrameViewScrollbar(child)) |
507 newPoint = point + scrollOffset(); | 509 newPoint = point + scrollOffset(); |
508 newPoint.moveBy(-child->location()); | 510 newPoint.moveBy(-child->location()); |
509 return newPoint; | 511 return newPoint; |
510 } | 512 } |
511 | 513 |
512 // Widget override. Handles painting of the contents of the view as well as the scrollbars. | 514 // Widget override. Handles painting of the contents of the view as well as the scrollbars. |
leviw_travelin_and_unemployed
2014/10/14 22:06:11
Widget is dead, update to RenderPart?
chrishtr
2014/10/14 22:11:43
Widget is not dead, it's the intermediate class th
| |
513 virtual void paint(GraphicsContext*, const IntRect&) override; | 515 virtual void paint(GraphicsContext*, const IntRect&) override; |
514 void paintScrollbars(GraphicsContext*, const IntRect&); | 516 void paintContents(GraphicsContext*, const IntRect& damageRect); |
515 | 517 |
516 // Widget overrides to ensure that our children's visibility status is kept up to date when we get shown and hidden. | 518 // Widget overrides to ensure that our children's visibility status is kept up to date when we get shown and hidden. |
517 virtual void show() override; | 519 virtual void show() override; |
518 virtual void hide() override; | 520 virtual void hide() override; |
519 virtual void setParentVisible(bool) override; | 521 virtual void setParentVisible(bool) override; |
520 | 522 |
521 // Pan scrolling. | 523 // Pan scrolling. |
522 static const int noPanScrollRadius = 15; | 524 static const int noPanScrollRadius = 15; |
523 void addPanScrollIcon(const IntPoint&); | 525 void addPanScrollIcon(const IntPoint&); |
524 void removePanScrollIcon(); | 526 void removePanScrollIcon(); |
525 void paintPanScrollIcon(GraphicsContext*); | 527 void paintPanScrollIcon(GraphicsContext*); |
526 | 528 |
527 bool isPointInScrollbarCorner(const IntPoint&); | 529 bool isPointInScrollbarCorner(const IntPoint&); |
528 bool scrollbarCornerPresent() const; | 530 bool scrollbarCornerPresent() const; |
529 virtual IntRect scrollCornerRect() const override; | 531 virtual IntRect scrollCornerRect() const override; |
530 void paintScrollCornerInternal(GraphicsContext*, const IntRect& cornerRect); | |
531 void paintScrollbarInternal(GraphicsContext*, Scrollbar*, const IntRect&); | |
532 | 532 |
533 virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override; | 533 virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override; |
534 virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override; | 534 virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override; |
535 virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, cons t IntPoint&) const override; | 535 virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, cons t IntPoint&) const override; |
536 virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, cons t IntPoint&) const override; | 536 virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, cons t IntPoint&) const override; |
537 | 537 |
538 void calculateAndPaintOverhangAreas(GraphicsContext*, const IntRect& dirtyRe ct); | |
539 void calculateAndPaintOverhangBackground(GraphicsContext*, const IntRect& di rtyRect); | |
540 | |
541 virtual bool isFrameView() const override { return true; } | 538 virtual bool isFrameView() const override { return true; } |
542 | 539 |
543 virtual void trace(Visitor*) override; | 540 virtual void trace(Visitor*) override; |
541 void notifyPageThatContentAreaWillPaint() const; | |
542 FrameView* parentFrameView() const; | |
543 | |
544 void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntR ect& verticalOverhangRect); | |
544 | 545 |
545 protected: | 546 protected: |
546 bool scrollContentsFastPath(const IntSize& scrollDelta); | 547 bool scrollContentsFastPath(const IntSize& scrollDelta); |
547 void scrollContentsSlowPath(const IntRect& updateRect); | 548 void scrollContentsSlowPath(const IntRect& updateRect); |
548 | 549 |
549 bool isVerticalDocument() const; | 550 bool isVerticalDocument() const; |
550 bool isFlippedDocument() const; | 551 bool isFlippedDocument() const; |
551 | 552 |
552 // Prevents creation of scrollbars. Used to prevent drawing two sets of | 553 // Prevents creation of scrollbars. Used to prevent drawing two sets of |
553 // overlay scrollbars in the case of the pinch viewport. | 554 // overlay scrollbars in the case of the pinch viewport. |
554 bool scrollbarsDisabled() const; | 555 bool scrollbarsDisabled() const; |
555 | 556 |
556 // NOTE: This should only be called by the overridden setScrollOffset from S crollableArea. | 557 // NOTE: This should only be called by the overridden setScrollOffset from S crollableArea. |
557 void scrollToInternal(const DoublePoint& newPosition); | 558 void scrollToInternal(const DoublePoint& newPosition); |
558 | 559 |
559 void contentRectangleForPaintInvalidationInternal(const IntRect&); | 560 void contentRectangleForPaintInvalidationInternal(const IntRect&); |
560 | 561 |
561 void paintOverhangAreasInternal(GraphicsContext*, const IntRect& horizontalO verhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect); | |
562 | |
563 // These functions are used to create/destroy scrollbars. | 562 // These functions are used to create/destroy scrollbars. |
564 void setHasHorizontalScrollbar(bool); | 563 void setHasHorizontalScrollbar(bool); |
565 void setHasVerticalScrollbar(bool); | 564 void setHasVerticalScrollbar(bool); |
566 | 565 |
567 void updateScrollCornerInternal(); | 566 void updateScrollCornerInternal(); |
568 virtual void invalidateScrollCornerRect(const IntRect&) override; | 567 virtual void invalidateScrollCornerRect(const IntRect&) override; |
569 | 568 |
570 void scrollContentsIfNeeded(); | 569 void scrollContentsIfNeeded(); |
571 // Scroll the content by via the compositor. | 570 // Scroll the content by via the compositor. |
572 bool scrollContentsFastPathInternal(const IntSize& scrollDelta) { return tru e; } | 571 bool scrollContentsFastPathInternal(const IntSize& scrollDelta) { return tru e; } |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
643 virtual IntPoint convertToContainingView(const IntPoint&) const override; | 642 virtual IntPoint convertToContainingView(const IntPoint&) const override; |
644 virtual IntPoint convertFromContainingView(const IntPoint&) const override; | 643 virtual IntPoint convertFromContainingView(const IntPoint&) const override; |
645 | 644 |
646 void updateWidgetPositionsIfNeeded(); | 645 void updateWidgetPositionsIfNeeded(); |
647 | 646 |
648 bool wasViewportResized(); | 647 bool wasViewportResized(); |
649 void sendResizeEventIfNeeded(); | 648 void sendResizeEventIfNeeded(); |
650 | 649 |
651 void updateScrollableAreaSet(); | 650 void updateScrollableAreaSet(); |
652 | 651 |
653 void notifyPageThatContentAreaWillPaint() const; | |
654 | |
655 void scheduleUpdateWidgetsIfNecessary(); | 652 void scheduleUpdateWidgetsIfNecessary(); |
656 void updateWidgetsTimerFired(Timer<FrameView>*); | 653 void updateWidgetsTimerFired(Timer<FrameView>*); |
657 bool updateWidgets(); | 654 bool updateWidgets(); |
658 | 655 |
659 void scrollToAnchor(); | 656 void scrollToAnchor(); |
660 void scrollPositionChanged(); | 657 void scrollPositionChanged(); |
661 void didScrollTimerFired(Timer<FrameView>*); | 658 void didScrollTimerFired(Timer<FrameView>*); |
662 | 659 |
663 void updateLayersAndCompositingAfterScrollIfNeeded(); | 660 void updateLayersAndCompositingAfterScrollIfNeeded(); |
664 | 661 |
665 static bool computeCompositedSelectionBounds(LocalFrame&, CompositedSelectio nBound& start, CompositedSelectionBound& end); | 662 static bool computeCompositedSelectionBounds(LocalFrame&, CompositedSelectio nBound& start, CompositedSelectionBound& end); |
666 void updateCompositedSelectionBoundsIfNeeded(); | 663 void updateCompositedSelectionBoundsIfNeeded(); |
667 | 664 |
668 bool hasCustomScrollbars() const; | 665 bool hasCustomScrollbars() const; |
669 bool shouldUseCustomScrollbars(Element*& customScrollbarElement, LocalFrame* & customScrollbarFrame); | 666 bool shouldUseCustomScrollbars(Element*& customScrollbarElement, LocalFrame* & customScrollbarFrame); |
670 | 667 |
671 void updateScrollCorner(); | 668 void updateScrollCorner(); |
672 | 669 |
673 FrameView* parentFrameView() const; | |
674 | |
675 AXObjectCache* axObjectCache() const; | 670 AXObjectCache* axObjectCache() const; |
676 void removeFromAXObjectCache(); | 671 void removeFromAXObjectCache(); |
677 | 672 |
678 void setLayoutSizeInternal(const IntSize&); | 673 void setLayoutSizeInternal(const IntSize&); |
679 | 674 |
680 void disposeAutoSizeInfo(); | 675 void disposeAutoSizeInfo(); |
681 | 676 |
682 bool paintInvalidationIsAllowed() const | 677 bool paintInvalidationIsAllowed() const |
683 { | 678 { |
684 return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout(); | 679 return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout(); |
685 } | 680 } |
686 | 681 |
687 bool adjustScrollbarExistence(ComputeScrollbarExistenceOption = FirstPass); | 682 bool adjustScrollbarExistence(ComputeScrollbarExistenceOption = FirstPass); |
688 void adjustScrollbarOpacity(); | 683 void adjustScrollbarOpacity(); |
689 // FIXME(bokan): setScrollOffset, setScrollPosition, scrollTo, scrollToOffse tWithoutAnimation, | 684 // FIXME(bokan): setScrollOffset, setScrollPosition, scrollTo, scrollToOffse tWithoutAnimation, |
690 // notifyScrollPositionChanged...there's too many ways to scroll this class. This needs | 685 // notifyScrollPositionChanged...there's too many ways to scroll this class. This needs |
691 // some cleanup. | 686 // some cleanup. |
692 void setScrollOffsetFromUpdateScrollbars(const DoubleSize&); | 687 void setScrollOffsetFromUpdateScrollbars(const DoubleSize&); |
693 | 688 |
694 IntRect rectToCopyOnScroll() const; | 689 IntRect rectToCopyOnScroll() const; |
695 | 690 |
696 void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntR ect& verticalOverhangRect); | |
697 void updateOverhangAreas(); | 691 void updateOverhangAreas(); |
698 | 692 |
699 bool isFrameViewScrollbar(const Widget* child) const { return horizontalScro llbar() == child || verticalScrollbar() == child; } | 693 bool isFrameViewScrollbar(const Widget* child) const { return horizontalScro llbar() == child || verticalScrollbar() == child; } |
700 | 694 |
701 static double s_currentFrameTimeStamp; // used for detecting decoded resourc e thrash in the cache | 695 static double s_currentFrameTimeStamp; // used for detecting decoded resourc e thrash in the cache |
702 static bool s_inPaintContents; | |
703 | 696 |
704 LayoutSize m_size; | 697 LayoutSize m_size; |
705 | 698 |
706 typedef WillBeHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > Embedde dObjectSet; | 699 typedef WillBeHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > Embedde dObjectSet; |
707 WillBeHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > m_partUpdateSet ; | 700 WillBeHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > m_partUpdateSet ; |
708 | 701 |
709 // FIXME: These are just "children" of the FrameView and should be RefPtrWil lBeMember<Widget> instead. | 702 // FIXME: These are just "children" of the FrameView and should be RefPtrWil lBeMember<Widget> instead. |
710 WillBeHeapHashSet<RefPtrWillBeMember<RenderPart> > m_parts; | 703 WillBeHeapHashSet<RefPtrWillBeMember<RenderPart> > m_parts; |
711 | 704 |
712 // The RefPtr cycle between LocalFrame and FrameView is broken | 705 // The RefPtr cycle between LocalFrame and FrameView is broken |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
813 DoublePoint m_scrollPosition; | 806 DoublePoint m_scrollPosition; |
814 DoublePoint m_cachedScrollPosition; | 807 DoublePoint m_cachedScrollPosition; |
815 IntSize m_contentsSize; | 808 IntSize m_contentsSize; |
816 | 809 |
817 int m_scrollbarsAvoidingResizer; | 810 int m_scrollbarsAvoidingResizer; |
818 bool m_scrollbarsSuppressed; | 811 bool m_scrollbarsSuppressed; |
819 | 812 |
820 bool m_inUpdateScrollbars; | 813 bool m_inUpdateScrollbars; |
821 | 814 |
822 IntPoint m_panScrollIconPoint; | 815 IntPoint m_panScrollIconPoint; |
823 bool m_drawPanScrollIcon; | 816 bool m_shouldDrawPanScrollIcon; |
824 | 817 |
825 bool m_clipsRepaints; | 818 bool m_clipsRepaints; |
826 }; | 819 }; |
827 | 820 |
828 inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count) | 821 inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count) |
829 { | 822 { |
830 if (m_isVisuallyNonEmpty) | 823 if (m_isVisuallyNonEmpty) |
831 return; | 824 return; |
832 m_visuallyNonEmptyCharacterCount += count; | 825 m_visuallyNonEmptyCharacterCount += count; |
833 // Use a threshold value to prevent very small amounts of visible content fr om triggering didFirstVisuallyNonEmptyLayout. | 826 // Use a threshold value to prevent very small amounts of visible content fr om triggering didFirstVisuallyNonEmptyLayout. |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
872 } | 865 } |
873 | 866 |
874 private: | 867 private: |
875 RawPtrWillBeMember<FrameView> m_view; | 868 RawPtrWillBeMember<FrameView> m_view; |
876 bool m_originalValue; | 869 bool m_originalValue; |
877 }; | 870 }; |
878 | 871 |
879 } // namespace blink | 872 } // namespace blink |
880 | 873 |
881 #endif // FrameView_h | 874 #endif // FrameView_h |
OLD | NEW |