Changeset 80041 in webkit
- Timestamp:
- Mar 1, 2011 2:22:21 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 16 deleted
- 25 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r80040 r80041 1 2011-03-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r80037. 4 http://trac.webkit.org/changeset/80037 5 https://bugs.webkit.org/show_bug.cgi?id=55508 6 7 broke compile on SL (Requested by tonyg-cr on #webkit). 8 9 * fast/css/content/content-quotes-01-expected.txt: Removed. 10 * fast/css/content/content-quotes-01.html: Removed. 11 * fast/css/content/content-quotes-02-expected.txt: Removed. 12 * fast/css/content/content-quotes-02.html: Removed. 13 * fast/css/content/content-quotes-03-expected.txt: Removed. 14 * fast/css/content/content-quotes-03.html: Removed. 15 * fast/css/content/content-quotes-04-expected.txt: Removed. 16 * fast/css/content/content-quotes-04.html: Removed. 17 * fast/css/content/content-quotes-05-expected.txt: Removed. 18 * fast/css/content/content-quotes-05.html: Removed. 19 * fast/css/content/content-quotes-06-expected.txt: Removed. 20 * fast/css/content/content-quotes-06.html: Removed. 21 1 22 2011-03-01 Abhishek Arya <inferno@chromium.org> 2 23 -
trunk/Source/WebCore/Android.mk
r80037 r80041 703 703 rendering/RenderObjectChildList.cpp \ 704 704 rendering/RenderPart.cpp \ 705 rendering/RenderQuote.cpp \706 705 rendering/RenderReplaced.cpp \ 707 706 rendering/RenderReplica.cpp \ … … 793 792 rendering/style/KeyframeList.cpp \ 794 793 rendering/style/NinePieceImage.cpp \ 795 rendering/style/QuotesData.cpp \796 794 rendering/style/RenderStyle.cpp \ 797 795 -
trunk/Source/WebCore/CMakeLists.txt
r80037 r80041 1378 1378 rendering/RenderPart.cpp 1379 1379 rendering/RenderProgress.cpp 1380 rendering/RenderQuote.cpp1381 1380 rendering/RenderReplaced.cpp 1382 1381 rendering/RenderReplica.cpp … … 1416 1415 rendering/style/KeyframeList.cpp 1417 1416 rendering/style/NinePieceImage.cpp 1418 rendering/style/QuotesData.cpp1419 1417 rendering/style/RenderStyle.cpp 1420 1418 rendering/style/ShadowData.cpp -
trunk/Source/WebCore/ChangeLog
r80040 r80041 1 2011-03-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r80037. 4 http://trac.webkit.org/changeset/80037 5 https://bugs.webkit.org/show_bug.cgi?id=55508 6 7 broke compile on SL (Requested by tonyg-cr on #webkit). 8 9 * Android.mk: 10 * CMakeLists.txt: 11 * GNUmakefile.am: 12 * WebCore.gypi: 13 * WebCore.pro: 14 * WebCore.vcproj/WebCore.vcproj: 15 * WebCore.xcodeproj/project.pbxproj: 16 * css/CSSParser.cpp: 17 (WebCore::CSSParser::parseValue): 18 * css/CSSParser.h: 19 * css/CSSStyleSelector.cpp: 20 (WebCore::CSSStyleSelector::applyProperty): 21 * css/html.css: 22 (q:before): 23 (q:after): 24 * rendering/RenderBlockLineLayout.cpp: 25 (WebCore::dirtyLineBoxesForRenderer): 26 * rendering/RenderObject.h: 27 * rendering/RenderObjectChildList.cpp: 28 (WebCore::RenderObjectChildList::removeChildNode): 29 (WebCore::RenderObjectChildList::appendChildNode): 30 (WebCore::RenderObjectChildList::insertChildNode): 31 (WebCore::RenderObjectChildList::updateBeforeAfterContent): 32 * rendering/RenderQuote.cpp: Removed. 33 * rendering/RenderQuote.h: Removed. 34 * rendering/RenderingAllInOne.cpp: 35 * rendering/style/ContentData.cpp: 36 (WebCore::ContentData::dataEquivalent): 37 (WebCore::ContentData::deleteContent): 38 * rendering/style/ContentData.h: 39 * rendering/style/QuotesData.cpp: Removed. 40 * rendering/style/QuotesData.h: Removed. 41 * rendering/style/RenderStyle.cpp: 42 * rendering/style/RenderStyle.h: 43 * rendering/style/RenderStyleConstants.h: 44 * rendering/style/StyleAllInOne.cpp: 45 * rendering/style/StyleRareInheritedData.cpp: 46 (WebCore::StyleRareInheritedData::operator==): 47 * rendering/style/StyleRareInheritedData.h: 48 1 49 2011-03-01 Abhishek Arya <inferno@chromium.org> 2 50 -
trunk/Source/WebCore/GNUmakefile.am
r80037 r80041 2829 2829 Source/WebCore/rendering/RenderProgress.cpp \ 2830 2830 Source/WebCore/rendering/RenderProgress.h \ 2831 Source/WebCore/rendering/RenderQuote.cpp \2832 Source/WebCore/rendering/RenderQuote.h \2833 2831 Source/WebCore/rendering/RenderReplaced.cpp \ 2834 2832 Source/WebCore/rendering/RenderReplaced.h \ … … 2933 2931 Source/WebCore/rendering/style/NinePieceImage.h \ 2934 2932 Source/WebCore/rendering/style/OutlineValue.h \ 2935 Source/WebCore/rendering/style/QuotesData.cpp \2936 Source/WebCore/rendering/style/QuotesData.h \2937 2933 Source/WebCore/rendering/style/RenderStyleConstants.h \ 2938 2934 Source/WebCore/rendering/style/RenderStyle.cpp \ -
trunk/Source/WebCore/WebCore.gypi
r80037 r80041 3692 3692 'rendering/style/NinePieceImage.h', 3693 3693 'rendering/style/OutlineValue.h', 3694 'rendering/style/QuotesData.cpp',3695 'rendering/style/QuotesData.h',3696 3694 'rendering/style/RenderStyle.cpp', 3697 3695 'rendering/style/RenderStyle.h', … … 3953 3951 'rendering/RenderProgress.cpp', 3954 3952 'rendering/RenderProgress.h', 3955 'rendering/RenderQuote.cpp',3956 'rendering/RenderQuote.h',3957 3953 'rendering/RenderReplaced.cpp', 3958 3954 'rendering/RenderReplaced.h', -
trunk/Source/WebCore/WebCore.pro
r80037 r80041 1089 1089 rendering/RenderPart.cpp \ 1090 1090 rendering/RenderProgress.cpp \ 1091 rendering/RenderQuote.cpp \1092 1091 rendering/RenderReplaced.cpp \ 1093 1092 rendering/RenderReplica.cpp \ … … 1125 1124 rendering/style/KeyframeList.cpp \ 1126 1125 rendering/style/NinePieceImage.cpp \ 1127 rendering/style/QuotesData.cpp \1128 1126 rendering/style/RenderStyle.cpp \ 1129 1127 rendering/style/ShadowData.cpp \ … … 2078 2076 rendering/RenderPart.h \ 2079 2077 rendering/RenderProgress.h \ 2080 rendering/RenderQuote.h \2081 2078 rendering/RenderReplaced.h \ 2082 2079 rendering/RenderReplica.h \ … … 2116 2113 rendering/style/KeyframeList.h \ 2117 2114 rendering/style/NinePieceImage.h \ 2118 rendering/style/QuotesData.h \2119 2115 rendering/style/RenderStyle.h \ 2120 2116 rendering/style/ShadowData.h \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r80037 r80041 35027 35027 </File> 35028 35028 <File 35029 RelativePath="..\rendering\RenderQuote.cpp"35030 >35031 <FileConfiguration35032 Name="Debug|Win32"35033 ExcludedFromBuild="true"35034 >35035 <Tool35036 Name="VCCLCompilerTool"35037 />35038 </FileConfiguration>35039 <FileConfiguration35040 Name="Release|Win32"35041 ExcludedFromBuild="true"35042 >35043 <Tool35044 Name="VCCLCompilerTool"35045 />35046 </FileConfiguration>35047 <FileConfiguration35048 Name="Debug_Cairo_CFLite|Win32"35049 ExcludedFromBuild="true"35050 >35051 <Tool35052 Name="VCCLCompilerTool"35053 />35054 </FileConfiguration>35055 <FileConfiguration35056 Name="Release_Cairo_CFLite|Win32"35057 ExcludedFromBuild="true"35058 >35059 <Tool35060 Name="VCCLCompilerTool"35061 />35062 </FileConfiguration>35063 <FileConfiguration35064 Name="Debug_All|Win32"35065 ExcludedFromBuild="true"35066 >35067 <Tool35068 Name="VCCLCompilerTool"35069 />35070 </FileConfiguration>35071 <FileConfiguration35072 Name="Release_LTCG|Win32"35073 ExcludedFromBuild="true"35074 >35075 <Tool35076 Name="VCCLCompilerTool"35077 />35078 </FileConfiguration>35079 </File>35080 <File35081 RelativePath="..\rendering\RenderQuote.h"35082 >35083 </File>35084 <File35085 35029 RelativePath="..\rendering\RenderReplaced.cpp" 35086 35030 > … … 38993 38937 <File 38994 38938 RelativePath="..\rendering\style\OutlineValue.h" 38995 >38996 </File>38997 <File38998 RelativePath="..\rendering\style\QuotesData.cpp"38999 >39000 <FileConfiguration39001 Name="Debug|Win32"39002 ExcludedFromBuild="true"39003 >39004 <Tool39005 Name="VCCLCompilerTool"39006 />39007 </FileConfiguration>39008 <FileConfiguration39009 Name="Release|Win32"39010 ExcludedFromBuild="true"39011 >39012 <Tool39013 Name="VCCLCompilerTool"39014 />39015 </FileConfiguration>39016 <FileConfiguration39017 Name="Debug_Cairo_CFLite|Win32"39018 ExcludedFromBuild="true"39019 >39020 <Tool39021 Name="VCCLCompilerTool"39022 />39023 </FileConfiguration>39024 <FileConfiguration39025 Name="Release_Cairo_CFLite|Win32"39026 ExcludedFromBuild="true"39027 >39028 <Tool39029 Name="VCCLCompilerTool"39030 />39031 </FileConfiguration>39032 <FileConfiguration39033 Name="Debug_All|Win32"39034 ExcludedFromBuild="true"39035 >39036 <Tool39037 Name="VCCLCompilerTool"39038 />39039 </FileConfiguration>39040 <FileConfiguration39041 Name="Release_LTCG|Win32"39042 ExcludedFromBuild="true"39043 >39044 <Tool39045 Name="VCCLCompilerTool"39046 />39047 </FileConfiguration>39048 </File>39049 <File39050 RelativePath="..\rendering\style\QuotesData.h"39051 38939 > 39052 38940 </File> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r80037 r80041 2874 2874 9392F14C0AD1861B00691BD4 /* CounterNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9392F14B0AD1861B00691BD4 /* CounterNode.h */; }; 2875 2875 9392F1500AD1862300691BD4 /* CounterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9392F14F0AD1862300691BD4 /* CounterNode.cpp */; }; 2876 9392F1420AD185F400691BD4 /* RenderQuote.h in Headers */ = {isa = PBXBuildFile; fileRef = 9392F1410AD185F400691BD4 /* RenderQuote.h */; };2877 9392F1440AD185FE00691BD4 /* RenderQuote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9392F1430AD185FE00691BD4 /* RenderQuote.cpp */; };2878 2876 939885C308B7E3D100E707C4 /* EventNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 939885C108B7E3D100E707C4 /* EventNames.cpp */; }; 2879 2877 939885C408B7E3D100E707C4 /* EventNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 939885C208B7E3D100E707C4 /* EventNames.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 5238 5236 BCEF43DD0E674012001C1287 /* NinePieceImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEF43DC0E674012001C1287 /* NinePieceImage.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5239 5237 BCEF43E00E674110001C1287 /* NinePieceImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEF43DF0E674110001C1287 /* NinePieceImage.cpp */; }; 5240 9392F1420AD185F400691BD4 /* QuotesData.h in Sources */ = {isa = PBXBuildFile; fileRef = 9392F1420AD185F400691BD4 /* QutoesData.h */; };5241 9392F1420AD185F400691BD4 /* QuotesData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9392F1420AD185F400691BD4 /* QutoesData.cpp */; };5242 5238 BCEF444A0E6745E0001C1287 /* StyleGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEF44490E6745E0001C1287 /* StyleGeneratedImage.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5243 5239 BCEF444D0E674628001C1287 /* StyleCachedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEF444C0E674628001C1287 /* StyleCachedImage.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 9318 9314 9392F14B0AD1861B00691BD4 /* CounterNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CounterNode.h; sourceTree = "<group>"; }; 9319 9315 9392F14F0AD1862300691BD4 /* CounterNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CounterNode.cpp; sourceTree = "<group>"; }; 9320 9392F1410AD185F400691BD4 /* RenderQuote.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderQuote.h; sourceTree = "<group>"; };9321 9392F1430AD185FE00691BD4 /* RenderQuote.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderQuote.cpp; sourceTree = "<group>"; };9322 9316 93955A4103D72932008635CE /* RenderTreeAsText.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeAsText.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 9323 9317 93955A4203D72932008635CE /* RenderTreeAsText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTreeAsText.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; … … 11613 11607 BCEF43DC0E674012001C1287 /* NinePieceImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NinePieceImage.h; path = style/NinePieceImage.h; sourceTree = "<group>"; }; 11614 11608 BCEF43DF0E674110001C1287 /* NinePieceImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NinePieceImage.cpp; path = style/NinePieceImage.cpp; sourceTree = "<group>"; }; 11615 9392F1420AD185F400691BD4 /* QuotesData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuotesData.h; path = style/QuotesData.h; sourceTree = "<group>"; };11616 9392F1420AD185F400691BD4 /* QuotesData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = QuotesData.cpp; path = style/QuotesData.cpp; sourceTree = "<group>"; };11617 11609 BCEF44490E6745E0001C1287 /* StyleGeneratedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleGeneratedImage.h; path = style/StyleGeneratedImage.h; sourceTree = "<group>"; }; 11618 11610 BCEF444C0E674628001C1287 /* StyleCachedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleCachedImage.h; path = style/StyleCachedImage.h; sourceTree = "<group>"; }; … … 18029 18021 BCEF43DC0E674012001C1287 /* NinePieceImage.h */, 18030 18022 BC5EB5DC0E81B8DD00B25965 /* OutlineValue.h */, 18031 9392F1420AD185F400691BD4 /* QuotesData.cpp */,18032 9392F1420AD185F400691BD4 /* QuotesData.h */,18033 18023 BC8C8FAB0DDCD31B00B592F4 /* RenderStyle.cpp */, 18034 18024 BC8C8FAC0DDCD31B00B592F4 /* RenderStyle.h */, … … 18855 18845 A43BF59A1149292800C643CA /* RenderProgress.cpp */, 18856 18846 A43BF59B1149292800C643CA /* RenderProgress.h */, 18857 9392F1430AD185FE00691BD4 /* RenderQuote.cpp */,18858 9392F1410AD185F400691BD4 /* RenderQuote.h */,18859 18847 A871DFDE0A15376B00B12A68 /* RenderReplaced.cpp */, 18860 18848 A871DFDF0A15376B00B12A68 /* RenderReplaced.h */, … … 21709 21697 7E33CD01127F340D00BE8F17 /* PurgePriority.h in Headers */, 21710 21698 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */, 21711 9392F1420AD185F400691BD4 /* QuotesData.h in Headers */,21712 21699 B22279720D00BF220071B782 /* RadialGradientAttributes.h in Headers */, 21713 21700 F55B3DCC1251F12D003EF269 /* RadioInputType.h in Headers */, … … 21781 21768 A871DED70A1530C700B12A68 /* RenderPart.h in Headers */, 21782 21769 A43BF59D1149292800C643CA /* RenderProgress.h in Headers */, 21783 9392F1420AD185F400691BD4 /* RenderQuote.h in Headers */,21784 21770 A871DFE30A15376B00B12A68 /* RenderReplaced.h in Headers */, 21785 21771 BCA846D70DC67A350026C309 /* RenderReplica.h in Headers */, … … 24439 24425 1A7FA6490DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp in Sources */, 24440 24426 BCEF43E00E674110001C1287 /* NinePieceImage.cpp in Sources */, 24441 9392F1420AD185F400691BD4 /* QuotesData.cpp in Sources */,24442 24427 A8C4A80009D563270003AC8D /* Node.cpp in Sources */, 24443 24428 854FE7300A2297BE0058D7AD /* NodeFilter.cpp in Sources */, … … 24584 24569 A871DED00A1530C700B12A68 /* RenderPart.cpp in Sources */, 24585 24570 A43BF59C1149292800C643CA /* RenderProgress.cpp in Sources */, 24586 9392F1440AD185FE00691BD4 /* RenderQuote.cpp in Sources */,24587 24571 A871DFE20A15376B00B12A68 /* RenderReplaced.cpp in Sources */, 24588 24572 BCA846D60DC67A350026C309 /* RenderReplica.cpp in Sources */, -
trunk/Source/WebCore/css/CSSParser.cpp
r80037 r80041 635 635 if (id) 636 636 validPrimitive = true; 637 else638 return parseQuotes(propId, important);639 637 break; 640 638 case CSSPropertyUnicodeBidi: // normal | embed | bidi-override | inherit … … 2355 2353 return None; 2356 2354 } 2357 }2358 2359 // [ <string> <string> ]+ | inherit | none2360 // inherit and none are handled in parseValue.2361 bool CSSParser::parseQuotes(int propId, bool important)2362 {2363 RefPtr<CSSValueList> values = CSSValueList::createCommaSeparated();2364 while (CSSParserValue* val = m_valueList->current()) {2365 RefPtr<CSSValue> parsedValue;2366 if (val->unit == CSSPrimitiveValue::CSS_STRING)2367 parsedValue = CSSPrimitiveValue::create(val->string, CSSPrimitiveValue::CSS_STRING);2368 else2369 break;2370 values->append(parsedValue.release());2371 m_valueList->next();2372 }2373 if (values->length()) {2374 addProperty(propId, values.release(), important);2375 m_valueList->next();2376 return true;2377 }2378 return false;2379 2355 } 2380 2356 -
trunk/Source/WebCore/css/CSSParser.h
r80037 r80041 80 80 bool parse4Values(int propId, const int* properties, bool important); 81 81 bool parseContent(int propId, bool important); 82 bool parseQuotes(int propId, bool important);83 82 84 83 PassRefPtr<CSSValue> parseAttr(CSSParserValueList* args); -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r80037 r80041 72 72 #include "Pair.h" 73 73 #include "PerspectiveTransformOperation.h" 74 #include "QuotesData.h"75 74 #include "Rect.h" 76 75 #include "RenderScrollbar.h" … … 4728 4727 CSSPrimitiveValue* contentValue = static_cast<CSSPrimitiveValue*>(item); 4729 4728 switch (contentValue->primitiveType()) { 4730 case CSSPrimitiveValue::CSS_STRING: 4731 m_style->setContent(contentValue->getStringValue().impl(), didSet); 4732 didSet = true; 4733 break; 4734 case CSSPrimitiveValue::CSS_ATTR: { 4735 // FIXME: Can a namespace be specified for an attr(foo)? 4736 if (m_style->styleType() == NOPSEUDO) 4737 m_style->setUnique(); 4738 else 4739 m_parentStyle->setUnique(); 4740 QualifiedName attr(nullAtom, contentValue->getStringValue().impl(), nullAtom); 4741 m_style->setContent(m_element->getAttribute(attr).impl(), didSet); 4742 didSet = true; 4743 // register the fact that the attribute value affects the style 4744 m_selectorAttrs.add(attr.localName().impl()); 4745 break; 4746 } 4747 case CSSPrimitiveValue::CSS_URI: { 4748 if (!contentValue->isImageValue()) 4749 break; 4750 m_style->setContent(cachedOrPendingFromValue(CSSPropertyContent, static_cast<CSSImageValue*>(contentValue)), didSet); 4751 didSet = true; 4752 break; 4753 } 4754 case CSSPrimitiveValue::CSS_COUNTER: { 4755 Counter* counterValue = contentValue->getCounterValue(); 4756 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent(counterValue->identifier(), 4757 (EListStyleType)counterValue->listStyleNumber(), counterValue->separator())); 4758 m_style->setContent(counter.release(), didSet); 4759 didSet = true; 4760 break; 4761 } 4762 case CSSPrimitiveValue::CSS_IDENT: 4763 switch (contentValue->getIdent()) { 4764 case CSSValueOpenQuote: 4765 m_style->setContent(OPEN_QUOTE, didSet); 4729 case CSSPrimitiveValue::CSS_STRING: 4730 m_style->setContent(contentValue->getStringValue().impl(), didSet); 4766 4731 didSet = true; 4767 4732 break; 4768 case CSSValueCloseQuote: 4769 m_style->setContent(CLOSE_QUOTE, didSet); 4733 case CSSPrimitiveValue::CSS_ATTR: { 4734 // FIXME: Can a namespace be specified for an attr(foo)? 4735 if (m_style->styleType() == NOPSEUDO) 4736 m_style->setUnique(); 4737 else 4738 m_parentStyle->setUnique(); 4739 QualifiedName attr(nullAtom, contentValue->getStringValue().impl(), nullAtom); 4740 m_style->setContent(m_element->getAttribute(attr).impl(), didSet); 4741 didSet = true; 4742 // register the fact that the attribute value affects the style 4743 m_selectorAttrs.add(attr.localName().impl()); 4744 break; 4745 } 4746 case CSSPrimitiveValue::CSS_URI: { 4747 if (!contentValue->isImageValue()) 4748 break; 4749 m_style->setContent(cachedOrPendingFromValue(CSSPropertyContent, static_cast<CSSImageValue*>(contentValue)), didSet); 4770 4750 didSet = true; 4771 4751 break; 4772 case CSSValueNoOpenQuote: 4773 m_style->setContent(NO_OPEN_QUOTE, didSet); 4752 } 4753 case CSSPrimitiveValue::CSS_COUNTER: { 4754 Counter* counterValue = contentValue->getCounterValue(); 4755 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent(counterValue->identifier(), 4756 (EListStyleType)counterValue->listStyleNumber(), counterValue->separator())); 4757 m_style->setContent(counter.release(), didSet); 4774 4758 didSet = true; 4775 break;4776 case CSSValueNoCloseQuote:4777 m_style->setContent(NO_CLOSE_QUOTE, didSet);4778 didSet = true;4779 break;4780 default:4781 // normal and none do not have any effect.4782 {}4783 4759 } 4784 4760 } … … 4788 4764 return; 4789 4765 } 4790 case CSSPropertyQuotes:4791 if (isInherit) {4792 if (m_parentStyle)4793 m_style->setQuotes(m_parentStyle->quotes());4794 return;4795 }4796 if (isInitial) {4797 m_style->setQuotes(0);4798 return;4799 }4800 if (value->isValueList()) {4801 CSSValueList* list = static_cast<CSSValueList*>(value);4802 size_t length = list->length();4803 QuotesData* data = QuotesData::create(length);4804 if (!data)4805 return; // Out of memory4806 String* quotes = data->data();4807 for (size_t i = 0; i < length; i++) {4808 CSSValue* item = list->itemWithoutBoundsCheck(i);4809 ASSERT(item->isPrimitiveValue());4810 primitiveValue = static_cast<CSSPrimitiveValue*>(item);4811 ASSERT(primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_STRING);4812 quotes[i] = primitiveValue->getStringValue();4813 }4814 m_style->setQuotes(adoptRef(data));4815 } else if (primitiveValue) {4816 ASSERT(primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_IDENT);4817 if (primitiveValue->getIdent() == CSSValueNone)4818 m_style->setQuotes(adoptRef(QuotesData::create(0)));4819 }4820 return;4821 4766 4822 4767 case CSSPropertyCounterIncrement: … … 6060 6005 case CSSPropertyFontStretch: 6061 6006 case CSSPropertyPage: 6007 case CSSPropertyQuotes: 6062 6008 case CSSPropertyTextLineThrough: 6063 6009 case CSSPropertyTextLineThroughColor: -
trunk/Source/WebCore/css/html.css
r80037 r80041 114 114 115 115 q:before { 116 content: open-quote; 116 content: '"' 117 /* FIXME: content: open-quote; */ 117 118 } 118 119 119 120 q:after { 120 content: close-quote; 121 content: '"' 122 /* FIXME: content: close-quote; */ 121 123 } 122 124 -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r80037 r80041 179 179 { 180 180 if (o->isText()) { 181 if (o->preferredLogicalWidthsDirty() && (o->isCounter() || o->isQuote()))181 if (o->preferredLogicalWidthsDirty() && o->isCounter()) 182 182 toRenderText(o)->computePreferredLogicalWidths(0); // FIXME: Counters depend on this hack. No clue why. Should be investigated and removed. 183 183 toRenderText(o)->dirtyLineBoxes(fullLayout); -
trunk/Source/WebCore/rendering/RenderObject.h
r80037 r80041 253 253 virtual bool isBoxModelObject() const { return false; } 254 254 virtual bool isCounter() const { return false; } 255 virtual bool isQuote() const { return false; }256 255 virtual bool isDetails() const { return false; } 257 256 virtual bool isDetailsMarker() const { return false; } -
trunk/Source/WebCore/rendering/RenderObjectChildList.cpp
r80037 r80041 37 37 #include "RenderLayer.h" 38 38 #include "RenderListItem.h" 39 #include "RenderQuote.h"40 39 #include "RenderStyle.h" 41 40 #include "RenderTextFragment.h" … … 132 131 if (oldChild->m_hasCounterNodeMap) 133 132 RenderCounter::destroyCounterNodes(oldChild); 134 RenderQuote::rendererRemovedFromTree(oldChild);135 133 136 134 if (AXObjectCache::accessibilityEnabled()) … … 180 178 owner->dirtyLinesFromChangedChild(newChild); 181 179 } 180 182 181 RenderCounter::rendererSubtreeAttached(newChild); 183 RenderQuote::rendererSubtreeAttached(newChild);184 182 newChild->setNeedsLayoutAndPrefWidthsRecalc(); // Goes up the containing block hierarchy. 185 183 if (!owner->normalChildNeedsLayout()) … … 242 240 243 241 RenderCounter::rendererSubtreeAttached(child); 244 RenderQuote::rendererSubtreeAttached(child);245 242 child->setNeedsLayoutAndPrefWidthsRecalc(); 246 243 if (!owner->normalChildNeedsLayout()) … … 464 461 break; 465 462 } 466 case CONTENT_COUNTER: 467 renderer = new (owner->renderArena()) RenderCounter(owner->document(), *content->counter()); 468 renderer->setStyle(pseudoElementStyle); 469 break; 470 case CONTENT_QUOTE: 471 renderer = new (owner->renderArena()) RenderQuote(owner->document(), content->quote()); 472 renderer->setStyle(pseudoElementStyle); 473 break; 463 case CONTENT_COUNTER: 464 renderer = new (owner->renderArena()) RenderCounter(owner->document(), *content->counter()); 465 renderer->setStyle(pseudoElementStyle); 466 break; 474 467 } 475 468 -
trunk/Source/WebCore/rendering/RenderingAllInOne.cpp
r80037 r80041 80 80 #include "RenderPart.cpp" 81 81 #include "RenderProgress.cpp" 82 #include "RenderQuote.cpp"83 82 #include "RenderReplaced.cpp" 84 83 #include "RenderReplica.cpp" -
trunk/Source/WebCore/rendering/style/ContentData.cpp
r80037 r80041 52 52 case CONTENT_COUNTER: 53 53 return *counter() == *other.counter(); 54 case CONTENT_QUOTE:55 return quote() == other.quote();56 54 } 57 55 … … 74 72 delete m_content.m_counter; 75 73 break; 76 case CONTENT_QUOTE:77 break;78 74 } 79 75 -
trunk/Source/WebCore/rendering/style/ContentData.h
r80037 r80041 52 52 bool isImage() const { return m_type == CONTENT_OBJECT; } 53 53 bool isNone() const { return m_type == CONTENT_NONE; } 54 bool isQuote() const { return m_type == CONTENT_QUOTE; }55 54 bool isText() const { return m_type == CONTENT_TEXT; } 56 55 … … 95 94 } 96 95 97 QuoteType quote() const98 {99 ASSERT(isQuote());100 return m_content.m_quote;101 }102 void setQuote(QuoteType type)103 {104 deleteContent();105 m_type = CONTENT_QUOTE;106 m_content.m_quote = type;107 }108 109 96 ContentData* next() const { return m_next.get(); } 110 97 void setNext(PassOwnPtr<ContentData> next) { m_next = next; } … … 118 105 StringImpl* m_text; 119 106 CounterContent* m_counter; 120 QuoteType m_quote;121 107 } m_content; 122 108 OwnPtr<ContentData> m_next; -
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
r80037 r80041 28 28 #include "CSSStyleSelector.h" 29 29 #include "FontSelector.h" 30 #include "QuotesData.h"31 30 #include "RenderArena.h" 32 31 #include "RenderObject.h" … … 607 606 } 608 607 609 void RenderStyle::setQuotes(PassRefPtr<QuotesData> q)610 {611 if (*rareInheritedData->quotes.get() == *q.get())612 return;613 rareInheritedData.access()->quotes = q;614 }615 616 608 void RenderStyle::clearCursorList() 617 609 { … … 679 671 return; 680 672 prepareToSetContent(0, add)->setCounter(counter); 681 }682 683 void RenderStyle::setContent(QuoteType quote, bool add)684 {685 prepareToSetContent(0, add)->setQuote(quote);686 673 } 687 674 -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r80037 r80041 1135 1135 void setContent(PassRefPtr<StyleImage>, bool add = false); 1136 1136 void setContent(PassOwnPtr<CounterContent>, bool add = false); 1137 void setContent(QuoteType, bool add = false);1138 1137 1139 1138 const CounterDirectiveMap* counterDirectives() const; 1140 1139 CounterDirectiveMap& accessCounterDirectives(); 1141 1142 QuotesData* quotes() const { return rareInheritedData->quotes.get(); }1143 void setQuotes(PassRefPtr<QuotesData>);1144 1140 1145 1141 const AtomicString& hyphenString() const; -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r80037 r80041 298 298 299 299 enum StyleContentType { 300 CONTENT_NONE, CONTENT_OBJECT, CONTENT_TEXT, CONTENT_COUNTER, CONTENT_QUOTE 301 }; 302 303 enum QuoteType { 304 OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE 300 CONTENT_NONE, CONTENT_OBJECT, CONTENT_TEXT, CONTENT_COUNTER 305 301 }; 306 302 -
trunk/Source/WebCore/rendering/style/StyleAllInOne.cpp
r80037 r80041 31 31 #include "KeyframeList.cpp" 32 32 #include "NinePieceImage.cpp" 33 #include "QuotesData.cpp"34 33 #include "RenderStyle.cpp" 35 34 #include "SVGRenderStyle.cpp" -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
r80037 r80041 24 24 25 25 #include "CursorList.h" 26 #include "QuotesData.h"27 26 #include "RenderStyle.h" 28 27 #include "RenderStyleConstants.h" … … 134 133 && hyphenationString == o.hyphenationString 135 134 && hyphenationLocale == o.hyphenationLocale 136 && textEmphasisCustomMark == o.textEmphasisCustomMark 137 && *quotes == *o.quotes; 135 && textEmphasisCustomMark == o.textEmphasisCustomMark; 138 136 } 139 137 -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h
r80037 r80041 35 35 36 36 class CursorList; 37 class QuotesData;38 37 class ShadowData; 39 38 … … 90 89 91 90 AtomicString textEmphasisCustomMark; 92 RefPtr<QuotesData> quotes;93 91 94 92 private:
Note: See TracChangeset
for help on using the changeset viewer.