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

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

Issue 136793014: Remove m_margins member from FrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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
« 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 virtual void invalidateRect(const IntRect&) OVERRIDE; 71 virtual void invalidateRect(const IntRect&) OVERRIDE;
72 virtual void setFrameRect(const IntRect&) OVERRIDE; 72 virtual void setFrameRect(const IntRect&) OVERRIDE;
73 73
74 virtual bool scheduleAnimation() OVERRIDE; 74 virtual bool scheduleAnimation() OVERRIDE;
75 75
76 Frame& frame() const { return *m_frame; } 76 Frame& frame() const { return *m_frame; }
77 77
78 RenderView* renderView() const; 78 RenderView* renderView() const;
79 79
80 LayoutUnit marginWidth() const { return m_margins.width(); } // -1 means def ault
81 LayoutUnit marginHeight() const { return m_margins.height(); } // -1 means d efault
82 void setMarginWidth(LayoutUnit);
83 void setMarginHeight(LayoutUnit);
84
85 virtual void setCanHaveScrollbars(bool) OVERRIDE; 80 virtual void setCanHaveScrollbars(bool) OVERRIDE;
86 void updateCanHaveScrollbars(); 81 void updateCanHaveScrollbars();
87 82
88 virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation) OVERRIDE ; 83 virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation) OVERRIDE ;
89 84
90 virtual void setContentsSize(const IntSize&) OVERRIDE; 85 virtual void setContentsSize(const IntSize&) OVERRIDE;
91 86
92 void layout(bool allowSubtree = true); 87 void layout(bool allowSubtree = true);
93 bool didFirstLayout() const; 88 bool didFirstLayout() const;
94 void layoutTimerFired(Timer<FrameView>*); 89 void layoutTimerFired(Timer<FrameView>*);
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 void removeFromAXObjectCache(); 438 void removeFromAXObjectCache();
444 439
445 bool isMainFrame() const; 440 bool isMainFrame() const;
446 441
447 void setLayoutSizeInternal(const IntSize&); 442 void setLayoutSizeInternal(const IntSize&);
448 443
449 static double s_currentFrameTimeStamp; // used for detecting decoded resourc e thrash in the cache 444 static double s_currentFrameTimeStamp; // used for detecting decoded resourc e thrash in the cache
450 static bool s_inPaintContents; 445 static bool s_inPaintContents;
451 446
452 LayoutSize m_size; 447 LayoutSize m_size;
453 LayoutSize m_margins;
454 448
455 typedef HashSet<RefPtr<RenderEmbeddedObject> > EmbeddedObjectSet; 449 typedef HashSet<RefPtr<RenderEmbeddedObject> > EmbeddedObjectSet;
456 EmbeddedObjectSet m_widgetUpdateSet; 450 EmbeddedObjectSet m_widgetUpdateSet;
457 451
458 // FIXME: These are just "children" of the FrameView and should be RefPtr<Wi dget> instead. 452 // FIXME: These are just "children" of the FrameView and should be RefPtr<Wi dget> instead.
459 HashSet<RefPtr<RenderWidget> > m_widgets; 453 HashSet<RefPtr<RenderWidget> > m_widgets;
460 454
461 RefPtr<Frame> m_frame; 455 RefPtr<Frame> m_frame;
462 456
463 bool m_doFullRepaint; 457 bool m_doFullRepaint;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 static const unsigned visualPixelThreshold = 32 * 32; 574 static const unsigned visualPixelThreshold = 32 * 32;
581 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold) 575 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
582 setIsVisuallyNonEmpty(); 576 setIsVisuallyNonEmpty();
583 } 577 }
584 578
585 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView()); 579 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView());
586 580
587 } // namespace WebCore 581 } // namespace WebCore
588 582
589 #endif // FrameView_h 583 #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