Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Side by Side Diff: Source/core/frame/FrameView.h

Issue 1272143003: Remove code duplication in updateLifecycleToCompositingCleanPlusScrolling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Try to manually recreate the patch Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 599
600 // Only for LayoutPart to traverse into sub frames during paint invalidation . 600 // Only for LayoutPart to traverse into sub frames during paint invalidation .
601 void invalidateTreeIfNeeded(PaintInvalidationState&); 601 void invalidateTreeIfNeeded(PaintInvalidationState&);
602 602
603 private: 603 private:
604 explicit FrameView(LocalFrame*); 604 explicit FrameView(LocalFrame*);
605 605
606 void setScrollOffset(const IntPoint&, ScrollType) override; 606 void setScrollOffset(const IntPoint&, ScrollType) override;
607 void setScrollOffset(const DoublePoint&, ScrollType) override; 607 void setScrollOffset(const DoublePoint&, ScrollType) override;
608 608
609 void updateAllLifecyclePhasesInternal(); 609 enum LifeCycleUpdateOption {
610 AllPhases,
611 OnlyUpToCompositingCleanPlusScrolling,
612 };
613
614 void updateLifecyclePhasesInternal(LifeCycleUpdateOption);
610 void invalidateTreeIfNeededRecursive(); 615 void invalidateTreeIfNeededRecursive();
611 void scrollContentsIfNeededRecursive(); 616 void scrollContentsIfNeededRecursive();
612 void updateStyleAndLayoutIfNeededRecursive(); 617 void updateStyleAndLayoutIfNeededRecursive();
613 618
614 void reset(); 619 void reset();
615 void init(); 620 void init();
616 621
617 void clearLayoutSubtreeRootsAndMarkContainingBlocks(); 622 void clearLayoutSubtreeRootsAndMarkContainingBlocks();
618 623
619 // Called when our frame rect changes (or the rect/scroll position of an anc estor changes). 624 // Called when our frame rect changes (or the rect/scroll position of an anc estor changes).
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 static const unsigned visualPixelThreshold = 32 * 32; 862 static const unsigned visualPixelThreshold = 32 * 32;
858 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold) 863 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
859 setIsVisuallyNonEmpty(); 864 setIsVisuallyNonEmpty();
860 } 865 }
861 866
862 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView()); 867 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView());
863 868
864 } // namespace blink 869 } // namespace blink
865 870
866 #endif // FrameView_h 871 #endif // FrameView_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698