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

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: remove added assert 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') | Source/core/frame/FrameView.cpp » ('J')
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 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 600
601 // Only for LayoutPart to traverse into sub frames during paint invalidation . 601 // Only for LayoutPart to traverse into sub frames during paint invalidation .
602 void invalidateTreeIfNeeded(PaintInvalidationState&); 602 void invalidateTreeIfNeeded(PaintInvalidationState&);
603 603
604 private: 604 private:
605 explicit FrameView(LocalFrame*); 605 explicit FrameView(LocalFrame*);
606 606
607 void setScrollOffset(const IntPoint&, ScrollType) override; 607 void setScrollOffset(const IntPoint&, ScrollType) override;
608 void setScrollOffset(const DoublePoint&, ScrollType) override; 608 void setScrollOffset(const DoublePoint&, ScrollType) override;
609 609
610 void updateAllLifecyclePhasesInternal(); 610 enum LifeCycleUpdateOption {
611 AllPhases,
612 OnlyUpToCompositingCleanPlusScrolling,
613 };
614
615 void updateLifecyclePhasesInternal(LifeCycleUpdateOption);
611 void invalidateTreeIfNeededRecursive(); 616 void invalidateTreeIfNeededRecursive();
612 void scrollContentsIfNeededRecursive(); 617 void scrollContentsIfNeededRecursive();
613 void updateStyleAndLayoutIfNeededRecursive(); 618 void updateStyleAndLayoutIfNeededRecursive();
614 void updatePostLifecycleData(); 619 void updatePostLifecycleData();
615 620
616 void reset(); 621 void reset();
617 void init(); 622 void init();
618 623
619 void clearLayoutSubtreeRootsAndMarkContainingBlocks(); 624 void clearLayoutSubtreeRootsAndMarkContainingBlocks();
620 625
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 static const unsigned visualPixelThreshold = 32 * 32; 865 static const unsigned visualPixelThreshold = 32 * 32;
861 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold) 866 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
862 setIsVisuallyNonEmpty(); 867 setIsVisuallyNonEmpty();
863 } 868 }
864 869
865 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView()); 870 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView());
866 871
867 } // namespace blink 872 } // namespace blink
868 873
869 #endif // FrameView_h 874 #endif // FrameView_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | Source/core/frame/FrameView.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698