From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- Source/WebCore/rendering/style/RenderStyle.cpp | 3 ++- Source/WebCore/rendering/style/RenderStyle.h | 5 +++-- Source/WebCore/rendering/style/RenderStyleConstants.h | 11 +++-------- Source/WebCore/rendering/style/StyleCachedImage.cpp | 2 +- Source/WebCore/rendering/style/StyleCachedImage.h | 2 +- Source/WebCore/rendering/style/StyleGeneratedImage.cpp | 2 +- Source/WebCore/rendering/style/StyleGeneratedImage.h | 2 +- Source/WebCore/rendering/style/StyleImage.h | 4 ++-- Source/WebCore/rendering/style/StylePendingImage.h | 3 ++- 9 files changed, 16 insertions(+), 18 deletions(-) (limited to 'Source/WebCore/rendering/style') diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp index 2836fb9..b76a350 100644 --- a/Source/WebCore/rendering/style/RenderStyle.cpp +++ b/Source/WebCore/rendering/style/RenderStyle.cpp @@ -462,7 +462,8 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon inherited_flags._text_transform != other->inherited_flags._text_transform || inherited_flags._direction != other->inherited_flags._direction || inherited_flags._white_space != other->inherited_flags._white_space || - noninherited_flags._clear != other->noninherited_flags._clear) + noninherited_flags._clear != other->noninherited_flags._clear || + noninherited_flags._unicodeBidi != other->noninherited_flags._unicodeBidi) return StyleDifferenceLayout; // Check block flow direction. diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h index 9d5239b..7b79db1 100644 --- a/Source/WebCore/rendering/style/RenderStyle.h +++ b/Source/WebCore/rendering/style/RenderStyle.h @@ -165,7 +165,6 @@ protected: (_text_align == other._text_align) && (_text_transform == other._text_transform) && (_text_decorations == other._text_decorations) && - (_text_transform == other._text_transform) && (_cursor_style == other._cursor_style) && (_direction == other._direction) && (_border_collapse == other._border_collapse) && @@ -463,6 +462,7 @@ public: ETableLayout tableLayout() const { return static_cast(noninherited_flags._table_layout); } const Font& font() const { return inherited->font; } + const FontMetrics& fontMetrics() const { return inherited->font.fontMetrics(); } const FontDescription& fontDescription() const { return inherited->font.fontDescription(); } int fontSize() const { return inherited->font.pixelSize(); } @@ -487,7 +487,7 @@ public: // Negative value means the line height is not set. Use the font's built-in spacing. if (lh.isNegative()) - return font().lineSpacing(); + return fontMetrics().lineSpacing(); if (lh.isPercent()) return lh.calcMinValue(fontSize()); @@ -727,6 +727,7 @@ public: bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rareNonInheritedData->m_maskBoxImage.hasImage(); } TextCombine textCombine() const { return static_cast(rareNonInheritedData->m_textCombine); } + bool hasTextCombine() const { return textCombine() != TextCombineNone; } // End CSS3 Getters // Apple-specific property getter methods diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h index 7cd4903..44cd3f5 100644 --- a/Source/WebCore/rendering/style/RenderStyleConstants.h +++ b/Source/WebCore/rendering/style/RenderStyleConstants.h @@ -68,14 +68,9 @@ enum StyleDifferenceContextSensitiveProperty { enum PseudoId { // The order must be NOP ID, public IDs, and then internal IDs. NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, FIRST_LINE_INHERITED, SCROLLBAR, FILE_UPLOAD_BUTTON, INPUT_PLACEHOLDER, - SEARCH_CANCEL_BUTTON, SEARCH_DECORATION, SEARCH_RESULTS_DECORATION, SEARCH_RESULTS_BUTTON, MEDIA_CONTROLS_PANEL, - MEDIA_CONTROLS_PLAY_BUTTON, MEDIA_CONTROLS_MUTE_BUTTON, MEDIA_CONTROLS_TIMELINE, MEDIA_CONTROLS_TIMELINE_CONTAINER, - MEDIA_CONTROLS_VOLUME_SLIDER, MEDIA_CONTROLS_VOLUME_SLIDER_CONTAINER, MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON, - MEDIA_CONTROLS_CURRENT_TIME_DISPLAY, MEDIA_CONTROLS_TIME_REMAINING_DISPLAY, - MEDIA_CONTROLS_SEEK_BACK_BUTTON, MEDIA_CONTROLS_SEEK_FORWARD_BUTTON, MEDIA_CONTROLS_FULLSCREEN_BUTTON, MEDIA_CONTROLS_REWIND_BUTTON, - MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON, MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON, - MEDIA_CONTROLS_STATUS_DISPLAY, SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER, - INPUT_LIST_BUTTON, INPUT_SPEECH_BUTTON, INNER_SPIN_BUTTON, OUTER_SPIN_BUTTON, VISITED_LINK, PROGRESS_BAR_VALUE, + SEARCH_CANCEL_BUTTON, SEARCH_DECORATION, SEARCH_RESULTS_DECORATION, SEARCH_RESULTS_BUTTON, + SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER, + INPUT_LIST_BUTTON, INPUT_SPEECH_BUTTON, INNER_SPIN_BUTTON, OUTER_SPIN_BUTTON, VISITED_LINK, METER_HORIZONTAL_BAR, METER_HORIZONTAL_OPTIMUM, METER_HORIZONTAL_SUBOPTIMAL, METER_HORIZONTAL_EVEN_LESS_GOOD, METER_VERTICAL_BAR, METER_VERTICAL_OPTIMUM, METER_VERTICAL_SUBOPTIMAL, METER_VERTICAL_EVEN_LESS_GOOD, AFTER_LAST_INTERNAL_PSEUDOID, diff --git a/Source/WebCore/rendering/style/StyleCachedImage.cpp b/Source/WebCore/rendering/style/StyleCachedImage.cpp index 1d7aba8..05cb0ea 100644 --- a/Source/WebCore/rendering/style/StyleCachedImage.cpp +++ b/Source/WebCore/rendering/style/StyleCachedImage.cpp @@ -84,7 +84,7 @@ void StyleCachedImage::removeClient(RenderObject* renderer) return m_image->removeClient(renderer); } -Image* StyleCachedImage::image(RenderObject*, const IntSize&) const +PassRefPtr StyleCachedImage::image(RenderObject*, const IntSize&) const { return m_image->image(); } diff --git a/Source/WebCore/rendering/style/StyleCachedImage.h b/Source/WebCore/rendering/style/StyleCachedImage.h index 3d6e1a2..2be6f4c 100644 --- a/Source/WebCore/rendering/style/StyleCachedImage.h +++ b/Source/WebCore/rendering/style/StyleCachedImage.h @@ -52,7 +52,7 @@ public: virtual void setImageContainerSize(const IntSize&); virtual void addClient(RenderObject*); virtual void removeClient(RenderObject*); - virtual Image* image(RenderObject*, const IntSize&) const; + virtual PassRefPtr image(RenderObject*, const IntSize&) const; private: StyleCachedImage(CachedImage* image) diff --git a/Source/WebCore/rendering/style/StyleGeneratedImage.cpp b/Source/WebCore/rendering/style/StyleGeneratedImage.cpp index 2322f5f..fa0aad7 100644 --- a/Source/WebCore/rendering/style/StyleGeneratedImage.cpp +++ b/Source/WebCore/rendering/style/StyleGeneratedImage.cpp @@ -72,7 +72,7 @@ void StyleGeneratedImage::removeClient(RenderObject* renderer) m_generator->removeClient(renderer); } -Image* StyleGeneratedImage::image(RenderObject* renderer, const IntSize& size) const +PassRefPtr StyleGeneratedImage::image(RenderObject* renderer, const IntSize& size) const { return m_generator->image(renderer, size); } diff --git a/Source/WebCore/rendering/style/StyleGeneratedImage.h b/Source/WebCore/rendering/style/StyleGeneratedImage.h index 7be1f6a..8e6076a 100644 --- a/Source/WebCore/rendering/style/StyleGeneratedImage.h +++ b/Source/WebCore/rendering/style/StyleGeneratedImage.h @@ -51,7 +51,7 @@ public: virtual void setImageContainerSize(const IntSize&); virtual void addClient(RenderObject*); virtual void removeClient(RenderObject*); - virtual Image* image(RenderObject*, const IntSize&) const; + virtual PassRefPtr image(RenderObject*, const IntSize&) const; private: StyleGeneratedImage(CSSImageGeneratorValue* val, bool fixedSize) diff --git a/Source/WebCore/rendering/style/StyleImage.h b/Source/WebCore/rendering/style/StyleImage.h index ead8d4a..2c844f6 100644 --- a/Source/WebCore/rendering/style/StyleImage.h +++ b/Source/WebCore/rendering/style/StyleImage.h @@ -25,6 +25,7 @@ #define StyleImage_h #include "CSSValue.h" +#include "Image.h" #include "IntSize.h" #include #include @@ -33,7 +34,6 @@ namespace WebCore { class CSSValue; -class Image; class RenderObject; typedef void* WrappedImagePtr; @@ -59,7 +59,7 @@ public: virtual void setImageContainerSize(const IntSize&) = 0; virtual void addClient(RenderObject*) = 0; virtual void removeClient(RenderObject*) = 0; - virtual Image* image(RenderObject*, const IntSize&) const = 0; + virtual PassRefPtr image(RenderObject*, const IntSize&) const = 0; virtual WrappedImagePtr data() const = 0; virtual bool isCachedImage() const { return false; } diff --git a/Source/WebCore/rendering/style/StylePendingImage.h b/Source/WebCore/rendering/style/StylePendingImage.h index b0c9b01..60c993c 100644 --- a/Source/WebCore/rendering/style/StylePendingImage.h +++ b/Source/WebCore/rendering/style/StylePendingImage.h @@ -26,6 +26,7 @@ #ifndef StylePendingImage_h #define StylePendingImage_h +#include "Image.h" #include "StyleImage.h" namespace WebCore { @@ -52,7 +53,7 @@ public: virtual void setImageContainerSize(const IntSize&) { } virtual void addClient(RenderObject*) { } virtual void removeClient(RenderObject*) { } - virtual Image* image(RenderObject*, const IntSize&) const + virtual PassRefPtr image(RenderObject*, const IntSize&) const { ASSERT_NOT_REACHED(); return 0; -- cgit v1.1