Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2006, 2007 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 576 bool hasSameDirectionAs(const RenderBox* object) const { return style()->dir ection() == object->style()->direction(); } | 576 bool hasSameDirectionAs(const RenderBox* object) const { return style()->dir ection() == object->style()->direction(); } |
| 577 | 577 |
| 578 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; | 578 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; |
| 579 static void reportStaticMembersMemoryUsage(MemoryInstrumentation*); | 579 static void reportStaticMembersMemoryUsage(MemoryInstrumentation*); |
| 580 | 580 |
| 581 ExclusionShapeOutsideInfo* exclusionShapeOutsideInfo() const | 581 ExclusionShapeOutsideInfo* exclusionShapeOutsideInfo() const |
| 582 { | 582 { |
| 583 return isFloatingWithShapeOutside() && ExclusionShapeOutsideInfo::isEnab ledFor(this) ? ExclusionShapeOutsideInfo::info(this) : 0; | 583 return isFloatingWithShapeOutside() && ExclusionShapeOutsideInfo::isEnab ledFor(this) ? ExclusionShapeOutsideInfo::info(this) : 0; |
| 584 } | 584 } |
| 585 | 585 |
| 586 bool isScrollableWithoutScrollbars() const | |
|
Rick Byers
2013/05/30 16:15:00
It seems a little confusing to me to add a case wh
bokan
2013/05/30 18:23:51
Fixed. Removed this method and moved the condition
| |
| 587 { | |
| 588 return parent() && parent()->isTextField() && hasOverflowClip(); | |
| 589 } | |
| 590 | |
| 586 protected: | 591 protected: |
| 587 virtual void willBeDestroyed(); | 592 virtual void willBeDestroyed(); |
| 588 | 593 |
| 589 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); | 594 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); |
| 590 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); | 595 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); |
| 591 virtual void updateFromStyle() OVERRIDE; | 596 virtual void updateFromStyle() OVERRIDE; |
| 592 | 597 |
| 593 LayoutRect backgroundPaintedExtent() const; | 598 LayoutRect backgroundPaintedExtent() const; |
| 594 virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const; | 599 virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const; |
| 595 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE; | 600 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE; |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 736 if (UNLIKELY(m_inlineBoxWrapper != 0)) | 741 if (UNLIKELY(m_inlineBoxWrapper != 0)) |
| 737 deleteLineBoxWrapper(); | 742 deleteLineBoxWrapper(); |
| 738 } | 743 } |
| 739 | 744 |
| 740 m_inlineBoxWrapper = boxWrapper; | 745 m_inlineBoxWrapper = boxWrapper; |
| 741 } | 746 } |
| 742 | 747 |
| 743 } // namespace WebCore | 748 } // namespace WebCore |
| 744 | 749 |
| 745 #endif // RenderBox_h | 750 #endif // RenderBox_h |
| OLD | NEW |