Source/WebCore/page/FrameView.h - Issue 9564040: Merge 109406

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

Issue 9564040: Merge 109406 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 years, 9 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:

« no previous file with comments | « no previous file | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »

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 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 void layout(bool allowSubtree = true);	94 void layout(bool allowSubtree = true);

95 bool didFirstLayout() const;	95 bool didFirstLayout() const;

96 void layoutTimerFired(Timer<FrameView>*);	96 void layoutTimerFired(Timer<FrameView>*);

97 void scheduleRelayout();	97 void scheduleRelayout();

98 void scheduleRelayoutOfSubtree(RenderObject*);	98 void scheduleRelayoutOfSubtree(RenderObject*);

99 void unscheduleRelayout();	99 void unscheduleRelayout();

100 bool layoutPending() const;	100 bool layoutPending() const;

101 bool isInLayout() const { return m_inLayout; }	101 bool isInLayout() const { return m_inLayout; }

102	102

103 RenderObject* layoutRoot(bool onlyDuringLayout = false) const;	103 RenderObject* layoutRoot(bool onlyDuringLayout = false) const;

	104 void clearLayoutRoot() { m_layoutRoot = 0; }

104 int layoutCount() const { return m_layoutCount; }	105 int layoutCount() const { return m_layoutCount; }

105	106

106 bool needsLayout() const;	107 bool needsLayout() const;

107 void setNeedsLayout();	108 void setNeedsLayout();

108	109

109 bool needsFullRepaint() const { return m_doFullRepaint; }	110 bool needsFullRepaint() const { return m_doFullRepaint; }

110	111

111 #if ENABLE(REQUEST_ANIMATION_FRAME)	112 #if ENABLE(REQUEST_ANIMATION_FRAME)

112 void serviceScriptedAnimations(DOMTimeStamp);	113 void serviceScriptedAnimations(DOMTimeStamp);

113 #endif	114 #endif

(...skipping 397 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
511 m_visuallyNonEmptyPixelCount += size.width() * size.height();	512 m_visuallyNonEmptyPixelCount += size.width() * size.height();

512 // Use a threshold value to prevent very small amounts of visible content fr om triggering didFirstVisuallyNonEmptyLayout	513 // Use a threshold value to prevent very small amounts of visible content fr om triggering didFirstVisuallyNonEmptyLayout

513 static const unsigned visualPixelThreshold = 32 * 32;	514 static const unsigned visualPixelThreshold = 32 * 32;

514 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)	515 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)

515 setIsVisuallyNonEmpty();	516 setIsVisuallyNonEmpty();

516 }	517 }

517	518

518 } // namespace WebCore	519 } // namespace WebCore

519	520

520 #endif // FrameView_h	521 #endif // FrameView_h

OLD	NEW