Title: [96691] trunk/Source/WebCore
- Revision
- 96691
- Author
- [email protected]
- Date
- 2011-10-05 04:19:39 -0700 (Wed, 05 Oct 2011)
Log Message
Shrink StyleRareNonInheritedData.
https://bugs.webkit.org/show_bug.cgi?id=69331
Reviewed by Darin Adler.
Workaround MSVC quirk by making enum bitfields "unsigned".
* rendering/style/RenderStyle.h:
(WebCore::InheritedFlags::regionOverflow):
(WebCore::InheritedFlags::transformStyle3D):
(WebCore::InheritedFlags::backfaceVisibility):
(WebCore::InheritedFlags::pageSizeType):
* rendering/style/StyleRareNonInheritedData.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96690 => 96691)
--- trunk/Source/WebCore/ChangeLog 2011-10-05 10:32:28 UTC (rev 96690)
+++ trunk/Source/WebCore/ChangeLog 2011-10-05 11:19:39 UTC (rev 96691)
@@ -1,3 +1,19 @@
+2011-10-05 Andreas Kling <[email protected]>
+
+ Shrink StyleRareNonInheritedData.
+ https://bugs.webkit.org/show_bug.cgi?id=69331
+
+ Reviewed by Darin Adler.
+
+ Workaround MSVC quirk by making enum bitfields "unsigned".
+
+ * rendering/style/RenderStyle.h:
+ (WebCore::InheritedFlags::regionOverflow):
+ (WebCore::InheritedFlags::transformStyle3D):
+ (WebCore::InheritedFlags::backfaceVisibility):
+ (WebCore::InheritedFlags::pageSizeType):
+ * rendering/style/StyleRareNonInheritedData.h:
+
2011-10-05 Pavel Feldman <[email protected]>
Web Inspector: add CSS model classes to the compilation.
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (96690 => 96691)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2011-10-05 10:32:28 UTC (rev 96690)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2011-10-05 11:19:39 UTC (rev 96691)
@@ -802,7 +802,7 @@
const AtomicString& flowThread() const { return rareNonInheritedData->m_flowThread; }
const AtomicString& regionThread() const { return rareNonInheritedData->m_regionThread; }
int regionIndex() const { return rareNonInheritedData->m_regionIndex; }
- RegionOverflow regionOverflow() const { return rareNonInheritedData->m_regionOverflow; }
+ RegionOverflow regionOverflow() const { return static_cast<RegionOverflow>(rareNonInheritedData->m_regionOverflow); }
// Apple-specific property getter methods
EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(inherited_flags._pointerEvents); }
@@ -818,16 +818,16 @@
// return the first found Animation (including 'all' transitions)
const Animation* transitionForProperty(int property) const;
- ETransformStyle3D transformStyle3D() const { return rareNonInheritedData->m_transformStyle3D; }
+ ETransformStyle3D transformStyle3D() const { return static_cast<ETransformStyle3D>(rareNonInheritedData->m_transformStyle3D); }
bool preserves3D() const { return rareNonInheritedData->m_transformStyle3D == TransformStyle3DPreserve3D; }
- EBackfaceVisibility backfaceVisibility() const { return rareNonInheritedData->m_backfaceVisibility; }
+ EBackfaceVisibility backfaceVisibility() const { return static_cast<EBackfaceVisibility>(rareNonInheritedData->m_backfaceVisibility); }
float perspective() const { return rareNonInheritedData->m_perspective; }
bool hasPerspective() const { return rareNonInheritedData->m_perspective > 0; }
Length perspectiveOriginX() const { return rareNonInheritedData->m_perspectiveOriginX; }
Length perspectiveOriginY() const { return rareNonInheritedData->m_perspectiveOriginY; }
LengthSize pageSize() const { return rareNonInheritedData->m_pageSize; }
- PageSizeType pageSizeType() const { return rareNonInheritedData->m_pageSizeType; }
+ PageSizeType pageSizeType() const { return static_cast<PageSizeType>(rareNonInheritedData->m_pageSizeType); }
#if USE(ACCELERATED_COMPOSITING)
// When set, this ensures that styles compare as different. Used during accelerated animations.
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (96690 => 96691)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2011-10-05 10:32:28 UTC (rev 96690)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2011-10-05 11:19:39 UTC (rev 96691)
@@ -129,15 +129,15 @@
AtomicString m_flowThread;
AtomicString m_regionThread;
int m_regionIndex;
- RegionOverflow m_regionOverflow : 1;
+ unsigned m_regionOverflow : 1; // RegionOverflow
unsigned m_regionBreakAfter : 2; // EPageBreak
unsigned m_regionBreakBefore : 2; // EPageBreak
unsigned m_regionBreakInside : 2; // EPageBreak
- PageSizeType m_pageSizeType : 2;
- ETransformStyle3D m_transformStyle3D : 1;
- EBackfaceVisibility m_backfaceVisibility : 1;
+ unsigned m_pageSizeType : 2; // PageSizeType
+ unsigned m_transformStyle3D : 1; // ETransformStyle3D
+ unsigned m_backfaceVisibility : 1; // EBackfaceVisibility
unsigned userDrag : 2; // EUserDrag
unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
