diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:30 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:30 +0100 |
| commit | 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 (patch) | |
| tree | 276aad5a2bbc2fd7d65d21bfca42c9de88b3dd20 /WebCore/rendering/style | |
| parent | 2796dd1bf3b4b01e7e1d96ea91bd3a212f647579 (diff) | |
| download | external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.zip external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.tar.gz external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.tar.bz2 | |
Revert "Merge WebKit r47420"
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
Diffstat (limited to 'WebCore/rendering/style')
| -rw-r--r-- | WebCore/rendering/style/FillLayer.h | 6 | ||||
| -rw-r--r-- | WebCore/rendering/style/RenderStyleConstants.h | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/WebCore/rendering/style/FillLayer.h b/WebCore/rendering/style/FillLayer.h index aad7900..c3944ad 100644 --- a/WebCore/rendering/style/FillLayer.h +++ b/WebCore/rendering/style/FillLayer.h @@ -63,14 +63,14 @@ public: bool isSizeSet() const { return m_sizeSet; } void setImage(StyleImage* i) { m_image = i; m_imageSet = true; } - void setXPosition(Length l) { m_xPosition = l; m_xPosSet = true; } - void setYPosition(Length l) { m_yPosition = l; m_yPosSet = true; } + void setXPosition(const Length& l) { m_xPosition = l; m_xPosSet = true; } + void setYPosition(const Length& l) { m_yPosition = l; m_yPosSet = true; } void setAttachment(EFillAttachment attachment) { m_attachment = attachment; m_attachmentSet = true; } void setClip(EFillBox b) { m_clip = b; m_clipSet = true; } void setOrigin(EFillBox b) { m_origin = b; m_originSet = true; } void setRepeat(EFillRepeat r) { m_repeat = r; m_repeatSet = true; } void setComposite(CompositeOperator c) { m_composite = c; m_compositeSet = true; } - void setSize(LengthSize b) { m_size = b; m_sizeSet = true; } + void setSize(const LengthSize& b) { m_size = b; m_sizeSet = true; } void clearImage() { m_imageSet = false; } void clearXPosition() { m_xPosSet = false; } diff --git a/WebCore/rendering/style/RenderStyleConstants.h b/WebCore/rendering/style/RenderStyleConstants.h index 013d335..c491816 100644 --- a/WebCore/rendering/style/RenderStyleConstants.h +++ b/WebCore/rendering/style/RenderStyleConstants.h @@ -4,7 +4,6 @@ * (C) 2000 Dirk Mueller (mueller@kde.org) * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) - * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -299,11 +298,7 @@ enum EDisplay { TABLE, INLINE_TABLE, TABLE_ROW_GROUP, TABLE_HEADER_GROUP, TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL, - TABLE_CAPTION, BOX, INLINE_BOX, -#if ENABLE(WCSS) - WAP_MARQUEE, -#endif - NONE + TABLE_CAPTION, BOX, INLINE_BOX, NONE }; enum EPointerEvents { |