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

Side by Side Diff: Source/core/layout/LayoutEmbeddedObject.h

Issue 1147283002: Add ScrollDirectionPhysical enum in Scroll types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a conflict on EventHandler Created 5 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
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/layout/LayoutEmbeddedObject.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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual void paint(const PaintInfo&, const LayoutPoint&) override final; 53 virtual void paint(const PaintInfo&, const LayoutPoint&) override final;
54 54
55 virtual void layout() override final; 55 virtual void layout() override final;
56 virtual PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationSta te&, const LayoutBoxModelObject&) override final; 56 virtual PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationSta te&, const LayoutBoxModelObject&) override final;
57 57
58 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectEmbeddedObject || LayoutPart::isOfType(type); } 58 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectEmbeddedObject || LayoutPart::isOfType(type); }
59 virtual LayoutBox* embeddedContentBox() const override final; 59 virtual LayoutBox* embeddedContentBox() const override final;
60 60
61 virtual DeprecatedPaintLayerType layerTypeRequired() const override final; 61 virtual DeprecatedPaintLayerType layerTypeRequired() const override final;
62 62
63 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) ov erride final; 63 virtual bool scroll(ScrollDirectionPhysical, ScrollGranularity, float multip lier) override final;
64 64
65 virtual CompositingReasons additionalCompositingReasons() const override; 65 virtual CompositingReasons additionalCompositingReasons() const override;
66 66
67 bool m_showsUnavailablePluginIndicator; 67 bool m_showsUnavailablePluginIndicator;
68 PluginUnavailabilityReason m_pluginUnavailabilityReason; 68 PluginUnavailabilityReason m_pluginUnavailabilityReason;
69 String m_unavailablePluginReplacementText; 69 String m_unavailablePluginReplacementText;
70 }; 70 };
71 71
72 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutEmbeddedObject, isEmbeddedObject()); 72 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutEmbeddedObject, isEmbeddedObject());
73 73
74 } // namespace blink 74 } // namespace blink
75 75
76 #endif // LayoutEmbeddedObject_h 76 #endif // LayoutEmbeddedObject_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/layout/LayoutEmbeddedObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698