OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
11 * Copyright (C) 2013 Google Inc. All rights reserved. | 11 * Copyright (C) 2013 Google Inc. All rights reserved. |
12 * | 12 * |
13 * This library is free software; you can redistribute it and/or | 13 * This library is free software; you can redistribute it and/or |
14 * modify it under the terms of the GNU Library General Public | 14 * modify it under the terms of the GNU Library General Public |
15 * License as published by the Free Software Foundation; either | 15 * License as published by the Free Software Foundation; either |
16 * version 2 of the License, or (at your option) any later version. | 16 * version 2 of the License, or (at your option) any later version. |
17 * | 17 * |
18 * This library is distributed in the hope that it will be useful, | 18 * This library is distributed in the hope that it will be useful, |
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
21 * Library General Public License for more details. | 21 * Library General Public License for more details. |
22 * | 22 * |
23 * You should have received a copy of the GNU Library General Public License | 23 * You should have received a copy of the GNU Library General Public License |
24 * along with this library; see the file COPYING.LIB. If not, write to | 24 * along with this library; see the file COPYING.LIB. If not, write to |
25 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 25 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 * Boston, MA 02110-1301, USA. | 26 * Boston, MA 02110-1301, USA. |
27 */ | 27 */ |
28 | 28 |
29 #include "sky/engine/config.h" | |
30 #include "sky/engine/core/css/resolver/StyleAdjuster.h" | 29 #include "sky/engine/core/css/resolver/StyleAdjuster.h" |
31 | 30 |
32 #include "sky/engine/core/dom/ContainerNode.h" | 31 #include "sky/engine/core/dom/ContainerNode.h" |
33 #include "sky/engine/core/dom/Document.h" | 32 #include "sky/engine/core/dom/Document.h" |
34 #include "sky/engine/core/dom/Element.h" | 33 #include "sky/engine/core/dom/Element.h" |
35 #include "sky/engine/core/dom/NodeRenderStyle.h" | 34 #include "sky/engine/core/dom/NodeRenderStyle.h" |
36 #include "sky/engine/core/rendering/style/RenderStyle.h" | 35 #include "sky/engine/core/rendering/style/RenderStyle.h" |
37 #include "sky/engine/core/rendering/style/RenderStyleConstants.h" | 36 #include "sky/engine/core/rendering/style/RenderStyleConstants.h" |
38 #include "sky/engine/platform/Length.h" | 37 #include "sky/engine/platform/Length.h" |
39 #include "sky/engine/platform/transforms/TransformOperations.h" | 38 #include "sky/engine/platform/transforms/TransformOperations.h" |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 // FIXME: Once we implement pagination controls, overflow-x should defau
lt to hidden | 200 // FIXME: Once we implement pagination controls, overflow-x should defau
lt to hidden |
202 // if overflow-y is set to -webkit-paged-x or -webkit-page-y. For now, w
e'll let it | 201 // if overflow-y is set to -webkit-paged-x or -webkit-page-y. For now, w
e'll let it |
203 // default to auto so we can at least scroll through the pages. | 202 // default to auto so we can at least scroll through the pages. |
204 style->setOverflowX(OAUTO); | 203 style->setOverflowX(OAUTO); |
205 } else if (style->overflowY() == OVISIBLE && style->overflowX() != OVISIBLE)
{ | 204 } else if (style->overflowY() == OVISIBLE && style->overflowX() != OVISIBLE)
{ |
206 style->setOverflowY(OAUTO); | 205 style->setOverflowY(OAUTO); |
207 } | 206 } |
208 } | 207 } |
209 | 208 |
210 } | 209 } |
OLD | NEW |