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

Side by Side Diff: Source/core/rendering/RenderEmbeddedObject.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 | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderEmbeddedObject.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 private: 63 private:
64 virtual const char* renderName() const OVERRIDE { return "RenderEmbeddedObje ct"; } 64 virtual const char* renderName() const OVERRIDE { return "RenderEmbeddedObje ct"; }
65 virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; } 65 virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; }
66 66
67 void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image*); 67 void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image*);
68 virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 68 virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
69 69
70 virtual LayerType layerTypeRequired() const OVERRIDE FINAL; 70 virtual LayerType layerTypeRequired() const OVERRIDE FINAL;
71 71
72 virtual void viewCleared() OVERRIDE FINAL;
73
74 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) OV ERRIDE FINAL; 72 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) OV ERRIDE FINAL;
75 73
76 bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatR ect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const; 74 bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatR ect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const;
77 75
78 virtual bool canHaveChildren() const OVERRIDE FINAL; 76 virtual bool canHaveChildren() const OVERRIDE FINAL;
79 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); } 77 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); }
80 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 78 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); }
81 79
82 bool m_hasFallbackContent; // FIXME: This belongs on HTMLObjectElement. 80 bool m_hasFallbackContent; // FIXME: This belongs on HTMLObjectElement.
83 81
84 bool m_showsUnavailablePluginIndicator; 82 bool m_showsUnavailablePluginIndicator;
85 PluginUnavailabilityReason m_pluginUnavailabilityReason; 83 PluginUnavailabilityReason m_pluginUnavailabilityReason;
86 String m_unavailablePluginReplacementText; 84 String m_unavailablePluginReplacementText;
87 RenderObjectChildList m_children; 85 RenderObjectChildList m_children;
88 }; 86 };
89 87
90 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderEmbeddedObject, isEmbeddedObject()); 88 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderEmbeddedObject, isEmbeddedObject());
91 89
92 } // namespace WebCore 90 } // namespace WebCore
93 91
94 #endif // RenderEmbeddedObject_h 92 #endif // RenderEmbeddedObject_h
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderEmbeddedObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698