Changeset 150837 in webkit


Ignore:
Timestamp:
May 28, 2013 2:50:46 PM (11 years ago)
Author:
andersca@apple.com
Message:

Create a html/forms subdirectory and move FileIconLoader there
​https://bugs.webkit.org/show_bug.cgi?id=116880

Reviewed by Jessie Berlin.

A lot (if not the majority) of files in html/ are forms related, so it makes sense to begin splitting
them out into a separate subdirectory, html/forms.

Begin my moving FileIconLoader from platform to html/forms. It is related to HTML forms (it's only used by
the file upload element), and is not really a platform abstraction so it doesn't belong in platform.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • html/forms/FileIconLoader.cpp: Renamed from Source/WebCore/platform/FileIconLoader.cpp.
  • html/forms/FileIconLoader.h: Renamed from Source/WebCore/platform/FileIconLoader.h.
Location:
trunk/Source
Files:
1 added
12 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r150719 r150837  
    3030    "${WEBCORE_DIR}/html"
    3131    "${WEBCORE_DIR}/html/canvas"
     32    "${WEBCORE_DIR}/html/forms"
    3233    "${WEBCORE_DIR}/html/parser"
    3334    "${WEBCORE_DIR}/html/shadow"
    … …  
    15291530    html/canvas/WebGLVertexArrayObjectOES.cpp
    15301531
     1532    html/forms/FileIconLoader.cpp
     1533
    15311534    html/parser/BackgroundHTMLInputStream.cpp
    15321535    html/parser/BackgroundHTMLParser.cpp
    … …  
    18141817    platform/DragImage.cpp
    18151818    platform/FileChooser.cpp
    1816     platform/FileIconLoader.cpp
    18171819    platform/FileStream.cpp
    18181820    platform/FileSystem.cpp

  • trunk/Source/WebCore/ChangeLog

    r150836 r150837  
     12013-05-28  Anders Carlsson  <andersca@apple.com>
     2
     3        Create a html/forms subdirectory and move FileIconLoader there
     4        https://bugs.webkit.org/show_bug.cgi?id=116880
     5
     6        Reviewed by Jessie Berlin.
     7
     8        A lot (if not the majority) of files in html/ are forms related, so it makes sense to begin splitting
     9        them out into a separate subdirectory, html/forms.
     10
     11        Begin my moving FileIconLoader from platform to html/forms. It is related to HTML forms (it's only used by
     12        the file upload element), and is not really a platform abstraction so it doesn't belong in platform.
     13
     14        * CMakeLists.txt:
     15        * GNUmakefile.list.am:
     16        * Target.pri:
     17        * WebCore.vcproj/WebCore.vcproj:
     18        * WebCore.vcxproj/WebCore.vcxproj:
     19        * WebCore.vcxproj/WebCore.vcxproj.filters:
     20        * WebCore.xcodeproj/project.pbxproj:
     21        * html/forms/FileIconLoader.cpp: Renamed from Source/WebCore/platform/FileIconLoader.cpp.
     22        * html/forms/FileIconLoader.h: Renamed from Source/WebCore/platform/FileIconLoader.h.
     23
    1242013-05-28  Chris Fleizach  <cfleizach@apple.com>
    225

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

    r150719 r150837  
    34093409        Source/WebCore/html/canvas/WebGLExtension.cpp \
    34103410        Source/WebCore/html/canvas/WebGLExtension.h \
     3411        Source/WebCore/html/forms/FileIconLoader.cpp \
     3412        Source/WebCore/html/forms/FileIconLoader.h \
    34113413        Source/WebCore/html/DOMSettableTokenList.cpp \
    34123414        Source/WebCore/html/DOMSettableTokenList.h \
    … …  
    54965498        Source/WebCore/platform/FileChooser.cpp \
    54975499        Source/WebCore/platform/FileChooser.h \
    5498         Source/WebCore/platform/FileIconLoader.cpp \
    5499         Source/WebCore/platform/FileIconLoader.h \
    55005500        Source/WebCore/platform/FileMetadata.h \
    55015501        Source/WebCore/platform/FileStreamClient.h \

  • trunk/Source/WebCore/Target.pri

    r150719 r150837  
    730730    html/canvas/CanvasStyle.cpp \
    731731    html/canvas/DataView.cpp \
     732    html/forms/FileIconLoader.cpp \
    732733    html/parser/BackgroundHTMLInputStream.cpp \
    733734    html/parser/BackgroundHTMLParser.cpp \
    … …  
    988989    platform/DragImage.cpp \
    989990    platform/FileChooser.cpp \
    990     platform/FileIconLoader.cpp \
    991991    platform/FileStream.cpp \
    992992    platform/FileSystem.cpp \

  • trunk/Source/WebCore/WebCore.pri

    r147541 r150837  
    3737    $$SOURCE_DIR/html \
    3838    $$SOURCE_DIR/html/canvas \
     39    $$SOURCE_DIR/html/forms \
    3940    $$SOURCE_DIR/html/parser \
    4041    $$SOURCE_DIR/html/shadow \

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

    r150719 r150837  
    2885628856                        </File>
    2885728857                        <File
    28858                                 RelativePath="..\platform\FileIconLoader.cpp"
    28859                                 >
    28860                         </File>
    28861                         <File
    28862                                 RelativePath="..\platform\FileIconLoader.h"
    28863                                 >
    28864                         </File>
    28865                         <File
    2886628858                                RelativePath="..\platform\FileMetadata.h"
    2886728859                                >
    … …  
    6506865060                        </File>
    6506965061                        <Filter
     65062                                Name="forms"
     65063                                >
     65064                                <File
     65065                                        RelativePath="..\html\forms\FileIconLoader.cpp"
     65066                                        >
     65067                                </File>
     65068                                <File
     65069                                        RelativePath="..\html\forms\FileIconLoader.h"
     65070                                        >
     65071                                </File>
     65072                        </Filter>
     65073                        <Filter
    6507065074                                Name="parser"
    6507165075                                >

  • trunk/Source/WebCore/WebCore.vcproj/WebCoreCommon.vsprops

    r149337 r150837  
    88        <Tool
    99                Name="VCCLCompilerTool"
    10                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\Modules\filesystem&quot;;&quot;$(ProjectDir)..\Modules\geolocation&quot;;&quot;$(ProjectDir)..\Modules\indexeddb&quot;;&quot;$(ProjectDir)..\Modules\mediasource&quot;;&quot;$(ProjectDir)..\Modules\navigatorcontentutils&quot;;&quot;$(ProjectDir)..\Modules\speech&quot;;&quot;$(ProjectDir)..\Modules\proximity&quot;;&quot;$(ProjectDir)..\Modules\quota&quot;;&quot;$(ProjectDir)..\Modules\notifications&quot;;&quot;$(ProjectDir)..\Modules\webdatabase&quot;;&quot;$(ProjectDir)..\Modules\websockets&quot;;&quot;$(ProjectDir)..\accessibility&quot;;&quot;$(ProjectDir)..\accessibility\win&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\c&quot;;&quot;$(ProjectDir)..\bridge\jsc&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\fileapi&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\rendering\mathml&quot;;&quot;$(ProjectDir)..\rendering\style&quot;;&quot;$(ProjectDir)..\rendering\svg&quot;;&quot;$(ProjectDir)..\bindings&quot;;&quot;$(ProjectDir)..\bindings\generic&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\bindings\js\specialization&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\dom\default&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\html\canvas&quot;;&quot;$(ProjectDir)..\html\parser&quot;;&quot;$(ProjectDir)..\html\shadow&quot;;&quot;$(ProjectDir)..\html\track&quot;;&quot;$(ProjectDir)..\inspector&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\appcache&quot;;&quot;$(ProjectDir)..\loader\archive&quot;;&quot;$(ProjectDir)..\loader\archive\cf&quot;;&quot;$(ProjectDir)..\loader\cache&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\mathml&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\page\animation&quot;;&quot;$(ProjectDir)..\page\scrolling&quot;;&quot;$(ProjectDir)..\page\win&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\animation&quot;;&quot;$(ProjectDir)..\platform\mock&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\graphics\ca&quot;;&quot;$(ProjectDir)..\platform\graphics\cpu\arm\filters&quot;;&quot;$(ProjectDir)..\platform\graphics\filters&quot;;&quot;$(ProjectDir)..\platform\graphics\filters\arm&quot;;&quot;$(ProjectDir)..\platform\graphics\opentype&quot;;&quot;$(ProjectDir)..\platform\graphics\transforms&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\text\transcoder&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(ProjectDir)..\xml\parser&quot;;&quot;$(ConfigurationBuildDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\svg\animation&quot;;&quot;$(ProjectDir)..\svg\graphics&quot;;&quot;$(ProjectDir)..\svg\properties&quot;;&quot;$(ProjectDir)..\svg\graphics\filters&quot;;&quot;$(ProjectDir)..\svg&quot;;&quot;$(ProjectDir)..\testing&quot;;&quot;$(ProjectDir)..\wml&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(ProjectDir)..\websockets&quot;;&quot;$(ProjectDir)..\workers&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\zlib&quot;"
     10                AdditionalIncludeDirectories="&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\Modules\filesystem&quot;;&quot;$(ProjectDir)..\Modules\geolocation&quot;;&quot;$(ProjectDir)..\Modules\indexeddb&quot;;&quot;$(ProjectDir)..\Modules\mediasource&quot;;&quot;$(ProjectDir)..\Modules\navigatorcontentutils&quot;;&quot;$(ProjectDir)..\Modules\speech&quot;;&quot;$(ProjectDir)..\Modules\proximity&quot;;&quot;$(ProjectDir)..\Modules\quota&quot;;&quot;$(ProjectDir)..\Modules\notifications&quot;;&quot;$(ProjectDir)..\Modules\webdatabase&quot;;&quot;$(ProjectDir)..\Modules\websockets&quot;;&quot;$(ProjectDir)..\accessibility&quot;;&quot;$(ProjectDir)..\accessibility\win&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\c&quot;;&quot;$(ProjectDir)..\bridge\jsc&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\fileapi&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\rendering\mathml&quot;;&quot;$(ProjectDir)..\rendering\style&quot;;&quot;$(ProjectDir)..\rendering\svg&quot;;&quot;$(ProjectDir)..\bindings&quot;;&quot;$(ProjectDir)..\bindings\generic&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\bindings\js\specialization&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\dom\default&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\html\canvas&quot;;&quot;$(ProjectDir)..\html\forms&quot;;&quot;$(ProjectDir)..\html\parser&quot;;&quot;$(ProjectDir)..\html\shadow&quot;;&quot;$(ProjectDir)..\html\track&quot;;&quot;$(ProjectDir)..\inspector&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\appcache&quot;;&quot;$(ProjectDir)..\loader\archive&quot;;&quot;$(ProjectDir)..\loader\archive\cf&quot;;&quot;$(ProjectDir)..\loader\cache&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\mathml&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\page\animation&quot;;&quot;$(ProjectDir)..\page\scrolling&quot;;&quot;$(ProjectDir)..\page\win&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\animation&quot;;&quot;$(ProjectDir)..\platform\mock&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\graphics\ca&quot;;&quot;$(ProjectDir)..\platform\graphics\cpu\arm\filters&quot;;&quot;$(ProjectDir)..\platform\graphics\filters&quot;;&quot;$(ProjectDir)..\platform\graphics\filters\arm&quot;;&quot;$(ProjectDir)..\platform\graphics\opentype&quot;;&quot;$(ProjectDir)..\platform\graphics\transforms&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\text\transcoder&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(ProjectDir)..\xml\parser&quot;;&quot;$(ConfigurationBuildDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\svg\animation&quot;;&quot;$(ProjectDir)..\svg\graphics&quot;;&quot;$(ProjectDir)..\svg\properties&quot;;&quot;$(ProjectDir)..\svg\graphics\filters&quot;;&quot;$(ProjectDir)..\svg&quot;;&quot;$(ProjectDir)..\testing&quot;;&quot;$(ProjectDir)..\wml&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(ProjectDir)..\websockets&quot;;&quot;$(ProjectDir)..\workers&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\zlib&quot;"
    1111                PreprocessorDefinitions="__WIN32__;DISABLE_3D_RENDERING;WEBCORE_CONTEXT_MENUS"
    1212                UsePrecompiledHeader="2"

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r150719 r150837  
    40874087    <ClCompile Include="..\platform\DragImage.cpp" />
    40884088    <ClCompile Include="..\platform\FileChooser.cpp" />
    4089     <ClCompile Include="..\platform\FileIconLoader.cpp" />
    40904089    <ClCompile Include="..\platform\FileStream.cpp" />
    40914090    <ClCompile Include="..\platform\FileSystem.cpp" />
    … …  
    89998998    <ClCompile Include="..\html\ValidityState.cpp" />
    90008999    <ClCompile Include="..\html\WeekInputType.cpp" />
     9000    <ClCompile Include="..\html\forms\FileIconLoader.cpp" />
    90019001    <ClCompile Include="..\html\parser\BackgroundHTMLInputStream.cpp" />
    90029002    <ClCompile Include="..\html\parser\BackgroundHTMLParser.cpp" />
    … …  
    1150811508    <ClInclude Include="..\platform\EventLoop.h" />
    1150911509    <ClInclude Include="..\platform\FileChooser.h" />
    11510     <ClInclude Include="..\platform\FileIconLoader.h" />
    1151111510    <ClInclude Include="..\platform\FileMetadata.h" />
    1151211511    <ClInclude Include="..\platform\FileStream.h" />
    … …  
    1278612785    <ClInclude Include="..\html\VoidCallback.h" />
    1278712786    <ClInclude Include="..\html\WeekInputType.h" />
     12787    <ClInclude Include="..\html\forms\FileIconLoader.h" />
    1278812788    <ClInclude Include="..\html\parser\AtomicHTMLToken.h" />
    1278912789    <ClInclude Include="..\html\parser\BackgroundHTMLParser.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r150667 r150837  
    203203      <UniqueIdentifier>{7f307654-5fd9-4fc8-9b64-d4afbdaf0e8c}</UniqueIdentifier>
    204204    </Filter>
     205    <Filter Include="html\forms">
     206      <UniqueIdentifier>{76631c4f-10d3-4e45-b289-088cd8314a98}</UniqueIdentifier>
     207    </Filter>
    205208    <Filter Include="html\parser">
    206209      <UniqueIdentifier>{5208479d-ffff-4f5b-a98f-d87083ec9221}</UniqueIdentifier>
    … …  
    11051108      <Filter>platform</Filter>
    11061109    </ClCompile>
    1107     <ClCompile Include="..\platform\FileIconLoader.cpp">
    1108       <Filter>platform</Filter>
    1109     </ClCompile>
    11101110    <ClCompile Include="..\platform\FileStream.cpp">
    11111111      <Filter>platform</Filter>
    … …  
    42214221    <ClCompile Include="..\html\WeekInputType.cpp">
    42224222      <Filter>html</Filter>
     4223    </ClCompile>
     4224    <ClCompile Include="..\html\forms\FileIconLoader.cpp">
     4225      <Filter>html\forms</Filter>
    42234226    </ClCompile>
    42244227    <ClCompile Include="..\html\parser\BackgroundHTMLInputStream.cpp">
    … …  
    78467849      <Filter>platform</Filter>
    78477850    </ClInclude>
    7848     <ClInclude Include="..\platform\FileIconLoader.h">
    7849       <Filter>platform</Filter>
    7850     </ClInclude>
    78517851    <ClInclude Include="..\platform\FileMetadata.h">
    78527852      <Filter>platform</Filter>
    … …  
    1109711097    <ClInclude Include="..\html\WeekInputType.h">
    1109811098      <Filter>html</Filter>
     11099    </ClInclude>
     11100    <ClInclude Include="..\html\forms\FileIconLoader.h">
     11101      <Filter>html\forms</Filter>
    1109911102    </ClInclude>
    1110011103    <ClInclude Include="..\html\parser\AtomicHTMLToken.h">

  • trunk/Source/WebCore/WebCore.vcxproj/WebCoreCommon.props

    r149337 r150837  
    88  <ItemDefinitionGroup>
    99    <ClCompile>
    10       <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Modules\filesystem;$(ProjectDir)..\Modules\geolocation;$(ProjectDir)..\Modules\indexeddb;$(ProjectDir)..\Modules\mediasource;$(ProjectDir)..\Modules\navigatorcontentutils;$(ProjectDir)..\Modules\speech;$(ProjectDir)..\Modules\proximity;$(ProjectDir)..\Modules\quota;$(ProjectDir)..\Modules\notifications;$(ProjectDir)..\Modules\webdatabase;$(ProjectDir)..\Modules\websockets;$(ProjectDir)..\accessibility;$(ProjectDir)..\accessibility\win;$(ProjectDir)..\bridge;$(ProjectDir)..\bridge\c;$(ProjectDir)..\bridge\jsc;$(ProjectDir)..\css;$(ProjectDir)..\editing;$(ProjectDir)..\fileapi;$(ProjectDir)..\rendering;$(ProjectDir)..\rendering\mathml;$(ProjectDir)..\rendering\style;$(ProjectDir)..\rendering\svg;$(ProjectDir)..\bindings;$(ProjectDir)..\bindings\generic;$(ProjectDir)..\bindings\js;$(ProjectDir)..\bindings\js\specialization;$(ProjectDir)..\dom;$(ProjectDir)..\dom\default;$(ProjectDir)..\history;$(ProjectDir)..\html;$(ProjectDir)..\html\canvas;$(ProjectDir)..\html\parser;$(ProjectDir)..\html\shadow;$(ProjectDir)..\html\track;$(ProjectDir)..\inspector;$(ProjectDir)..\loader;$(ProjectDir)..\loader\appcache;$(ProjectDir)..\loader\archive;$(ProjectDir)..\loader\archive\cf;$(ProjectDir)..\loader\cache;$(ProjectDir)..\loader\icon;$(ProjectDir)..\mathml;$(ProjectDir)..\page;$(ProjectDir)..\page\animation;$(ProjectDir)..\page\scrolling;$(ProjectDir)..\page\win;$(ProjectDir)..\platform;$(ProjectDir)..\platform\animation;$(ProjectDir)..\platform\mock;$(ProjectDir)..\platform\sql;$(ProjectDir)..\platform\win;$(ProjectDir)..\platform\network;$(ProjectDir)..\platform\network\win;$(ProjectDir)..\platform\cf;$(ProjectDir)..\platform\graphics;$(ProjectDir)..\platform\graphics\ca;$(ProjectDir)..\platform\graphics\cpu\arm\filters;$(ProjectDir)..\platform\graphics\filters;$(ProjectDir)..\platform\graphics\filters\arm;$(ProjectDir)..\platform\graphics\opentype;$(ProjectDir)..\platform\graphics\transforms;$(ProjectDir)..\platform\text;$(ProjectDir)..\platform\text\transcoder;$(ProjectDir)..\platform\graphics\win;$(ProjectDir)..\xml;$(ProjectDir)..\xml\parser;$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources;$(ProjectDir)..\plugins;$(ProjectDir)..\plugins\win;$(ProjectDir)..\svg\animation;$(ProjectDir)..\svg\graphics;$(ProjectDir)..\svg\properties;$(ProjectDir)..\svg\graphics\filters;$(ProjectDir)..\svg;$(ProjectDir)..\testing;$(ProjectDir)..\wml;$(ProjectDir)..\storage;$(ProjectDir)..\websockets;$(ProjectDir)..\workers;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ProjectDir)..\ForwardingHeaders;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\private\JavaScriptCore;$(WebKit_Libraries)\include\sqlite;$(WebKit_Libraries)\include\JavaScriptCore;$(WebKit_Libraries)\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     10      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Modules\filesystem;$(ProjectDir)..\Modules\geolocation;$(ProjectDir)..\Modules\indexeddb;$(ProjectDir)..\Modules\mediasource;$(ProjectDir)..\Modules\navigatorcontentutils;$(ProjectDir)..\Modules\speech;$(ProjectDir)..\Modules\proximity;$(ProjectDir)..\Modules\quota;$(ProjectDir)..\Modules\notifications;$(ProjectDir)..\Modules\webdatabase;$(ProjectDir)..\Modules\websockets;$(ProjectDir)..\accessibility;$(ProjectDir)..\accessibility\win;$(ProjectDir)..\bridge;$(ProjectDir)..\bridge\c;$(ProjectDir)..\bridge\jsc;$(ProjectDir)..\css;$(ProjectDir)..\editing;$(ProjectDir)..\fileapi;$(ProjectDir)..\rendering;$(ProjectDir)..\rendering\mathml;$(ProjectDir)..\rendering\style;$(ProjectDir)..\rendering\svg;$(ProjectDir)..\bindings;$(ProjectDir)..\bindings\generic;$(ProjectDir)..\bindings\js;$(ProjectDir)..\bindings\js\specialization;$(ProjectDir)..\dom;$(ProjectDir)..\dom\default;$(ProjectDir)..\history;$(ProjectDir)..\html;$(ProjectDir)..\html\canvas;$(ProjectDir)..\html\forms;$(ProjectDir)..\html\parser;$(ProjectDir)..\html\shadow;$(ProjectDir)..\html\track;$(ProjectDir)..\inspector;$(ProjectDir)..\loader;$(ProjectDir)..\loader\appcache;$(ProjectDir)..\loader\archive;$(ProjectDir)..\loader\archive\cf;$(ProjectDir)..\loader\cache;$(ProjectDir)..\loader\icon;$(ProjectDir)..\mathml;$(ProjectDir)..\page;$(ProjectDir)..\page\animation;$(ProjectDir)..\page\scrolling;$(ProjectDir)..\page\win;$(ProjectDir)..\platform;$(ProjectDir)..\platform\animation;$(ProjectDir)..\platform\mock;$(ProjectDir)..\platform\sql;$(ProjectDir)..\platform\win;$(ProjectDir)..\platform\network;$(ProjectDir)..\platform\network\win;$(ProjectDir)..\platform\cf;$(ProjectDir)..\platform\graphics;$(ProjectDir)..\platform\graphics\ca;$(ProjectDir)..\platform\graphics\cpu\arm\filters;$(ProjectDir)..\platform\graphics\filters;$(ProjectDir)..\platform\graphics\filters\arm;$(ProjectDir)..\platform\graphics\opentype;$(ProjectDir)..\platform\graphics\transforms;$(ProjectDir)..\platform\text;$(ProjectDir)..\platform\text\transcoder;$(ProjectDir)..\platform\graphics\win;$(ProjectDir)..\xml;$(ProjectDir)..\xml\parser;$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources;$(ProjectDir)..\plugins;$(ProjectDir)..\plugins\win;$(ProjectDir)..\svg\animation;$(ProjectDir)..\svg\graphics;$(ProjectDir)..\svg\properties;$(ProjectDir)..\svg\graphics\filters;$(ProjectDir)..\svg;$(ProjectDir)..\testing;$(ProjectDir)..\wml;$(ProjectDir)..\storage;$(ProjectDir)..\websockets;$(ProjectDir)..\workers;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ProjectDir)..\ForwardingHeaders;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\private\JavaScriptCore;$(WebKit_Libraries)\include\sqlite;$(WebKit_Libraries)\include\JavaScriptCore;$(WebKit_Libraries)\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1111      <PreprocessorDefinitions>DISABLE_3D_RENDERING;WEBCORE_CONTEXT_MENUS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1212      <PrecompiledHeader>Use</PrecompiledHeader>

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

    r150719 r150837  
    497497                1A85B2B60A1B2AC700D8C87C /* JSHTMLDivElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */; };
    498498                1A85B2B70A1B2AC700D8C87C /* JSHTMLDivElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */; };
     499                1A88A90417553CD7000C74F9 /* FileIconLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */; };
     500                1A88A90517553CD7000C74F9 /* FileIconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A88A90317553CD7000C74F9 /* FileIconLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
    499501                1A8F6B020DB53006001DB794 /* SubstituteResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8F6B010DB53006001DB794 /* SubstituteResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
    500502                1A8F6BBC0DB55CDC001DB794 /* ApplicationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8F6BB10DB55CDC001DB794 /* ApplicationCache.cpp */; };
    … …  
    10441046                4138D3351244054800323D33 /* EventContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4138D3331244054800323D33 /* EventContext.h */; };
    10451047                4138D3361244054800323D33 /* EventContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4138D3341244054800323D33 /* EventContext.cpp */; };
    1046                 414B867313AD074E00B4B373 /* FileIconLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 414B867113AD074E00B4B373 /* FileIconLoader.cpp */; };
    1047                 414B867413AD074E00B4B373 /* FileIconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 414B867213AD074E00B4B373 /* FileIconLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10481048                415071571685067300C3C7B3 /* SelectorFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 415071551685067300C3C7B3 /* SelectorFilter.cpp */; };
    10491049                415071581685067300C3C7B3 /* SelectorFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 415071561685067300C3C7B3 /* SelectorFilter.h */; };
    … …  
    67636763                1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDivElement.cpp; sourceTree = "<group>"; };
    67646764                1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLDivElement.h; sourceTree = "<group>"; };
     6765                1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileIconLoader.cpp; sourceTree = "<group>"; };
     6766                1A88A90317553CD7000C74F9 /* FileIconLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileIconLoader.h; sourceTree = "<group>"; };
    67656767                1A8F6B010DB53006001DB794 /* SubstituteResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubstituteResource.h; sourceTree = "<group>"; };
    67666768                1A8F6BB10DB55CDC001DB794 /* ApplicationCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplicationCache.cpp; sourceTree = "<group>"; };
    … …  
    73637365                4138D3331244054800323D33 /* EventContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventContext.h; sourceTree = "<group>"; };
    73647366                4138D3341244054800323D33 /* EventContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventContext.cpp; sourceTree = "<group>"; };
    7365                 414B867113AD074E00B4B373 /* FileIconLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileIconLoader.cpp; sourceTree = "<group>"; };
    7366                 414B867213AD074E00B4B373 /* FileIconLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileIconLoader.h; sourceTree = "<group>"; };
    73677367                415071551685067300C3C7B3 /* SelectorFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorFilter.cpp; sourceTree = "<group>"; };
    73687368                415071561685067300C3C7B3 /* SelectorFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorFilter.h; sourceTree = "<group>"; };
    … …  
    1336213362                        sourceTree = "<group>";
    1336313363                };
     13364                1A88A90117553CD7000C74F9 /* forms */ = {
     13365                        isa = PBXGroup;
     13366                        children = (
     13367                                1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */,
     13368                                1A88A90317553CD7000C74F9 /* FileIconLoader.h */,
     13369                        );
     13370                        path = forms;
     13371                        sourceTree = "<group>";
     13372                };
    1336413373                1A8F6BB00DB55CDC001DB794 /* appcache */ = {
    1336513374                        isa = PBXGroup;
    … …  
    1569115700                        children = (
    1569215701                                49484FAE102CF01E00187DD3 /* canvas */,
     15702                                1A88A90117553CD7000C74F9 /* forms */,
    1569315703                                97C1F5511228558800EDE616 /* parser */,
    1569415704                                4150F9ED12B6E0990008C860 /* shadow */,
    … …  
    1927219282                                934FE9E40B5CA539003E4A73 /* FileChooser.cpp */,
    1927319283                                066C772A0AB603B700238CC4 /* FileChooser.h */,
    19274                                 414B867113AD074E00B4B373 /* FileIconLoader.cpp */,
    19275                                 414B867213AD074E00B4B373 /* FileIconLoader.h */,
    1927619284                                2EF1BFE8121C9F4200C27627 /* FileStream.cpp */,
    1927719285                                2EF1BFE9121C9F4200C27627 /* FileStream.h */,
    … …  
    2179621804                                976D6C83122B8A3D001FD1F7 /* FileError.h in Headers */,
    2179721805                                2EDF369F122C94C8002F7D4E /* FileException.h in Headers */,
    21798                                 414B867413AD074E00B4B373 /* FileIconLoader.h in Headers */,
    2179921806                                F55B3DBE1251F12D003EF269 /* FileInputType.h in Headers */,
    2180021807                                976D6C86122B8A3D001FD1F7 /* FileList.h in Headers */,
    … …  
    2236122368                                938E666209F09B87008A48EC /* JSHTMLCanvasElement.h in Headers */,
    2236222369                                BCCBAD410C18C14200CE890F /* JSHTMLCollection.h in Headers */,
     22370                                1A88A90517553CD7000C74F9 /* FileIconLoader.h in Headers */,
    2236322371                                4A1E719114E101E400626F9D /* JSHTMLContentElement.h in Headers */,
    2236422372                                F5C041E70FFCA96D00839D4A /* JSHTMLDataListElement.h in Headers */,
    … …  
    2500125009                                934FE9E50B5CA539003E4A73 /* FileChooser.cpp in Sources */,
    2500225010                                978D07B6145A0F030096908D /* FileException.cpp in Sources */,
    25003                                 414B867313AD074E00B4B373 /* FileIconLoader.cpp in Sources */,
    2500425011                                F55B3DBD1251F12D003EF269 /* FileInputType.cpp in Sources */,
    2500525012                                976D6C85122B8A3D001FD1F7 /* FileList.cpp in Sources */,
    … …  
    2531025317                                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
    2531125318                                F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
     25319                                1A88A90417553CD7000C74F9 /* FileIconLoader.cpp in Sources */,
    2531225320                                7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
    2531325321                                5112935F3D54B4B52FAF973F /* InspectorHeapProfilerAgent.cpp in Sources */,

  • trunk/Source/WebCore/html/forms/FileIconLoader.h

    r150836 r150837  
    3232#define FileIconLoader_h
    3333
    34 #include <wtf/RefPtr.h>
     34#include <wtf/Forward.h>
    3535#include <wtf/RefCounted.h>
    3636

  • trunk/Source/WebKit/CMakeLists.txt

    r150336 r150837  
    2020    "${WEBCORE_DIR}/history"
    2121    "${WEBCORE_DIR}/html"
     22    "${WEBCORE_DIR}/html/forms"
    2223    "${WEBCORE_DIR}/html/shadow"
    2324    "${WEBCORE_DIR}/inspector"
Note: See TracChangeset for help on using the changeset viewer.