Title: [137135] trunk/Source/WebCore
- Revision
- 137135
- Author
- loi...@chromium.org
- Date
- 2012-12-10 04:11:46 -0800 (Mon, 10 Dec 2012)
Log Message
Web Inspector: Unreviewed: move reportMemoryUsage to public section.
* rendering/RenderBlock.h:
(RenderBlock):
* rendering/RenderBox.h:
(RenderBox):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137134 => 137135)
--- trunk/Source/WebCore/ChangeLog 2012-12-10 12:03:17 UTC (rev 137134)
+++ trunk/Source/WebCore/ChangeLog 2012-12-10 12:11:46 UTC (rev 137135)
@@ -1,3 +1,12 @@
+2012-12-09 Ilya Tikhonovsky <loi...@chromium.org>
+
+ Web Inspector: Unreviewed: move reportMemoryUsage to public section.
+
+ * rendering/RenderBlock.h:
+ (RenderBlock):
+ * rendering/RenderBox.h:
+ (RenderBox):
+
2012-12-08 Pavel Feldman <pfeld...@chromium.org>
Web Inspector: adds an option to remove toolbar icons.
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (137134 => 137135)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2012-12-10 12:03:17 UTC (rev 137134)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2012-12-10 12:11:46 UTC (rev 137135)
@@ -431,6 +431,8 @@
ExclusionShapeInsideInfo* exclusionShapeInsideInfo() const;
#endif
+ virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
+
protected:
virtual void willBeDestroyed();
@@ -522,8 +524,6 @@
virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
- virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
-
private:
#if ENABLE(CSS_EXCLUSIONS)
void computeExclusionShapeSize();
Modified: trunk/Source/WebCore/rendering/RenderBox.h (137134 => 137135)
--- trunk/Source/WebCore/rendering/RenderBox.h 2012-12-10 12:03:17 UTC (rev 137134)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2012-12-10 12:11:46 UTC (rev 137135)
@@ -566,6 +566,8 @@
bool hasSameDirectionAs(const RenderBox* object) const { return style()->direction() == object->style()->direction(); }
+ virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
+
protected:
virtual void willBeDestroyed();
@@ -600,8 +602,6 @@
RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild);
- virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
-
private:
bool fixedElementLaysOutRelativeToFrame(Frame*, FrameView*) const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
