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

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

Issue 14614007: Remove frame flattening from rendering code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: better. Created 7 years, 7 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 | « Source/WebKit/chromium/src/WebSettingsImpl.cpp ('k') | Source/core/page/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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 LayoutUnit marginWidth() const { return m_margins.width(); } // -1 means def ault 84 LayoutUnit marginWidth() const { return m_margins.width(); } // -1 means def ault
85 LayoutUnit marginHeight() const { return m_margins.height(); } // -1 means d efault 85 LayoutUnit marginHeight() const { return m_margins.height(); } // -1 means d efault
86 void setMarginWidth(LayoutUnit); 86 void setMarginWidth(LayoutUnit);
87 void setMarginHeight(LayoutUnit); 87 void setMarginHeight(LayoutUnit);
88 88
89 virtual void setCanHaveScrollbars(bool); 89 virtual void setCanHaveScrollbars(bool);
90 void updateCanHaveScrollbars(); 90 void updateCanHaveScrollbars();
91 91
92 virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation); 92 virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
93 93
94 virtual bool avoidScrollbarCreation() const;
95
96 virtual void setContentsSize(const IntSize&); 94 virtual void setContentsSize(const IntSize&);
97 95
98 void layout(bool allowSubtree = true); 96 void layout(bool allowSubtree = true);
99 bool didFirstLayout() const; 97 bool didFirstLayout() const;
100 void layoutTimerFired(Timer<FrameView>*); 98 void layoutTimerFired(Timer<FrameView>*);
101 void scheduleRelayout(); 99 void scheduleRelayout();
102 void scheduleRelayoutOfSubtree(RenderObject*); 100 void scheduleRelayoutOfSubtree(RenderObject*);
103 void unscheduleRelayout(); 101 void unscheduleRelayout();
104 bool layoutPending() const; 102 bool layoutPending() const;
105 bool isInLayout() const { return m_inLayout; } 103 bool isInLayout() const { return m_inLayout; }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 bool hasEverPainted() const { return m_lastPaintTime; } 229 bool hasEverPainted() const { return m_lastPaintTime; }
232 void setLastPaintTime(double lastPaintTime) { m_lastPaintTime = lastPaintTim e; } 230 void setLastPaintTime(double lastPaintTime) { m_lastPaintTime = lastPaintTim e; }
233 void setNodeToDraw(Node*); 231 void setNodeToDraw(Node*);
234 232
235 virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalO verhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect); 233 virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalO verhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect);
236 virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect); 234 virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
237 virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&) OV ERRIDE; 235 virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&) OV ERRIDE;
238 236
239 Color documentBackgroundColor() const; 237 Color documentBackgroundColor() const;
240 238
241 bool isInChildFrameWithFrameFlattening() const;
242
243 static double currentPaintTimeStamp() { return sCurrentPaintTimeStamp; } // returns 0 if not painting 239 static double currentPaintTimeStamp() { return sCurrentPaintTimeStamp; } // returns 0 if not painting
244 240
245 void updateLayoutAndStyleIfNeededRecursive(); 241 void updateLayoutAndStyleIfNeededRecursive();
246 242
247 void incrementVisuallyNonEmptyCharacterCount(unsigned); 243 void incrementVisuallyNonEmptyCharacterCount(unsigned);
248 void incrementVisuallyNonEmptyPixelCount(const IntSize&); 244 void incrementVisuallyNonEmptyPixelCount(const IntSize&);
249 void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; } 245 void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; }
250 bool isVisuallyNonEmpty() const { return m_isVisuallyNonEmpty; } 246 bool isVisuallyNonEmpty() const { return m_isVisuallyNonEmpty; }
251 void enableAutoSizeMode(bool enable, const IntSize& minSize, const IntSize& maxSize); 247 void enableAutoSizeMode(bool enable, const IntSize& minSize, const IntSize& maxSize);
252 248
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 bool updateWidget(RenderObject*); 421 bool updateWidget(RenderObject*);
426 void scrollToAnchor(); 422 void scrollToAnchor();
427 void scrollPositionChanged(); 423 void scrollPositionChanged();
428 424
429 bool hasCustomScrollbars() const; 425 bool hasCustomScrollbars() const;
430 426
431 virtual void updateScrollCorner(); 427 virtual void updateScrollCorner();
432 428
433 FrameView* parentFrameView() const; 429 FrameView* parentFrameView() const;
434 430
435 bool doLayoutWithFrameFlattening(bool allowSubtree);
436
437 virtual AXObjectCache* axObjectCache() const; 431 virtual AXObjectCache* axObjectCache() const;
438 void removeFromAXObjectCache(); 432 void removeFromAXObjectCache();
439 433
440 static double sCurrentPaintTimeStamp; // used for detecting decoded resource thrash in the cache 434 static double sCurrentPaintTimeStamp; // used for detecting decoded resource thrash in the cache
441 435
442 LayoutSize m_size; 436 LayoutSize m_size;
443 LayoutSize m_margins; 437 LayoutSize m_margins;
444 438
445 typedef HashSet<RenderObject*> RenderObjectSet; 439 typedef HashSet<RenderObject*> RenderObjectSet;
446 OwnPtr<RenderObjectSet> m_widgetUpdateSet; 440 OwnPtr<RenderObjectSet> m_widgetUpdateSet;
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 ASSERT(!widget || widget->isFrameView()); 589 ASSERT(!widget || widget->isFrameView());
596 return static_cast<const FrameView*>(widget); 590 return static_cast<const FrameView*>(widget);
597 } 591 }
598 592
599 // This will catch anyone doing an unnecessary cast. 593 // This will catch anyone doing an unnecessary cast.
600 void toFrameView(const FrameView*); 594 void toFrameView(const FrameView*);
601 595
602 } // namespace WebCore 596 } // namespace WebCore
603 597
604 #endif // FrameView_h 598 #endif // FrameView_h
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebSettingsImpl.cpp ('k') | Source/core/page/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698