Changeset 102333 in webkit


Ignore:
Timestamp:
Dec 8, 2011 6:23:10 AM (12 years ago)
Author:
mihnea@adobe.com
Message:

[CSSRegions][CSSOM] Implement NamedFlow interface
​https://bugs.webkit.org/show_bug.cgi?id=66642

Reviewed by David Hyatt.

Add WebKitNamedFlow to support the NamedFlow interface. No methods are
yet implemented on this interface. The NamedFlow object is a live object.
The first time user asks for it, it gets a valid JS object whose properties
will reflect the changes to the flow thread.

Source/WebCore:

Tests: fast/regions/webkit-named-flow-existing-flow.html

fast/regions/webkit-named-flow-flow-added.html
fast/regions/webkit-named-flow-modified-flow.html
fast/regions/webkit-named-flow-non-existing-flow.html
fast/regions/webkit-named-flow-removed-flow.html
fast/regions/webkit-named-flow-same-object.html

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/gobject/GNUmakefile.am:
  • dom/DOMAllInOne.cpp:
  • dom/Document.cpp:

(WebCore::Document::webkitGetFlowByName):

  • dom/Document.h:
  • dom/Document.idl:
  • dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):

  • dom/WebKitNamedFlow.cpp: Added.

(WebCore::WebKitNamedFlow::WebKitNamedFlow):
(WebCore::WebKitNamedFlow::~WebKitNamedFlow):

  • dom/WebKitNamedFlow.h: Added.

(WebCore::WebKitNamedFlow::create):

  • dom/WebKitNamedFlow.idl: Added.
  • rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::ensureNamedFlow):

  • rendering/RenderFlowThread.h:
  • rendering/RenderObject.cpp:

(WebCore::RenderObject::createObject):

  • rendering/RenderView.cpp:

(WebCore::RenderView::ensureRenderFlowThreadWithName):

  • rendering/RenderView.h:

LayoutTests:

  • fast/dom/Window/window-properties-expected.txt:
  • fast/regions/webkit-named-flow-existing-flow-expected.txt: Added.
  • fast/regions/webkit-named-flow-existing-flow.html: Added.
  • fast/regions/webkit-named-flow-flow-added-expected.txt: Added.
  • fast/regions/webkit-named-flow-flow-added.html: Added.
  • fast/regions/webkit-named-flow-modified-flow-expected.txt: Added.
  • fast/regions/webkit-named-flow-modified-flow.html: Added.
  • fast/regions/webkit-named-flow-non-existing-flow-expected.txt: Added.
  • fast/regions/webkit-named-flow-non-existing-flow.html: Added.
  • fast/regions/webkit-named-flow-removed-flow-expected.txt: Added.
  • fast/regions/webkit-named-flow-removed-flow.html: Added.
  • fast/regions/webkit-named-flow-same-object-expected.txt: Added.
  • fast/regions/webkit-named-flow-same-object.html: Added.
  • platform/gtk/fast/dom/Window/window-properties-expected.txt:
  • platform/mac/fast/dom/Window/window-properties-expected.txt:
  • platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
  • platform/qt/fast/dom/Window/window-properties-expected.txt:
  • platform/win/fast/dom/Window/window-properties-expected.txt:
Location:
trunk
Files:
15 added
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r102327 r102333  
     12011-12-08  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions][CSSOM] Implement NamedFlow interface
     4        https://bugs.webkit.org/show_bug.cgi?id=66642
     5
     6        Reviewed by David Hyatt.
     7
     8        Add WebKitNamedFlow to support the NamedFlow interface. No methods are
     9        yet implemented on this interface. The NamedFlow object is a live object.
     10        The first time user asks for it, it gets a valid JS object whose properties
     11        will reflect the changes to the flow thread.
     12
     13        * fast/dom/Window/window-properties-expected.txt:
     14        * fast/regions/webkit-named-flow-existing-flow-expected.txt: Added.
     15        * fast/regions/webkit-named-flow-existing-flow.html: Added.
     16        * fast/regions/webkit-named-flow-flow-added-expected.txt: Added.
     17        * fast/regions/webkit-named-flow-flow-added.html: Added.
     18        * fast/regions/webkit-named-flow-modified-flow-expected.txt: Added.
     19        * fast/regions/webkit-named-flow-modified-flow.html: Added.
     20        * fast/regions/webkit-named-flow-non-existing-flow-expected.txt: Added.
     21        * fast/regions/webkit-named-flow-non-existing-flow.html: Added.
     22        * fast/regions/webkit-named-flow-removed-flow-expected.txt: Added.
     23        * fast/regions/webkit-named-flow-removed-flow.html: Added.
     24        * fast/regions/webkit-named-flow-same-object-expected.txt: Added.
     25        * fast/regions/webkit-named-flow-same-object.html: Added.
     26        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
     27        * platform/mac/fast/dom/Window/window-properties-expected.txt:
     28        * platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
     29        * platform/qt/fast/dom/Window/window-properties-expected.txt:
     30        * platform/win/fast/dom/Window/window-properties-expected.txt:
     31
    1322011-12-08  Takashi Toyoshima  <toyoshim@chromium.org>
    233

  • trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt

    r101899 r102333  
    681681window.Document.prototype.replaceChild [function]
    682682window.Document.prototype.webkitCancelFullScreen [function]
     683window.Document.prototype.webkitGetFlowByName [function]
    683684window.DocumentFragment [object DocumentFragmentConstructor]
    684685window.DocumentFragment.prototype [object DocumentFragmentPrototype]

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt

    r101899 r102333  
    733733window.Document.prototype.replaceChild [function]
    734734window.Document.prototype.webkitCancelFullScreen [function]
     735window.Document.prototype.webkitGetFlowByName [function]
    735736window.DocumentFragment [object DocumentFragmentConstructor]
    736737window.DocumentFragment.prototype [object DocumentFragmentPrototype]

  • trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt

    r101899 r102333  
    758758window.Document.prototype.replaceChild [function]
    759759window.Document.prototype.webkitCancelFullScreen [function]
     760window.Document.prototype.webkitGetFlowByName [function]
    760761window.DocumentFragment [object DocumentFragmentConstructor]
    761762window.DocumentFragment.prototype [object DocumentFragmentPrototype]

  • trunk/LayoutTests/platform/qt-wk2/fast/dom/Window/window-properties-expected.txt

    r101899 r102333  
    679679window.Document.prototype.removeEventListener [function]
    680680window.Document.prototype.replaceChild [function]
     681window.Document.prototype.webkitGetFlowByName [function]
    681682window.DocumentFragment [object DocumentFragmentConstructor]
    682683window.DocumentFragment.prototype [object DocumentFragmentPrototype]

  • trunk/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt

    r101899 r102333  
    732732window.Document.prototype.removeEventListener [function]
    733733window.Document.prototype.replaceChild [function]
     734window.Document.prototype.webkitGetFlowByName [function]
    734735window.DocumentFragment [object DocumentFragmentConstructor]
    735736window.DocumentFragment.prototype [object DocumentFragmentPrototype]

  • trunk/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt

    r101899 r102333  
    680680window.Document.prototype.replaceChild [function]
    681681window.Document.prototype.webkitCancelFullScreen [function]
     682window.Document.prototype.webkitGetFlowByName [function]
    682683window.DocumentFragment [object DocumentFragmentConstructor]
    683684window.DocumentFragment.prototype [object DocumentFragmentPrototype]

  • trunk/Source/WebCore/CMakeLists.txt

    r102187 r102333  
    189189    dom/WebKitAnimationEvent.idl
    190190    dom/WebKitMutationObserver.idl
     191    dom/WebKitNamedFlow.idl
    191192    dom/WebKitTransitionEvent.idl
    192193    dom/WheelEvent.idl
    … …  
    613614    dom/WebKitAnimationEvent.cpp
    614615    dom/WebKitMutationObserver.cpp
     616    dom/WebKitNamedFlow.cpp
    615617    dom/WebKitTransitionEvent.cpp
    616618    dom/WheelEvent.cpp

  • trunk/Source/WebCore/ChangeLog

    r102330 r102333  
     12011-12-08  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions][CSSOM] Implement NamedFlow interface
     4        https://bugs.webkit.org/show_bug.cgi?id=66642
     5
     6        Reviewed by David Hyatt.
     7
     8        Add WebKitNamedFlow to support the NamedFlow interface. No methods are
     9        yet implemented on this interface. The NamedFlow object is a live object.
     10        The first time user asks for it, it gets a valid JS object whose properties
     11        will reflect the changes to the flow thread.
     12
     13        Tests: fast/regions/webkit-named-flow-existing-flow.html
     14               fast/regions/webkit-named-flow-flow-added.html
     15               fast/regions/webkit-named-flow-modified-flow.html
     16               fast/regions/webkit-named-flow-non-existing-flow.html
     17               fast/regions/webkit-named-flow-removed-flow.html
     18               fast/regions/webkit-named-flow-same-object.html
     19
     20        * CMakeLists.txt:
     21        * DerivedSources.cpp:
     22        * DerivedSources.make:
     23        * DerivedSources.pri:
     24        * GNUmakefile.list.am:
     25        * Target.pri:
     26        * WebCore.gypi:
     27        * WebCore.vcproj/WebCore.vcproj:
     28        * WebCore.xcodeproj/project.pbxproj:
     29        * bindings/gobject/GNUmakefile.am:
     30        * dom/DOMAllInOne.cpp:
     31        * dom/Document.cpp:
     32        (WebCore::Document::webkitGetFlowByName):
     33        * dom/Document.h:
     34        * dom/Document.idl:
     35        * dom/NodeRenderingContext.cpp:
     36        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
     37        * dom/WebKitNamedFlow.cpp: Added.
     38        (WebCore::WebKitNamedFlow::WebKitNamedFlow):
     39        (WebCore::WebKitNamedFlow::~WebKitNamedFlow):
     40        * dom/WebKitNamedFlow.h: Added.
     41        (WebCore::WebKitNamedFlow::create):
     42        * dom/WebKitNamedFlow.idl: Added.
     43        * rendering/RenderFlowThread.cpp:
     44        (WebCore::RenderFlowThread::ensureNamedFlow):
     45        * rendering/RenderFlowThread.h:
     46        * rendering/RenderObject.cpp:
     47        (WebCore::RenderObject::createObject):
     48        * rendering/RenderView.cpp:
     49        (WebCore::RenderView::ensureRenderFlowThreadWithName):
     50        * rendering/RenderView.h:
     51
    1522011-12-08  Sheriff Bot  <webkit.review.bot@gmail.com>
    253

  • trunk/Source/WebCore/DerivedSources.cpp

    r101144 r102333  
    469469#include "JSWebKitCSSMatrix.cpp"
    470470#include "JSWebKitMutationObserver.cpp"
     471#include "JSWebKitNamedFlow.cpp"
    471472#include "JSWebKitPoint.cpp"
    472473#include "JSWebKitTransitionEvent.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r101578 r102333  
    551551    WebKitLoseContext \
    552552    WebKitMutationObserver \
     553        WebKitNamedFlow \
    553554    WebKitPoint \
    554555    WebKitTransitionEvent \

  • trunk/Source/WebCore/DerivedSources.pri

    r101376 r102333  
    175175    dom/UIEvent.idl \
    176176    dom/WebKitAnimationEvent.idl \
     177    dom/WebKitNamedFlow.idl \
    177178    dom/WebKitTransitionEvent.idl \
    178179    dom/WheelEvent.idl \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r102187 r102333  
    581581        DerivedSources/WebCore/JSWebKitLoseContext.cpp \
    582582        DerivedSources/WebCore/JSWebKitLoseContext.h \
     583        DerivedSources/WebCore/JSWebKitNamedFlow.cpp \
     584        DerivedSources/WebCore/JSWebKitNamedFlow.h \
    583585        DerivedSources/WebCore/JSWebKitPoint.cpp \
    584586        DerivedSources/WebCore/JSWebKitPoint.h \
    … …  
    13871389        Source/WebCore/dom/WebKitMutationObserver.cpp \
    13881390        Source/WebCore/dom/WebKitMutationObserver.h \
     1391        Source/WebCore/dom/WebKitNamedFlow.cpp \
     1392        Source/WebCore/dom/WebKitNamedFlow.h \
    13891393        Source/WebCore/dom/WebKitTransitionEvent.cpp \
    13901394        Source/WebCore/dom/WebKitTransitionEvent.h \

  • trunk/Source/WebCore/Target.pri

    r102239 r102333  
    581581    dom/WebKitAnimationEvent.cpp \
    582582    dom/WebKitMutationObserver.cpp \
     583    dom/WebKitNamedFlow.cpp \
    583584    dom/WebKitTransitionEvent.cpp \
    584585    dom/WheelEvent.cpp \
    … …  
    16691670    dom/WebKitAnimationEvent.h \
    16701671    dom/WebKitMutationObserver.h \
     1672    dom/WebKitNamedFlow.h \
    16711673    dom/WebKitTransitionEvent.h \
    16721674    dom/WheelEvent.h \

  • trunk/Source/WebCore/WebCore.gypi

    r102330 r102333  
    406406            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMTreeWalker.h',
    407407            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMUIEvent.h',
     408            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitNamedFlow.h',
     409            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitNamedFlowInternal.h',
    408410            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWheelEvent.h',
    409411            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMXPathExpression.h',
    … …  
    12291231            'dom/WebKitAnimationEvent.idl',
    12301232            'dom/WebKitMutationObserver.idl',
     1233            'dom/WebKitNamedFlow.idl',
    12311234            'dom/WebKitTransitionEvent.idl',
    12321235            'dom/WheelEvent.idl',
    … …  
    54255428            'dom/WebKitMutationObserver.cpp',
    54265429            'dom/WebKitMutationObserver.h',
     5430            'dom/WebKitNamedFlow.cpp',
     5431            'dom/WebKitNamedFlow.h',
    54275432            'dom/WebKitTransitionEvent.cpp',
    54285433            'dom/WebKitTransitionEvent.h',
    … …  
    81578162            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitPoint.cpp',
    81588163            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitPoint.h',
     8164            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitNamedFlow.cpp',
     8165            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitNamedFlow.h',
    81598166            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitTransitionEvent.cpp',
    81608167            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitTransitionEvent.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r102187 r102333  
    2261022610                                >
    2261122611                        </File>
     22612             <File
     22613                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitNamedFlow.cpp"
     22614                                >
     22615                                <FileConfiguration
     22616                                        Name="Debug|Win32"
     22617                                        ExcludedFromBuild="true"
     22618                                        >
     22619                                        <Tool
     22620                                                Name="VCCLCompilerTool"
     22621                                        />
     22622                                </FileConfiguration>
     22623                                <FileConfiguration
     22624                                        Name="Release|Win32"
     22625                                        ExcludedFromBuild="true"
     22626                                        >
     22627                                        <Tool
     22628                                                Name="VCCLCompilerTool"
     22629                                        />
     22630                                </FileConfiguration>
     22631                                <FileConfiguration
     22632                                        Name="Debug_Cairo_CFLite|Win32"
     22633                                        ExcludedFromBuild="true"
     22634                                        >
     22635                                        <Tool
     22636                                                Name="VCCLCompilerTool"
     22637                                        />
     22638                                </FileConfiguration>
     22639                                <FileConfiguration
     22640                                        Name="Release_Cairo_CFLite|Win32"
     22641                                        ExcludedFromBuild="true"
     22642                                        >
     22643                                        <Tool
     22644                                                Name="VCCLCompilerTool"
     22645                                        />
     22646                                </FileConfiguration>
     22647                                <FileConfiguration
     22648                                        Name="Debug_All|Win32"
     22649                                        ExcludedFromBuild="true"
     22650                                        >
     22651                                        <Tool
     22652                                                Name="VCCLCompilerTool"
     22653                                        />
     22654                                </FileConfiguration>
     22655                                <FileConfiguration
     22656                                        Name="Production|Win32"
     22657                                        ExcludedFromBuild="true"
     22658                                        >
     22659                                        <Tool
     22660                                                Name="VCCLCompilerTool"
     22661                                        />
     22662                                </FileConfiguration>
     22663                        </File>
     22664                        <File
     22665                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitNamedFlow.h"
     22666                                >
     22667                        </File>
    2261222668                        <File
    2261322669                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitPoint.cpp"
    … …  
    4966349719                        </File>
    4966449720                        <File
     49721                                RelativePath="..\dom\WebKitNamedFlow.cpp"
     49722                                >
     49723                                <FileConfiguration
     49724                                        Name="Debug|Win32"
     49725                                        ExcludedFromBuild="true"
     49726                                        >
     49727                                        <Tool
     49728                                                Name="VCCLCompilerTool"
     49729                                        />
     49730                                </FileConfiguration>
     49731                                <FileConfiguration
     49732                                        Name="Release|Win32"
     49733                                        ExcludedFromBuild="true"
     49734                                        >
     49735                                        <Tool
     49736                                                Name="VCCLCompilerTool"
     49737                                        />
     49738                                </FileConfiguration>
     49739                                <FileConfiguration
     49740                                        Name="Debug_Cairo_CFLite|Win32"
     49741                                        ExcludedFromBuild="true"
     49742                                        >
     49743                                        <Tool
     49744                                                Name="VCCLCompilerTool"
     49745                                        />
     49746                                </FileConfiguration>
     49747                                <FileConfiguration
     49748                                        Name="Release_Cairo_CFLite|Win32"
     49749                                        ExcludedFromBuild="true"
     49750                                        >
     49751                                        <Tool
     49752                                                Name="VCCLCompilerTool"
     49753                                        />
     49754                                </FileConfiguration>
     49755                                <FileConfiguration
     49756                                        Name="Debug_All|Win32"
     49757                                        ExcludedFromBuild="true"
     49758                                        >
     49759                                        <Tool
     49760                                                Name="VCCLCompilerTool"
     49761                                        />
     49762                                </FileConfiguration>
     49763                                <FileConfiguration
     49764                                        Name="Production|Win32"
     49765                                        ExcludedFromBuild="true"
     49766                                        >
     49767                                        <Tool
     49768                                                Name="VCCLCompilerTool"
     49769                                        />
     49770                                </FileConfiguration>
     49771                        </File>
     49772                        <File
     49773                                RelativePath="..\dom\WebKitNamedFlow.h"
     49774                                >
     49775                        </File>
     49776                        <File
    4966549777                                RelativePath="..\dom\WebKitTransitionEvent.cpp"
    4966649778                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r102187 r102333  
    29162916                89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 89D08D9E12228451001241DF /* AsyncFileSystemCallbacks.h */; };
    29172917                8A12E35D11FA33280025836A /* DocumentLoadTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A12E35C11FA33280025836A /* DocumentLoadTiming.h */; settings = {ATTRIBUTES = (Private, ); }; };
     2918                8A195932147EA16E00D1EA61 /* DOMWebKitNamedFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A19592F147EA16E00D1EA61 /* DOMWebKitNamedFlow.h */; };
     2919                8A195933147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8A195930147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm */; };
     2920                8A195934147EA16E00D1EA61 /* DOMWebKitNamedFlowInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A195931147EA16E00D1EA61 /* DOMWebKitNamedFlowInternal.h */; };
    29182921                8A309C9F123950BE00CB9204 /* NestingLevelIncrementer.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A309C9E123950BE00CB9204 /* NestingLevelIncrementer.h */; };
    29192922                8A413AE01207BBA50082016E /* ScriptRunner.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A413ADE1207BBA50082016E /* ScriptRunner.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    58155818                D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D70AD65513E1342B005B50B4 /* RenderRegion.cpp */; };
    58165819                D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = D70AD65613E1342B005B50B4 /* RenderRegion.h */; };
     5820                D7613A501474F13F00DB8606 /* WebKitNamedFlow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D7613A4E1474F13F00DB8606 /* WebKitNamedFlow.cpp */; };
     5821                D7613AC414753E5600DB8606 /* JSWebKitNamedFlow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D7613AC214753E5600DB8606 /* JSWebKitNamedFlow.cpp */; };
    58175822                D8B6152F1032495100C8554A /* Cookie.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6152E1032495100C8554A /* Cookie.h */; settings = {ATTRIBUTES = (Private, ); }; };
    58185823                DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */; };
    … …  
    1011710122                89D08D9E12228451001241DF /* AsyncFileSystemCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncFileSystemCallbacks.h; sourceTree = "<group>"; };
    1011810123                8A12E35C11FA33280025836A /* DocumentLoadTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentLoadTiming.h; sourceTree = "<group>"; };
     10124                8A19592F147EA16E00D1EA61 /* DOMWebKitNamedFlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitNamedFlow.h; sourceTree = "<group>"; };
     10125                8A195930147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitNamedFlow.mm; sourceTree = "<group>"; };
     10126                8A195931147EA16E00D1EA61 /* DOMWebKitNamedFlowInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitNamedFlowInternal.h; sourceTree = "<group>"; };
    1011910127                8A309C9E123950BE00CB9204 /* NestingLevelIncrementer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NestingLevelIncrementer.h; path = parser/NestingLevelIncrementer.h; sourceTree = "<group>"; };
    1012010128                8A413ADE1207BBA50082016E /* ScriptRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptRunner.h; sourceTree = "<group>"; };
    … …  
    1316913177                D70AD65513E1342B005B50B4 /* RenderRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderRegion.cpp; sourceTree = "<group>"; };
    1317013178                D70AD65613E1342B005B50B4 /* RenderRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderRegion.h; sourceTree = "<group>"; };
     13179                D7613A4A1474EE9500DB8606 /* WebKitNamedFlow.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitNamedFlow.idl; sourceTree = "<group>"; };
     13180                D7613A4D1474F13F00DB8606 /* WebKitNamedFlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitNamedFlow.h; sourceTree = "<group>"; };
     13181                D7613A4E1474F13F00DB8606 /* WebKitNamedFlow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitNamedFlow.cpp; sourceTree = "<group>"; };
     13182                D7613AC214753E5600DB8606 /* JSWebKitNamedFlow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitNamedFlow.cpp; sourceTree = "<group>"; };
     13183                D7613AC314753E5600DB8606 /* JSWebKitNamedFlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitNamedFlow.h; sourceTree = "<group>"; };
    1317113184                D8B6152E1032495100C8554A /* Cookie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cookie.h; sourceTree = "<group>"; };
    1317213185                DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IndentOutdentCommand.cpp; sourceTree = "<group>"; };
    … …  
    1582215835                                85ACA99A0A9B575900671E90 /* DOMText.h */,
    1582315836                                85ACA99B0A9B575900671E90 /* DOMText.mm */,
     15837                                8A19592F147EA16E00D1EA61 /* DOMWebKitNamedFlow.h */,
     15838                                8A195930147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm */,
     15839                                8A195931147EA16E00D1EA61 /* DOMWebKitNamedFlowInternal.h */,
    1582415840                        );
    1582515841                        name = Core;
    … …  
    1838218398                                C6F0902414327D4F00685849 /* JSWebKitMutationObserver.cpp */,
    1838318399                                C6F0902514327D4F00685849 /* JSWebKitMutationObserver.h */,
     18400                                D7613AC214753E5600DB8606 /* JSWebKitNamedFlow.cpp */,
     18401                                D7613AC314753E5600DB8606 /* JSWebKitNamedFlow.h */,
    1838418402                        );
    1838518403                        name = Core;
    … …  
    2138221400                                C6F0900614327B6100685849 /* WebKitMutationObserver.h */,
    2138321401                                C6F0900714327B6100685849 /* WebKitMutationObserver.idl */,
     21402                                D7613A4A1474EE9500DB8606 /* WebKitNamedFlow.idl */,
     21403                                D7613A4D1474F13F00DB8606 /* WebKitNamedFlow.h */,
     21404                                D7613A4E1474F13F00DB8606 /* WebKitNamedFlow.cpp */,
    2138421405                                31C0FF1E0E4CEB6E007D6FE5 /* WebKitTransitionEvent.cpp */,
    2138521406                                31C0FF1F0E4CEB6E007D6FE5 /* WebKitTransitionEvent.h */,
    … …  
    2475624777                                6E3FAE8F14733FDB00E42306 /* WebGLCompressedTextures.h in Headers */,
    2475724778                                265541391489811C000DFC5D /* KeyEventCodesIOS.h in Headers */,
     24779                                8A195932147EA16E00D1EA61 /* DOMWebKitNamedFlow.h in Headers */,
     24780                                8A195934147EA16E00D1EA61 /* DOMWebKitNamedFlowInternal.h in Headers */,
    2475824781                        );
    2475924782                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2763227655                                6E3FAE8E14733FDB00E42306 /* WebGLCompressedTextures.cpp in Sources */,
    2763327656                                2655413A1489811C000DFC5D /* KeyEventIOS.mm in Sources */,
     27657                                D7613A501474F13F00DB8606 /* WebKitNamedFlow.cpp in Sources */,
     27658                                D7613AC414753E5600DB8606 /* JSWebKitNamedFlow.cpp in Sources */,
     27659                                8A195933147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm in Sources */,
    2763427660                        );
    2763527661                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/bindings/gobject/GNUmakefile.am

    r101244 r102333  
    247247        DerivedSources/webkit/WebKitDOMWebKitPoint.cpp \
    248248        DerivedSources/webkit/WebKitDOMWebKitPointPrivate.h \
     249        DerivedSources/webkit/WebKitDOMWebKitNamedFlow.cpp \
    249250        DerivedSources/webkit/WebKitDOMXPathExpression.cpp \
    250251        DerivedSources/webkit/WebKitDOMXPathExpressionPrivate.h \
    … …  
    376377        DerivedSources/webkit/WebKitDOMWebKitAnimationList.h \
    377378        DerivedSources/webkit/WebKitDOMWebKitPoint.h \
     379        DerivedSources/webkit/WebKitDOMWebKitNamedFlow.h \
    378380        DerivedSources/webkit/WebKitDOMDOMMimeType.h \
    379381        DerivedSources/webkit/WebKitDOMDOMMimeTypeArray.h \

  • trunk/Source/WebCore/dom/DOMAllInOne.cpp

    r99464 r102333  
    137137#include "ViewportArguments.cpp"
    138138#include "WebKitAnimationEvent.cpp"
     139#include "WebKitNamedFlow.cpp"
    139140#include "WebKitTransitionEvent.cpp"
    140141#include "WheelEvent.cpp"

  • trunk/Source/WebCore/dom/Document.cpp

    r102278 r102333  
    119119#include "RegisteredEventListener.h"
    120120#include "RenderArena.h"
     121#include "RenderFlowThread.h"
    121122#include "RenderLayer.h"
    122123#include "RenderLayerBacking.h"
    … …  
    143144#include "TreeWalker.h"
    144145#include "UserContentURLPattern.h"
     146#include "WebKitNamedFlow.h"
    145147#include "XMLDocumentParser.h"
    146148#include "XMLHttpRequest.h"
    … …  
    991993
    992994    return e.release();
     995}
     996
     997PassRefPtr<WebKitNamedFlow> Document::webkitGetFlowByName(const String& flowName)
     998{
     999    if (!renderer())
     1000        return 0;
     1001    if (RenderView* view = renderer()->view())
     1002        return view->ensureRenderFlowThreadWithName(flowName)->ensureNamedFlow();
     1003    return 0;
    9931004}
    9941005

  • trunk/Source/WebCore/dom/Document.h

    r102278 r102333  
    131131class DocumentParser;
    132132class TreeWalker;
     133class WebKitNamedFlow;
    133134class XMLHttpRequest;
    134135class XPathEvaluator;
    … …  
    352353    PassRefPtr<Element> createElement(const QualifiedName&, bool createdByParser);
    353354
     355    PassRefPtr<WebKitNamedFlow> webkitGetFlowByName(const String&);
     356
    354357    /**
    355358     * Retrieve all nodes that intersect a rect in the window's document, until it is fully enclosed by

  • trunk/Source/WebCore/dom/Document.idl

    r99612 r102333  
    247247        [EnabledAtRuntime] void webkitCancelFullScreen();
    248248#endif
     249
     250        WebKitNamedFlow webkitGetFlowByName(in DOMString name);
    249251
    250252#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C

  • trunk/Source/WebCore/dom/NodeRenderingContext.cpp

    r95901 r102333  
    280280    m_flowThread = m_style->flowThread();
    281281    ASSERT(m_node->document()->renderView());
    282     m_parentFlowRenderer = m_node->document()->renderView()->renderFlowThreadWithName(m_flowThread);
     282    m_parentFlowRenderer = m_node->document()->renderView()->ensureRenderFlowThreadWithName(m_flowThread);
    283283}
    284284

  • trunk/Source/WebCore/rendering/RenderFlowThread.cpp

    r102234 r102333  
    4141#include "RenderView.h"
    4242#include "TransformState.h"
     43#include "WebKitNamedFlow.h"
    4344
    4445namespace WebCore {
    … …  
    816817    endRegion = range->endRegion();
    817818}
    818    
     819
     820WebKitNamedFlow* RenderFlowThread::ensureNamedFlow()
     821{
     822    if (!m_namedFlow)
     823        m_namedFlow = WebKitNamedFlow::create();
     824
     825    return m_namedFlow.get();
     826}
     827
    819828} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderFlowThread.h

    r102234 r102333  
    4444class RenderStyle;
    4545class RenderRegion;
     46class WebKitNamedFlow;
    4647
    4748typedef ListHashSet<RenderFlowThread*> RenderFlowThreadList;
    … …  
    7576    void addFlowChild(RenderObject* newChild, RenderObject* beforeChild = 0);
    7677    void removeFlowChild(RenderObject*);
     78    bool hasChildren() const { return !m_flowThreadChildList.isEmpty(); }
    7779
    7880    void addRegionToThread(RenderRegion*);
    … …  
    125127                                      const RenderRegion* oldStartRegion = 0, const RenderRegion* oldEndRegion = 0,
    126128                                      const RenderRegion* newStartRegion = 0, const RenderRegion* newEndRegion = 0);
     129
     130    WebKitNamedFlow* ensureNamedFlow();
    127131
    128132private:
    … …  
    183187    bool m_regionsHaveUniformLogicalWidth;
    184188    bool m_regionsHaveUniformLogicalHeight;
     189    RefPtr<WebKitNamedFlow> m_namedFlow;
    185190};
    186191

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r102268 r102333  
    147147        // Only non-replaced block elements can become a region.
    148148        if (!style->regionThread().isEmpty() && doc->renderView())
    149             return new (arena) RenderRegion(node, doc->renderView()->renderFlowThreadWithName(style->regionThread()));
     149            return new (arena) RenderRegion(node, doc->renderView()->ensureRenderFlowThreadWithName(style->regionThread()));
    150150        return new (arena) RenderBlock(node);
    151151    case LIST_ITEM:

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r102234 r102333  
    880880}
    881881
    882 RenderFlowThread* RenderView::renderFlowThreadWithName(const AtomicString& flowThread)
     882RenderFlowThread* RenderView::ensureRenderFlowThreadWithName(const AtomicString& flowThread)
    883883{
    884884    if (!m_renderFlowThreadList)
    … …  
    895895    flowRenderer->setStyle(RenderFlowThread::createFlowThreadStyle(style()));
    896896    addChild(flowRenderer);
    897    
     897
    898898    m_renderFlowThreadList->add(flowRenderer);
    899899    setIsRenderFlowThreadOrderDirty(true);

  • trunk/Source/WebCore/rendering/RenderView.h

    r102234 r102333  
    173173    IntRect documentRect() const;
    174174
    175     RenderFlowThread* renderFlowThreadWithName(const AtomicString& flowThread);
     175    RenderFlowThread* ensureRenderFlowThreadWithName(const AtomicString& flowThread);
    176176    bool hasRenderFlowThreads() const { return m_renderFlowThreadList && !m_renderFlowThreadList->isEmpty(); }
    177177    void layoutRenderFlowThreads();
Note: See TracChangeset for help on using the changeset viewer.