Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (90252 => 90253)
--- trunk/Source/WebCore/CMakeLists.txt 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-07-01 18:50:29 UTC (rev 90253)
@@ -1277,7 +1277,7 @@
rendering/style/StyleBackgroundData.cpp
rendering/style/StyleBoxData.cpp
rendering/style/StyleCachedImage.cpp
- rendering/style/StyleFlexibleBoxData.cpp
+ rendering/style/StyleDeprecatedFlexibleBoxData.cpp
rendering/style/StyleGeneratedImage.cpp
rendering/style/StyleInheritedData.cpp
rendering/style/StyleMarqueeData.cpp
Modified: trunk/Source/WebCore/ChangeLog (90252 => 90253)
--- trunk/Source/WebCore/ChangeLog 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/ChangeLog 2011-07-01 18:50:29 UTC (rev 90253)
@@ -1,3 +1,33 @@
+2011-07-01 Tony Chang <[email protected]>
+
+ Reviewed by Ojan Vafai.
+
+ rename StyleFlexibleBoxData to StyleDeprecatedFlexibleBoxData
+ https://bugs.webkit.org/show_bug.cgi?id=63773
+
+ We will have a similar struct to hold CSS3 flexible box data, so
+ this makes way for the new class.
+ I will rename the member variable in RenderStyle.h in a follow up
+ change.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * WebCore.order:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleAllInOne.cpp:
+ * rendering/style/StyleDeprecatedFlexibleBoxData.cpp:
+ (WebCore::StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData):
+ (WebCore::StyleDeprecatedFlexibleBoxData::operator==):
+ * rendering/style/StyleDeprecatedFlexibleBoxData.h:
+ (WebCore::StyleDeprecatedFlexibleBoxData::create):
+ (WebCore::StyleDeprecatedFlexibleBoxData::copy):
+ (WebCore::StyleDeprecatedFlexibleBoxData::operator!=):
+ * rendering/style/StyleRareNonInheritedData.h:
+
2011-07-01 Hans Wennborg <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (90252 => 90253)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-07-01 18:50:29 UTC (rev 90253)
@@ -3110,8 +3110,8 @@
Source/WebCore/rendering/style/StyleCachedImage.cpp \
Source/WebCore/rendering/style/StyleCachedImage.h \
Source/WebCore/rendering/style/StyleDashboardRegion.h \
- Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp \
- Source/WebCore/rendering/style/StyleFlexibleBoxData.h \
+ Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp \
+ Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.h \
Source/WebCore/rendering/style/StyleGeneratedImage.cpp \
Source/WebCore/rendering/style/StyleGeneratedImage.h \
Source/WebCore/rendering/style/StyleImage.h \
Modified: trunk/Source/WebCore/WebCore.gypi (90252 => 90253)
--- trunk/Source/WebCore/WebCore.gypi 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/WebCore.gypi 2011-07-01 18:50:29 UTC (rev 90253)
@@ -1015,7 +1015,7 @@
'rendering/style/StyleBoxData.h',
'rendering/style/StyleCachedImage.h',
'rendering/style/StyleDashboardRegion.h',
- 'rendering/style/StyleFlexibleBoxData.h',
+ 'rendering/style/StyleDeprecatedFlexibleBoxData.h',
'rendering/style/StyleGeneratedImage.h',
'rendering/style/StyleImage.h',
'rendering/style/StyleInheritedData.h',
@@ -5444,7 +5444,7 @@
'rendering/style/StyleBackgroundData.cpp',
'rendering/style/StyleBoxData.cpp',
'rendering/style/StyleCachedImage.cpp',
- 'rendering/style/StyleFlexibleBoxData.cpp',
+ 'rendering/style/StyleDeprecatedFlexibleBoxData.cpp',
'rendering/style/StyleGeneratedImage.cpp',
'rendering/style/StyleInheritedData.cpp',
'rendering/style/StyleMarqueeData.cpp',
Modified: trunk/Source/WebCore/WebCore.order (90252 => 90253)
--- trunk/Source/WebCore/WebCore.order 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/WebCore.order 2011-07-01 18:50:29 UTC (rev 90253)
@@ -758,7 +758,7 @@
__ZN7WebCore17StyleSurroundDataC2Ev
__ZN7WebCore25StyleRareNonInheritedDataC1Ev
__ZN7WebCore25StyleRareNonInheritedDataC2Ev
-__ZN7WebCore20StyleFlexibleBoxDataC1Ev
+__ZN7WebCore20StyleDeprecatedFlexibleBoxDataC1Ev
__ZN7WebCore16StyleMarqueeDataC1Ev
__ZN7WebCore17StyleMultiColDataC1Ev
__ZN7WebCore18StyleTransformDataC1Ev
@@ -3285,7 +3285,7 @@
__ZN7WebCore11RenderStyle15clearCursorListEv
__ZNK7WebCore8CSSValue11isValueListEv
__ZN7WebCore11RenderStyle11setBoxAlignENS_13EBoxAlignmentE
-__ZN7WebCore20StyleFlexibleBoxDataC1ERKS0_
+__ZN7WebCore20StyleDeprecatedFlexibleBoxDataC1ERKS0_
__ZNK3WTF7HashMapIijNS_7IntHashIjEENS_10HashTraitsIiEENS3_IjEEE3getERKi
__ZN7WebCore11RenderStyle12setBoxSizingENS_10EBoxSizingE
__ZN7WebCore10BorderDataaSERKS0_
@@ -3575,7 +3575,7 @@
__ZNK7WebCore14SVGRenderStyle14InheritedFlagseqERKS1_
__ZNK7WebCore22StyleRareInheritedDataeqERKS0_
__ZNK7WebCore10QuotesDataeqERKS0_
-__ZNK7WebCore20StyleFlexibleBoxDataeqERKS0_
+__ZNK7WebCore20StyleDeprecatedFlexibleBoxDataeqERKS0_
__ZNK7WebCore25StyleRareNonInheritedData20shadowDataEquivalentERKS0_
__ZNK7WebCore25StyleRareNonInheritedData24reflectionDataEquivalentERKS0_
__ZNK7WebCore22StyleRareInheritedData20shadowDataEquivalentERKS0_
Modified: trunk/Source/WebCore/WebCore.pro (90252 => 90253)
--- trunk/Source/WebCore/WebCore.pro 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/WebCore.pro 2011-07-01 18:50:29 UTC (rev 90253)
@@ -1180,7 +1180,7 @@
rendering/style/StyleBackgroundData.cpp \
rendering/style/StyleBoxData.cpp \
rendering/style/StyleCachedImage.cpp \
- rendering/style/StyleFlexibleBoxData.cpp \
+ rendering/style/StyleDeprecatedFlexibleBoxData.cpp \
rendering/style/StyleGeneratedImage.cpp \
rendering/style/StyleInheritedData.cpp \
rendering/style/StyleMarqueeData.cpp \
@@ -2227,7 +2227,7 @@
rendering/style/StyleBackgroundData.h \
rendering/style/StyleBoxData.h \
rendering/style/StyleCachedImage.h \
- rendering/style/StyleFlexibleBoxData.h \
+ rendering/style/StyleDeprecatedFlexibleBoxData.h \
rendering/style/StyleGeneratedImage.h \
rendering/style/StyleInheritedData.h \
rendering/style/StyleMarqueeData.h \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (90252 => 90253)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-07-01 18:50:29 UTC (rev 90253)
@@ -40271,7 +40271,7 @@
>
</File>
<File
- RelativePath="..\rendering\style\StyleFlexibleBoxData.cpp"
+ RelativePath="..\rendering\style\StyleDeprecatedFlexibleBoxData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -40323,7 +40323,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\rendering\style\StyleFlexibleBoxData.h"
+ RelativePath="..\rendering\style\StyleDeprecatedFlexibleBoxData.h"
>
</File>
<File
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (90252 => 90253)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-07-01 18:50:29 UTC (rev 90253)
@@ -4951,8 +4951,8 @@
BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB74C0E81E06700B25965 /* StyleMultiColData.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC5EB80F0E81F2CE00B25965 /* StyleTransformData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB80D0E81F2CE00B25965 /* StyleTransformData.cpp */; };
BC5EB8100E81F2CE00B25965 /* StyleTransformData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB80E0E81F2CE00B25965 /* StyleTransformData.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC5EB8B80E8201BD00B25965 /* StyleFlexibleBoxData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB8B60E8201BD00B25965 /* StyleFlexibleBoxData.cpp */; };
- BC5EB8B90E8201BD00B25965 /* StyleFlexibleBoxData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB8B70E8201BD00B25965 /* StyleFlexibleBoxData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ BC5EB8B80E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB8B60E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp */; };
+ BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB8B70E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB8C10E82031B00B25965 /* ShadowData.cpp */; };
BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB8C20E82031B00B25965 /* ShadowData.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC5EB9500E82056B00B25965 /* CounterDirectives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB94E0E82056B00B25965 /* CounterDirectives.cpp */; };
@@ -11557,8 +11557,8 @@
BC5EB74C0E81E06700B25965 /* StyleMultiColData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleMultiColData.h; path = style/StyleMultiColData.h; sourceTree = "<group>"; };
BC5EB80D0E81F2CE00B25965 /* StyleTransformData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleTransformData.cpp; path = style/StyleTransformData.cpp; sourceTree = "<group>"; };
BC5EB80E0E81F2CE00B25965 /* StyleTransformData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleTransformData.h; path = style/StyleTransformData.h; sourceTree = "<group>"; };
- BC5EB8B60E8201BD00B25965 /* StyleFlexibleBoxData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleFlexibleBoxData.cpp; path = style/StyleFlexibleBoxData.cpp; sourceTree = "<group>"; };
- BC5EB8B70E8201BD00B25965 /* StyleFlexibleBoxData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleFlexibleBoxData.h; path = style/StyleFlexibleBoxData.h; sourceTree = "<group>"; };
+ BC5EB8B60E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleDeprecatedFlexibleBoxData.cpp; path = style/StyleDeprecatedFlexibleBoxData.cpp; sourceTree = "<group>"; };
+ BC5EB8B70E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleDeprecatedFlexibleBoxData.h; path = style/StyleDeprecatedFlexibleBoxData.h; sourceTree = "<group>"; };
BC5EB8C10E82031B00B25965 /* ShadowData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShadowData.cpp; path = style/ShadowData.cpp; sourceTree = "<group>"; };
BC5EB8C20E82031B00B25965 /* ShadowData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShadowData.h; path = style/ShadowData.h; sourceTree = "<group>"; };
BC5EB94E0E82056B00B25965 /* CounterDirectives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CounterDirectives.cpp; path = style/CounterDirectives.cpp; sourceTree = "<group>"; };
@@ -18562,8 +18562,8 @@
BCEF44790E6747D0001C1287 /* StyleCachedImage.cpp */,
BCEF444C0E674628001C1287 /* StyleCachedImage.h */,
BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */,
- BC5EB8B60E8201BD00B25965 /* StyleFlexibleBoxData.cpp */,
- BC5EB8B70E8201BD00B25965 /* StyleFlexibleBoxData.h */,
+ BC5EB8B60E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp */,
+ BC5EB8B70E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h */,
BCEF447C0E674806001C1287 /* StyleGeneratedImage.cpp */,
BCEF44490E6745E0001C1287 /* StyleGeneratedImage.h */,
BCEF43CE0E673DA1001C1287 /* StyleImage.h */,
@@ -22591,7 +22591,7 @@
BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */,
A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */,
AA4C3A770B2B1679002334A2 /* StyleElement.h in Headers */,
- BC5EB8B90E8201BD00B25965 /* StyleFlexibleBoxData.h in Headers */,
+ BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */,
BCEF444A0E6745E0001C1287 /* StyleGeneratedImage.h in Headers */,
BCEF43CF0E673DA1001C1287 /* StyleImage.h in Headers */,
BC2273040E82F1E600E7F975 /* StyleInheritedData.h in Headers */,
@@ -25474,7 +25474,7 @@
BCEF447A0E6747D0001C1287 /* StyleCachedImage.cpp in Sources */,
A8C4A7FE09D563270003AC8D /* StyledElement.cpp in Sources */,
AA4C3A760B2B1679002334A2 /* StyleElement.cpp in Sources */,
- BC5EB8B80E8201BD00B25965 /* StyleFlexibleBoxData.cpp in Sources */,
+ BC5EB8B80E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp in Sources */,
BCEF447D0E674806001C1287 /* StyleGeneratedImage.cpp in Sources */,
BC2273030E82F1E600E7F975 /* StyleInheritedData.cpp in Sources */,
A80E734D0A199C77007FB8C5 /* StyleList.cpp in Sources */,
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (90252 => 90253)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2011-07-01 18:50:29 UTC (rev 90253)
@@ -48,7 +48,7 @@
#include "ShadowData.h"
#include "StyleBackgroundData.h"
#include "StyleBoxData.h"
-#include "StyleFlexibleBoxData.h"
+#include "StyleDeprecatedFlexibleBoxData.h"
#include "StyleInheritedData.h"
#include "StyleMarqueeData.h"
#include "StyleMultiColData.h"
Modified: trunk/Source/WebCore/rendering/style/StyleAllInOne.cpp (90252 => 90253)
--- trunk/Source/WebCore/rendering/style/StyleAllInOne.cpp 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/rendering/style/StyleAllInOne.cpp 2011-07-01 18:50:29 UTC (rev 90253)
@@ -38,7 +38,7 @@
#include "StyleBackgroundData.cpp"
#include "StyleBoxData.cpp"
#include "StyleCachedImage.cpp"
-#include "StyleFlexibleBoxData.cpp"
+#include "StyleDeprecatedFlexibleBoxData.cpp"
#include "StyleGeneratedImage.cpp"
#include "StyleInheritedData.cpp"
#include "StyleMarqueeData.cpp"
Copied: trunk/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp (from rev 90187, trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp) (0 => 90253)
--- trunk/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp (rev 0)
+++ trunk/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp 2011-07-01 18:50:29 UTC (rev 90253)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 1999 Antti Koivisto ([email protected])
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+#include "StyleDeprecatedFlexibleBoxData.h"
+
+#include "RenderStyle.h"
+
+namespace WebCore {
+
+StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData()
+ : flex(RenderStyle::initialBoxFlex())
+ , flex_group(RenderStyle::initialBoxFlexGroup())
+ , ordinal_group(RenderStyle::initialBoxOrdinalGroup())
+ , align(RenderStyle::initialBoxAlign())
+ , pack(RenderStyle::initialBoxPack())
+ , orient(RenderStyle::initialBoxOrient())
+ , lines(RenderStyle::initialBoxLines())
+{
+}
+
+StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData(const StyleDeprecatedFlexibleBoxData& o)
+ : RefCounted<StyleDeprecatedFlexibleBoxData>()
+ , flex(o.flex)
+ , flex_group(o.flex_group)
+ , ordinal_group(o.ordinal_group)
+ , align(o.align)
+ , pack(o.pack)
+ , orient(o.orient)
+ , lines(o.lines)
+{
+}
+
+bool StyleDeprecatedFlexibleBoxData::operator==(const StyleDeprecatedFlexibleBoxData& o) const
+{
+ return flex == o.flex && flex_group == o.flex_group &&
+ ordinal_group == o.ordinal_group && align == o.align &&
+ pack == o.pack && orient == o.orient && lines == o.lines;
+}
+
+} // namespace WebCore
Copied: trunk/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.h (from rev 90187, trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h) (0 => 90253)
--- trunk/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.h (rev 0)
+++ trunk/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.h 2011-07-01 18:50:29 UTC (rev 90253)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2000 Lars Knoll ([email protected])
+ * (C) 2000 Antti Koivisto ([email protected])
+ * (C) 2000 Dirk Mueller ([email protected])
+ * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 Graham Dennis ([email protected])
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef StyleDeprecatedFlexibleBoxData_h
+#define StyleDeprecatedFlexibleBoxData_h
+
+#include <wtf/RefCounted.h>
+#include <wtf/PassRefPtr.h>
+
+namespace WebCore {
+
+class StyleDeprecatedFlexibleBoxData : public RefCounted<StyleDeprecatedFlexibleBoxData> {
+public:
+ static PassRefPtr<StyleDeprecatedFlexibleBoxData> create() { return adoptRef(new StyleDeprecatedFlexibleBoxData); }
+ PassRefPtr<StyleDeprecatedFlexibleBoxData> copy() const { return adoptRef(new StyleDeprecatedFlexibleBoxData(*this)); }
+
+ bool operator==(const StyleDeprecatedFlexibleBoxData&) const;
+ bool operator!=(const StyleDeprecatedFlexibleBoxData& o) const
+ {
+ return !(*this == o);
+ }
+
+ float flex;
+ unsigned int flex_group;
+ unsigned int ordinal_group;
+
+ unsigned align : 3; // EBoxAlignment
+ unsigned pack: 3; // EBoxAlignment
+ unsigned orient: 1; // EBoxOrient
+ unsigned lines : 1; // EBoxLines
+
+private:
+ StyleDeprecatedFlexibleBoxData();
+ StyleDeprecatedFlexibleBoxData(const StyleDeprecatedFlexibleBoxData&);
+};
+
+} // namespace WebCore
+
+#endif // StyleDeprecatedFlexibleBoxData_h
Deleted: trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp (90252 => 90253)
--- trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp 2011-07-01 18:50:29 UTC (rev 90253)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 1999 Antti Koivisto ([email protected])
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "StyleFlexibleBoxData.h"
-
-#include "RenderStyle.h"
-
-namespace WebCore {
-
-StyleFlexibleBoxData::StyleFlexibleBoxData()
- : flex(RenderStyle::initialBoxFlex())
- , flex_group(RenderStyle::initialBoxFlexGroup())
- , ordinal_group(RenderStyle::initialBoxOrdinalGroup())
- , align(RenderStyle::initialBoxAlign())
- , pack(RenderStyle::initialBoxPack())
- , orient(RenderStyle::initialBoxOrient())
- , lines(RenderStyle::initialBoxLines())
-{
-}
-
-StyleFlexibleBoxData::StyleFlexibleBoxData(const StyleFlexibleBoxData& o)
- : RefCounted<StyleFlexibleBoxData>()
- , flex(o.flex)
- , flex_group(o.flex_group)
- , ordinal_group(o.ordinal_group)
- , align(o.align)
- , pack(o.pack)
- , orient(o.orient)
- , lines(o.lines)
-{
-}
-
-bool StyleFlexibleBoxData::operator==(const StyleFlexibleBoxData& o) const
-{
- return flex == o.flex && flex_group == o.flex_group &&
- ordinal_group == o.ordinal_group && align == o.align &&
- pack == o.pack && orient == o.orient && lines == o.lines;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h (90252 => 90253)
--- trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h 2011-07-01 18:50:29 UTC (rev 90253)
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2000 Lars Knoll ([email protected])
- * (C) 2000 Antti Koivisto ([email protected])
- * (C) 2000 Dirk Mueller ([email protected])
- * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Graham Dennis ([email protected])
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef StyleFlexibleBoxData_h
-#define StyleFlexibleBoxData_h
-
-#include <wtf/RefCounted.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebCore {
-
-class StyleFlexibleBoxData : public RefCounted<StyleFlexibleBoxData> {
-public:
- static PassRefPtr<StyleFlexibleBoxData> create() { return adoptRef(new StyleFlexibleBoxData); }
- PassRefPtr<StyleFlexibleBoxData> copy() const { return adoptRef(new StyleFlexibleBoxData(*this)); }
-
- bool operator==(const StyleFlexibleBoxData& o) const;
- bool operator!=(const StyleFlexibleBoxData& o) const
- {
- return !(*this == o);
- }
-
- float flex;
- unsigned int flex_group;
- unsigned int ordinal_group;
-
- unsigned align : 3; // EBoxAlignment
- unsigned pack: 3; // EBoxAlignment
- unsigned orient: 1; // EBoxOrient
- unsigned lines : 1; // EBoxLines
-
-private:
- StyleFlexibleBoxData();
- StyleFlexibleBoxData(const StyleFlexibleBoxData&);
-};
-
-} // namespace WebCore
-
-#endif // StyleFlexibleBoxData_h
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (90252 => 90253)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2011-07-01 18:40:18 UTC (rev 90252)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2011-07-01 18:50:29 UTC (rev 90253)
@@ -41,7 +41,7 @@
class AnimationList;
class CSSStyleSelector;
class ShadowData;
-class StyleFlexibleBoxData;
+class StyleDeprecatedFlexibleBoxData;
class StyleMarqueeData;
class StyleMultiColData;
class StyleReflection;
@@ -89,7 +89,7 @@
#endif
float opacity; // Whether or not we're transparent.
- DataRef<StyleFlexibleBoxData> flexibleBox; // Flexible box properties
+ DataRef<StyleDeprecatedFlexibleBoxData> flexibleBox; // Flexible box properties
DataRef<StyleMarqueeData> marquee; // Marquee properties
DataRef<StyleMultiColData> m_multiCol; // CSS3 multicol properties
DataRef<StyleTransformData> m_transform; // Transform properties (rotate, scale, skew, etc.)
