Changeset 91955 in webkit
- Timestamp:
- Jul 28, 2011 4:33:38 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 11 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r91953 r91955 1 2011-07-28 Mihnea Ovidenie <mihnea@adobe.com> 2 3 [CSSRegions]Add basic RenderRegion support 4 https://bugs.webkit.org/show_bug.cgi?id=64689 5 6 Reviewed by David Hyatt. 7 8 * fast/regions/region-element-display-restriction-expected.txt: Added. 9 * fast/regions/region-element-display-restriction.html: Added. 10 * fast/regions/region-element-dynamic-attach-flow-expected.txt: Added. 11 * fast/regions/region-element-dynamic-attach-flow.html: Added. 12 * fast/regions/region-element-dynamic-detach-flow-expected.txt: Added. 13 * fast/regions/region-element-dynamic-detach-flow.html: Added. 14 * fast/regions/render-region-renderer-expected.txt: Added. 15 * fast/regions/render-region-renderer.html: Added. 16 * fast/regions/script-tests/region-element-display-restriction.js: Added. 17 1 18 2011-07-28 Adrienne Walker <enne@google.com> 2 19 -
trunk/Source/WebCore/ChangeLog
r91954 r91955 1 2011-07-28 Mihnea Ovidenie <mihnea@adobe.com> 2 3 [CSSRegions]Add basic RenderRegion support 4 https://bugs.webkit.org/show_bug.cgi?id=64689 5 6 Reviewed by David Hyatt. 7 8 This patch introduces the RenderRegion object. 9 A RenderObject that takes its content from a "named" flow will become a RenderRegion, an element that is used to display the content from a RenderFlowThread. 10 A RenderRegion that is marked to take its content from a non existing flow, will have its content disconnected from the normal flow. 11 12 Tests: fast/regions/region-element-display-restriction.html 13 fast/regions/region-element-dynamic-attach-flow.html 14 fast/regions/region-element-dynamic-detach-flow.html 15 fast/regions/render-region-renderer.html 16 17 * WebCore.vcproj/WebCore.vcproj: 18 * WebCore.xcodeproj/project.pbxproj: 19 * dom/Node.cpp: 20 (WebCore::Node::diff): 21 * rendering/RenderObject.cpp: 22 (WebCore::RenderObject::createObject): 23 * rendering/RenderObject.h: 24 (WebCore::RenderObject::isRenderRegion): 25 * rendering/RenderRegion.cpp: Added. 26 (WebCore::RenderRegion::RenderRegion): 27 (WebCore::RenderRegion::~RenderRegion): 28 (WebCore::RenderRegion::layout): 29 (WebCore::RenderRegion::paint): 30 * rendering/RenderRegion.h: Added. 31 (WebCore::RenderRegion::isRenderRegion): 32 (WebCore::RenderRegion::renderName): 33 (WebCore::toRenderRegion): 34 * rendering/style/RenderStyle.cpp: 35 (WebCore::RenderStyle::diff): 36 1 37 2011-07-28 Marco Peereboom <marco@peereboom.us> 2 38 -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r91936 r91955 36367 36367 </File> 36368 36368 <File 36369 RelativePath="..\rendering\RenderRegion.h" 36370 > 36371 </File> 36372 <File 36373 RelativePath="..\rendering\RenderRegion.cpp" 36374 > 36375 </File> 36376 <File 36369 36377 RelativePath="..\rendering\RenderReplaced.cpp" 36370 36378 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r91936 r91955 5460 5460 D3D4E972130C7CFE007BA540 /* HTMLSummaryElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3D4E970130C7CFE007BA540 /* HTMLSummaryElement.cpp */; }; 5461 5461 D3D4E973130C7CFE007BA540 /* HTMLSummaryElement.h in Headers */ = {isa = PBXBuildFile; fileRef = D3D4E971130C7CFE007BA540 /* HTMLSummaryElement.h */; }; 5462 D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D70AD65513E1342B005B50B4 /* RenderRegion.cpp */; }; 5463 D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = D70AD65613E1342B005B50B4 /* RenderRegion.h */; }; 5462 5464 D8B6152F1032495100C8554A /* Cookie.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6152E1032495100C8554A /* Cookie.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5463 5465 DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */; }; … … 12164 12166 D3D4E970130C7CFE007BA540 /* HTMLSummaryElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLSummaryElement.cpp; sourceTree = "<group>"; }; 12165 12167 D3D4E971130C7CFE007BA540 /* HTMLSummaryElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLSummaryElement.h; sourceTree = "<group>"; }; 12168 D70AD65513E1342B005B50B4 /* RenderRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderRegion.cpp; sourceTree = "<group>"; }; 12169 D70AD65613E1342B005B50B4 /* RenderRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderRegion.h; sourceTree = "<group>"; }; 12166 12170 D8B6152E1032495100C8554A /* Cookie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cookie.h; sourceTree = "<group>"; }; 12167 12171 DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IndentOutdentCommand.cpp; sourceTree = "<group>"; }; … … 19551 19555 5A574F22131DB93900471B88 /* RenderQuote.cpp */, 19552 19556 5A574F23131DB93900471B88 /* RenderQuote.h */, 19557 D70AD65513E1342B005B50B4 /* RenderRegion.cpp */, 19558 D70AD65613E1342B005B50B4 /* RenderRegion.h */, 19553 19559 A871DFDE0A15376B00B12A68 /* RenderReplaced.cpp */, 19554 19560 A871DFDF0A15376B00B12A68 /* RenderReplaced.h */, … … 23259 23265 FD537353137B651800008DCE /* ZeroPole.h in Headers */, 23260 23266 508CCA4F13CF106B003151F3 /* RenderFlowThread.h in Headers */, 23267 D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */, 23261 23268 ); 23262 23269 runOnlyForDeploymentPostprocessing = 0; … … 26046 26053 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */, 26047 26054 508CCA5013CF106B003151F3 /* RenderFlowThread.cpp in Sources */, 26055 D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */, 26048 26056 ); 26049 26057 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/dom/Node.cpp
r91760 r91955 362 362 if ((s1 && s2) && (s1->flowThread() != s2->flowThread())) 363 363 ch = Detach; 364 365 // When either the region thread or the region index has changed, 366 // we need to prepare a separate render region object. 367 if ((s1 && s2) && ((s1->regionThread() != s2->regionThread() || (s1->regionIndex() != s2->regionIndex())))) 368 ch = Detach; 364 369 #endif 365 370 -
trunk/Source/WebCore/rendering/RenderObject.cpp
r91907 r91955 50 50 #include "RenderLayer.h" 51 51 #include "RenderListItem.h" 52 #include "RenderRegion.h" 52 53 #include "RenderRuby.h" 53 54 #include "RenderRubyText.h" … … 136 137 case RUN_IN: 137 138 case COMPACT: 139 #if ENABLE(CSS_REGIONS) 140 // Only non-replaced block elements can become a region. 141 if (!style->regionThread().isEmpty()) 142 return new (arena) RenderRegion(node); 143 #endif 138 144 return new (arena) RenderBlock(node); 139 145 case LIST_ITEM: -
trunk/Source/WebCore/rendering/RenderObject.h
r91760 r91955 431 431 bool isReplaced() const { return m_replaced; } // a "replaced" element (see CSS) 432 432 bool isHorizontalWritingMode() const { return m_horizontalWritingMode; } 433 434 #if ENABLE(CSS_REGIONS) 435 virtual bool isRenderRegion() const { return false; } 436 #endif 433 437 434 438 bool hasLayer() const { return m_hasLayer; } -
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
r91760 r91955 350 350 351 351 #if ENABLE(CSS_REGIONS) 352 if (rareNonInheritedData->m_regionThread != other->rareNonInheritedData->m_regionThread 353 || rareNonInheritedData->m_regionIndex != other->rareNonInheritedData->m_regionIndex 354 || rareNonInheritedData->m_regionOverflow != other->rareNonInheritedData->m_regionOverflow) 352 if (rareNonInheritedData->m_regionOverflow != other->rareNonInheritedData->m_regionOverflow) 355 353 return StyleDifferenceLayout; 356 354 #endif
Note: See TracChangeset
for help on using the changeset viewer.