| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
| 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. 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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 // m_nonInheritedData.m_affectedByHover | 360 // m_nonInheritedData.m_affectedByHover |
| 361 // m_nonInheritedData.m_affectedByActive | 361 // m_nonInheritedData.m_affectedByActive |
| 362 // m_nonInheritedData.m_affectedByDrag | 362 // m_nonInheritedData.m_affectedByDrag |
| 363 // m_nonInheritedData.m_isLink | 363 // m_nonInheritedData.m_isLink |
| 364 | 364 |
| 365 if (m_svgStyle != other.m_svgStyle) | 365 if (m_svgStyle != other.m_svgStyle) |
| 366 m_svgStyle.access()->copyNonInheritedFromCached(other.m_svgStyle.get()); | 366 m_svgStyle.access()->copyNonInheritedFromCached(other.m_svgStyle.get()); |
| 367 DCHECK_EQ(zoom(), initialZoom()); | 367 DCHECK_EQ(zoom(), initialZoom()); |
| 368 } | 368 } |
| 369 | 369 |
| 370 bool ComputedStyle::hasImage() |
| 371 { |
| 372 return backgroundLayers().image() || maskLayers().image() || borderImage().i
mage() || maskBoxImage().image() || (contentData() && contentData()->isImage())
|| (boxReflect() && boxReflect()->mask().image()) || (shapeOutside() && shapeOut
side()->image()) || cursors(); |
| 373 } |
| 374 |
| 375 |
| 370 bool ComputedStyle::operator==(const ComputedStyle& o) const | 376 bool ComputedStyle::operator==(const ComputedStyle& o) const |
| 371 { | 377 { |
| 372 return inheritedEqual(o) | 378 return inheritedEqual(o) |
| 373 && nonInheritedEqual(o); | 379 && nonInheritedEqual(o); |
| 374 } | 380 } |
| 375 | 381 |
| 376 bool ComputedStyle::isStyleAvailable() const | 382 bool ComputedStyle::isStyleAvailable() const |
| 377 { | 383 { |
| 378 return this != StyleResolver::styleNotYetAvailable(); | 384 return this != StyleResolver::styleNotYetAvailable(); |
| 379 } | 385 } |
| (...skipping 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1988 if (value < 0) | 1994 if (value < 0) |
| 1989 fvalue -= 0.5f; | 1995 fvalue -= 0.5f; |
| 1990 else | 1996 else |
| 1991 fvalue += 0.5f; | 1997 fvalue += 0.5f; |
| 1992 } | 1998 } |
| 1993 | 1999 |
| 1994 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2000 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 1995 } | 2001 } |
| 1996 | 2002 |
| 1997 } // namespace blink | 2003 } // namespace blink |
| OLD | NEW |