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

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

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/LayoutEmbeddedObject.h ('k') | Source/core/page/EventHandler.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 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 PaintInvalidationReason reason = 145 PaintInvalidationReason reason =
146 LayoutPart::invalidatePaintIfNeeded(paintInvalidationState, newPaintInva lidationContainer); 146 LayoutPart::invalidatePaintIfNeeded(paintInvalidationState, newPaintInva lidationContainer);
147 147
148 Widget* widget = this->widget(); 148 Widget* widget = this->widget();
149 if (widget && widget->isPluginView()) 149 if (widget && widget->isPluginView())
150 toPluginView(widget)->invalidatePaintIfNeeded(); 150 toPluginView(widget)->invalidatePaintIfNeeded();
151 151
152 return reason; 152 return reason;
153 } 153 }
154 154
155 bool LayoutEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g ranularity, float) 155 bool LayoutEmbeddedObject::scroll(ScrollDirectionPhysical direction, ScrollGranu larity granularity, float)
156 { 156 {
157 return false; 157 return false;
158 } 158 }
159 159
160 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const 160 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const
161 { 161 {
162 if (requiresAcceleratedCompositing()) 162 if (requiresAcceleratedCompositing())
163 return CompositingReasonPlugin; 163 return CompositingReasonPlugin;
164 return CompositingReasonNone; 164 return CompositingReasonNone;
165 } 165 }
166 166
167 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const 167 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const
168 { 168 {
169 if (!node() || !widget() || !widget()->isFrameView()) 169 if (!node() || !widget() || !widget()->isFrameView())
170 return 0; 170 return 0;
171 return toFrameView(widget())->embeddedContentBox(); 171 return toFrameView(widget())->embeddedContentBox();
172 } 172 }
173 173
174 } // namespace blink 174 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutEmbeddedObject.h ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698