2006-11-12 Mark Rowe <bdash@webkit.org>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 12 Nov 2006 08:47:51 +0000 (08:47 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 12 Nov 2006 08:47:51 +0000 (08:47 +0000)
        Reviewed by Mitz.

        Linux/Gdk compilation fixes, and bakefile cleanups.  Based on patches by
        Alp Toker.

        * Projects/gdk/webcore-gdk.bkl:
        * WebCoreSources.bkl:
        * page/PageState.cpp:
        * platform/gdk/ChromeClientGdk.h:
        (WebCore::ChromeClientGdk::ref):
        (WebCore::ChromeClientGdk::deref):
        * platform/gdk/FrameGdk.cpp:
        (WebCore::FrameGdkClientDefault::openURL):
        (WebCore::FrameGdkClientDefault::didReceiveData):
        (WebCore::FrameGdkClientDefault::receivedAllData):
        (WebCore::FrameGdk::FrameGdk):
        (WebCore::FrameGdk::~FrameGdk):
        * platform/gdk/FrameGdk.h:
        * platform/gdk/KeyEventGdk.cpp:
        (WebCore::keyIdentifierForGdkKeyCode):
        * platform/gdk/ScreenClientGdk.h: Removed.
        * platform/gdk/TemporaryLinkStubs.cpp:
        (FrameGdk::canPaste):
        (FrameGdk::originalRequestURL):
        (TextField::TextField):
        * platform/network/gdk/ResourceHandleManager.cpp:
        (WebCore::ResourceHandleManager::downloadTimerCallback):
        (WebCore::ResourceHandleManager::add):
        (WebCore::ResourceHandleManager::cancel):
        * webcore-base.bkl:
2006-11-12  Mark Rowe  <bdash@webkit.org>

        Reviewed by Mitz.

        Clean up of JavaScriptCore bakefiles.

        * JavaScriptCoreSources.bkl:
        * jscore.bkl:
2006-11-12  Mark Rowe  <bdash@webkit.org>

        Reviewed by Mitz.

        Clean up of GdkLauncher bakefile.

        * GdkLauncher/gdklauncher.bkl:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

17 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCoreSources.bkl
JavaScriptCore/jscore.bkl
WebCore/ChangeLog
WebCore/Projects/gdk/webcore-gdk.bkl
WebCore/WebCoreSources.bkl
WebCore/page/PageState.cpp
WebCore/platform/gdk/ChromeClientGdk.h
WebCore/platform/gdk/FrameGdk.cpp
WebCore/platform/gdk/FrameGdk.h
WebCore/platform/gdk/KeyEventGdk.cpp
WebCore/platform/gdk/ScreenClientGdk.h [deleted file]
WebCore/platform/gdk/TemporaryLinkStubs.cpp
WebCore/platform/network/gdk/ResourceHandleManager.cpp
WebCore/webcore-base.bkl
WebKitTools/ChangeLog
WebKitTools/GdkLauncher/gdklauncher.bkl

index 1dfa3078aad8d82b33e753f33c0d215995c71698..e9eb58786ef0e594f43c97b5f76e96b118dd0383 100644 (file)
@@ -1,3 +1,12 @@
+2006-11-12  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Mitz.
+
+        Clean up of JavaScriptCore bakefiles.
+
+        * JavaScriptCoreSources.bkl:
+        * jscore.bkl:
+
 2006-11-11  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Maciej.
index b4ff4b9c520f19c8fc838240fec5e3cf850f64b7..b280b1c43d1222e55d00dd420770c48fca6f3073 100644 (file)
@@ -1,93 +1,87 @@
 <?xml version="1.0" ?>
 <makefile>
-       <set append="1" var="JSCORE_SOURCES_KJS">
+    <set append="1" var="JSCORE_SOURCES_KJS">
+        DerivedSources/JavaScriptCore/grammar.cpp
+        kjs/Context.cpp
+        kjs/DateMath.cpp
+        kjs/ExecState.cpp
+        kjs/JSImmediate.cpp
+        kjs/JSLock.cpp
+        kjs/JSWrapperObject.cpp
+        kjs/Parser.cpp
+        kjs/PropertyNameArray.cpp
+        kjs/array_object.cpp
+        kjs/bool_object.cpp
+        kjs/collector.cpp
+        kjs/date_object.cpp
+        kjs/debugger.cpp
+        kjs/dtoa.cpp
+        kjs/error_object.cpp
+        kjs/fpconst.cpp
+        kjs/function.cpp
+        kjs/function_object.cpp
+        kjs/identifier.cpp
+        kjs/internal.cpp
+        kjs/interpreter.cpp
+        kjs/lexer.cpp
+        kjs/list.cpp
+        kjs/lookup.cpp
+        kjs/math_object.cpp
+        kjs/nodes.cpp
+        kjs/nodes2string.cpp
+        kjs/number_object.cpp
+        kjs/object.cpp
+        kjs/object_object.cpp
+        kjs/operations.cpp
+        kjs/property_map.cpp
+        kjs/property_slot.cpp
+        kjs/regexp.cpp
+        kjs/regexp_object.cpp
+        kjs/scope_chain.cpp
+        kjs/string_object.cpp
+        kjs/testkjs.cpp
+        kjs/ustring.cpp
+        kjs/value.cpp
+    </set>
 
-               DerivedSources/JavaScriptCore/grammar.cpp       
-               kjs/array_object.cpp
-               kjs/bool_object.cpp
-               kjs/collector.cpp
-               kjs/Context.cpp
-               kjs/DateMath.cpp
-               kjs/date_object.cpp
-               kjs/debugger.cpp
-               kjs/dtoa.cpp
-               kjs/error_object.cpp
-               kjs/ExecState.cpp
-               kjs/fpconst.cpp
-               kjs/function.cpp
-               kjs/function_object.cpp
-               kjs/identifier.cpp
-               kjs/internal.cpp
-               kjs/interpreter.cpp
-               kjs/JSImmediate.cpp
-               kjs/JSLock.cpp
-               kjs/JSWrapperObject.cpp
-               kjs/lexer.cpp
-               kjs/list.cpp
-               kjs/lookup.cpp
-               kjs/math_object.cpp
-               kjs/nodes2string.cpp
-               kjs/nodes.cpp
-               kjs/number_object.cpp
-               kjs/object.cpp
-               kjs/object_object.cpp
-               kjs/operations.cpp
-               kjs/Parser.cpp
-               kjs/property_map.cpp
-               kjs/PropertyNameArray.cpp
-               kjs/property_slot.cpp
-               kjs/regexp.cpp
-               kjs/regexp_object.cpp
-               kjs/scope_chain.cpp
-               kjs/string_object.cpp
-               kjs/testkjs.cpp
-               kjs/ustring.cpp
-               kjs/value.cpp
+    <set append="1" var="JSCORE_SOURCES_WTF">
+        wtf/Assertions.cpp
+        wtf/FastMalloc.cpp
+        wtf/HashTable.cpp
+    </set>
 
-       </set>
-       <set append="1" var="JSCORE_SOURCES_WTF">
-               
-               wtf/Assertions.cpp
-               wtf/FastMalloc.cpp
-               wtf/HashTable.cpp
-
-       </set>
-       <set append="1" var="JSCORE_SOURCES_PCRE">
-               
-               pcre/pcre_compile.c
-               pcre/pcre_config.c
-               pcre/pcre_exec.c
-               pcre/pcre_fullinfo.c
-               pcre/pcre_get.c
-               pcre/pcre_globals.c
-               pcre/pcre_info.c
-               pcre/pcre_maketables.c
-               pcre/pcre_ord2utf8.c
-               pcre/pcre_printint.c
-               pcre/pcre_refcount.c
-               pcre/pcre_study.c
-               pcre/pcre_tables.c
-               pcre/pcre_try_flipped.c
-               pcre/pcre_ucp_findchar.c
-               pcre/pcre_version.c
-               pcre/pcre_xclass.c
-               pcre/ucp_findchar.c
-
-       </set>
-       <set append="1" var="JSCORE_SOURCES_BINDINGS">
-               
-               bindings/c/c_class.cpp
-               bindings/c/c_instance.cpp
-               bindings/c/c_runtime.cpp
-               bindings/c/c_utility.cpp
-               bindings/NP_jsobject.cpp
-               bindings/npruntime.cpp
-               bindings/runtime.cpp
-               bindings/runtime_array.cpp
-               bindings/runtime_method.cpp
-               bindings/runtime_object.cpp
-               bindings/runtime_root.cpp
-
-       </set>
+    <set append="1" var="JSCORE_SOURCES_PCRE">
+        pcre/pcre_compile.c
+        pcre/pcre_config.c
+        pcre/pcre_exec.c
+        pcre/pcre_fullinfo.c
+        pcre/pcre_get.c
+        pcre/pcre_globals.c
+        pcre/pcre_info.c
+        pcre/pcre_maketables.c
+        pcre/pcre_ord2utf8.c
+        pcre/pcre_printint.c
+        pcre/pcre_refcount.c
+        pcre/pcre_study.c
+        pcre/pcre_tables.c
+        pcre/pcre_try_flipped.c
+        pcre/pcre_ucp_findchar.c
+        pcre/pcre_version.c
+        pcre/pcre_xclass.c
+        pcre/ucp_findchar.c
+    </set>
 
+    <set append="1" var="JSCORE_SOURCES_BINDINGS">
+        bindings/NP_jsobject.cpp
+        bindings/c/c_class.cpp
+        bindings/c/c_instance.cpp
+        bindings/c/c_runtime.cpp
+        bindings/c/c_utility.cpp
+        bindings/npruntime.cpp
+        bindings/runtime.cpp
+        bindings/runtime_array.cpp
+        bindings/runtime_method.cpp
+        bindings/runtime_object.cpp
+        bindings/runtime_root.cpp
+    </set>
 </makefile>
index 0c62dc7ad71fdd138c4bcd0cf9c4ee3b1732a3bc..78067a2ac417eb38f504d87a84cae3e1a10d42d5 100644 (file)
@@ -26,46 +26,40 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-JavaScriptCore Bakefile project file. 
+JavaScriptCore Bakefile project file.
 -->
 
-
-
 <makefile>
-
     <set var="SRCDIR">.</set>
-    <!-- Common definitions etc.: -->
+
     <include file="../Bakefiles/presets.bkl"/>
     <include file="JavaScriptCoreSources.bkl"/>
 
-
     <set var="BUILDDIR">obj-$(FORMAT)</set>
 
     <template id="jscore_base" template="icu">
         <pic>on</pic>
         <threading>multi</threading>
         <dirname>$(SRCDIR)</dirname>
-        
+
         <include>$(SRCDIR)</include>
+        <include>$(SRCDIR)/DerivedSources/JavaScriptCore</include>
         <include>$(SRCDIR)/ForwardingHeaders</include>
-        <include>$(SRCDIR)/wtf</include>
-        <include>$(SRCDIR)/kjs</include>
-        <include>$(SRCDIR)/pcre</include>
-        <include>$(SRCDIR)/bindings</include>
         <include>$(SRCDIR)/bindings/c</include>
         <include>$(SRCDIR)/bindings/jni</include>
-        <include>$(SRCDIR)/DerivedSources/JavaScriptCore</include>
-
-        <define>APPLE_CHANGES=1</define>
+        <include>$(SRCDIR)/bindings</include>
+        <include>$(SRCDIR)/kjs</include>
+        <include>$(SRCDIR)/pcre</include>
+        <include>$(SRCDIR)/wtf</include>
 
         <!-- this GC version requires Mach's thread suspend/resume: -->
-        <if cond="PLATFORM_MACOSX=='1'">
+        <if cond="PLATFORM_MACOSX!='1'">
             <define>USE_CONSERVATIVE_GC=0</define>
         </if>
-        
+
         <if cond="PLATFORM_MACOSX=='1'">
             <define>USE_CONSERVATIVE_GC=1</define>
-        </if> 
+        </if>
 
         <define>XSLT_SUPPORT=1</define>
 
@@ -83,7 +77,7 @@ JavaScriptCore Bakefile project file.
             <define>HAVE_FUNC__FINITE=1</define>
         </if>
 
-    </template>   
+    </template>
 
     <exe id="dftables">
         <dirname>$(SRCDIR)</dirname>
@@ -92,7 +86,7 @@ JavaScriptCore Bakefile project file.
     </exe>
 
     <action id="DerivedSources">
-        <is-phony/>
+        <is-phony />
         <command>bash make-generated-sources.sh</command>
     </action>
 
@@ -104,18 +98,14 @@ JavaScriptCore Bakefile project file.
         <cxx-exceptions>off</cxx-exceptions>
         <debug-info>on</debug-info>
         <sources>
-            $(JSCORE_SOURCES_WTF)
-            $(JSCORE_SOURCES_PCRE)
-            $(JSCORE_SOURCES_KJS)
             $(JSCORE_SOURCES_BINDINGS)
+            $(JSCORE_SOURCES_KJS)
+            $(JSCORE_SOURCES_PCRE)
+            $(JSCORE_SOURCES_WTF)
         </sources>
         <if cond="PLATFORM_WIN32=='1'">
             $(JSCORE_SOURCES_WIN)
-       </if>
-       <install-to>$(BUILDDIR)</install-to>
+        </if>
+        <install-to>$(BUILDDIR)</install-to>
     </lib>
-
 </makefile>
-
-
-
index 05165fb35f75cf21832ca34d281ae114bd7ca878..8943bc4099bf5fdbe2cb0604ccc108abf6eea682 100644 (file)
@@ -1,3 +1,36 @@
+2006-11-12  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Mitz.
+
+        Linux/Gdk compilation fixes, and bakefile cleanups.  Based on patches by
+        Alp Toker.
+
+        * Projects/gdk/webcore-gdk.bkl:
+        * WebCoreSources.bkl:
+        * page/PageState.cpp:
+        * platform/gdk/ChromeClientGdk.h:
+        (WebCore::ChromeClientGdk::ref):
+        (WebCore::ChromeClientGdk::deref):
+        * platform/gdk/FrameGdk.cpp:
+        (WebCore::FrameGdkClientDefault::openURL):
+        (WebCore::FrameGdkClientDefault::didReceiveData):
+        (WebCore::FrameGdkClientDefault::receivedAllData):
+        (WebCore::FrameGdk::FrameGdk):
+        (WebCore::FrameGdk::~FrameGdk):
+        * platform/gdk/FrameGdk.h:
+        * platform/gdk/KeyEventGdk.cpp:
+        (WebCore::keyIdentifierForGdkKeyCode):
+        * platform/gdk/ScreenClientGdk.h: Removed.
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        (FrameGdk::canPaste):
+        (FrameGdk::originalRequestURL):
+        (TextField::TextField):
+        * platform/network/gdk/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+        (WebCore::ResourceHandleManager::add):
+        (WebCore::ResourceHandleManager::cancel):
+        * webcore-base.bkl:
+
 2006-11-11  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Maciej Stachowiak.
index 2a4df7c9570c83723abe735e4826cdf1066d24bb..31c1298e64fb3c3895faa80fb631b7d2c9de47c7 100644 (file)
@@ -1,49 +1,39 @@
 <?xml version="1.0" ?>
-<!-- generate GnuMakefile with
-       bakefile -f gnu gtkwebcore.bkl
-       consider forcing includes agian
-       CXX = g++  -I. include config.h
--->
-
-
 <makefile>
+    <option name="ENCODINGS_FILE">
+        <default-value>platform/gdk/gdk-encodings.txt</default-value>
+        <values>platform/gdk/gdk-encodings.txt</values>
+   </option>
 
-               <option name="ENCODINGS_FILE">
-               <default-value>platform/gdk/gdk-encodings.txt</default-value>
-               <values>platform/gdk/gdk-encodings.txt</values>
-               </option>
+    <option name="FEATURE_DEFINES" never_empty="1" >
+        <!-- SVG_SUPPORT XPATH_SUPPORT-->
+        <default-value>XPATH_SUPPORT</default-value>
+        <values>XPATH_SUPPORT,SVG_SUPPORT</values>
+    </option>
 
-               <option name="FEATURE_DEFINES" never_empty="1" >
-               <!-- SVG_SUPPORT XPATH_SUPPORT-->
-               <default-value>XPATH_SUPPORT</default-value>
-               <values>XPATH_SUPPORT,SVG_SUPPORT</values>
-               </option>
-               <set var="FEATURE_DEFINES">XPATH_SUPPORT</set>
-               <set var="ENCODINGS_FILE">$(SRCDIR)/platform/gdk/gdk-encodings.txt</set>
+    <set var="FEATURE_DEFINES">XPATH_SUPPORT</set>
+    <set var="ENCODINGS_FILE">$(SRCDIR)/platform/gdk/gdk-encodings.txt</set>
 
-       <include file="../../webcore-base.bkl"/>
+    <include file="../../webcore-base.bkl"/>
 
-   <action id=".DerivedSources">
-   <!-- This causes a full rebuild everytime
-     <is-phony/>
-        -->
+    <action id=".DerivedSources">
+        <!-- This causes a full rebuild everytime
+            <is-phony />
+        -->
         <command>bash -c "cd ../..; ./move-js-headers.sh"</command>
         <command>
-               bash -c "cd ../..;\
-               export FEATURE_DEFINES=$(FEATURE_DEFINES);\
-               ./make-generated-sources.sh $(ENCODINGS_FILE)"
-               </command>
+            bash -c "cd ../..;\
+            export FEATURE_DEFINES=$(FEATURE_DEFINES);\
+            ./make-generated-sources.sh $(ENCODINGS_FILE)"
+        </command>
         <command>bash -c "touch .DerivedSources"</command>
-   </action>
+    </action>
 
-    <dll id="webcore-gdk" template="webcore_base,freetype,gtk,curl,cairo,sqlite3">        
-       <!-- FIXME: create a debug option and set these accordingly -->
-       <!-- check for undefined symbols for debugging reasons -->
-       <!--
-       <ldflags>W,undefined</ldflags>
-       -->
+    <dll id="webcore-gdk" template="webcore_base,freetype,gtk,curl,cairo,sqlite3">
+        <!-- FIXME: create a debug option and set these accordingly -->
+        <!-- check for undefined symbols for debugging reasons -->
 
-               <pre-build-target>.DerivedSources</pre-build-target>
+        <pre-build-target>.DerivedSources</pre-build-target>
         <dirname>.</dirname>
         <pic>on</pic>
         <threading>multi</threading>
         <debug-info>on</debug-info>
         <include>$(SRCDIR)/platform/gdk</include>
         <include>$(SRCDIR)/platform/network/gdk</include>
-       <define>BUILDING_GDK__</define>
-       <define>BUILDING_CAIRO__</define>
-               <include>platform/gdk</include>
-               <include>platform/cairo</include>
-           <include>$(SRCDIR)/kcanvas/device/cairo</include>
-       <define>XPATH_SUPPORT</define>
+        <define>BUILDING_GDK__</define>
+        <define>BUILDING_CAIRO__</define>
+        <include>platform/gdk</include>
+        <include>platform/grahpics/cairo</include>
+        <include>$(SRCDIR)/kcanvas/device/cairo</include>
+        <define>XPATH_SUPPORT</define>
         <!-- gdk build broken with without NDEBUG defined -->
-       <define>NDEBUG</define>
+        <define>NDEBUG</define>
  
-        <sources>              
-          platform/cairo/GraphicsContextCairo.cpp
-          platform/cairo/ImageCairo.cpp
-          platform/cairo/ImageSourceCairo.cpp
-          platform/gdk/CookieJarGdk.cpp
-          platform/gdk/CursorGdk.cpp
-          platform/gdk/FontCacheGdk.cpp
-          platform/gdk/FontDataGdk.cpp
-          platform/gdk/FontGdk.cpp
-          platform/gdk/FontPlatformDataGdk.cpp
-          platform/gdk/FrameGdk.cpp
-          platform/gdk/GlyphMapGdk.cpp
-          platform/gdk/ImageGdk.cpp
-          platform/gdk/KeyEventGdk.cpp
-          platform/gdk/MouseEventGdk.cpp
-          platform/gdk/PageGdk.cpp
-          platform/network/gdk/ResourceHandleManager.cpp
-          platform/gdk/RenderThemeGdk.cpp
-          platform/gdk/RenderPopupMenuGdk.cpp
-          platform/gdk/ScreenGdk.cpp
-          platform/gdk/ScrollViewGdk.cpp
-          platform/gdk/SharedTimerLinux.cpp
-          platform/gdk/SystemTimeLinux.cpp
-          platform/gdk/TemporaryLinkStubs.cpp
-          platform/network/gdk/ResourceHandleCurl.cpp
-          platform/gdk/WheelEventGdk.cpp
-          platform/gdk/WidgetGdk.cpp
-               </sources>
+        <sources>
+            platform/gdk/CookieJarGdk.cpp
+            platform/gdk/CursorGdk.cpp
+            platform/gdk/FontCacheGdk.cpp
+            platform/gdk/FontDataGdk.cpp
+            platform/gdk/FontGdk.cpp
+            platform/gdk/FontPlatformDataGdk.cpp
+            platform/gdk/FrameGdk.cpp
+            platform/gdk/GlyphMapGdk.cpp
+            platform/gdk/ImageGdk.cpp
+            platform/gdk/KeyEventGdk.cpp
+            platform/gdk/MouseEventGdk.cpp
+            platform/gdk/PageGdk.cpp
+            platform/network/gdk/ResourceHandleManager.cpp
+            platform/gdk/RenderThemeGdk.cpp
+            platform/gdk/RenderPopupMenuGdk.cpp
+            platform/gdk/ScrollViewGdk.cpp
+            platform/gdk/SharedTimerLinux.cpp
+            platform/gdk/SystemTimeLinux.cpp
+            platform/gdk/TemporaryLinkStubs.cpp
+            platform/network/gdk/ResourceHandleCurl.cpp
+            platform/gdk/WheelEventGdk.cpp
+            platform/gdk/WidgetGdk.cpp
+        </sources>
 
-               <clean-files>
-               .DerivedSources
-               rm -rf $(SRCDIR)/DerivedSources
-               rm -rf $(SRCDIR)/include/JavaScripCore
-               rm -rf $(SRCDIR)/Projects/gdk/obj-gnu
-               </clean-files>
-               <!--HACK block dependencies on the phony target -->
+        <clean-files>
+            .DerivedSources
+            rm -rf $(SRCDIR)/DerivedSources
+            rm -rf $(SRCDIR)/include/JavaScriptCore
+            rm -rf $(SRCDIR)/Projects/gdk/obj-gnu
+        </clean-files>
+        <!--HACK block dependencies on the phony target -->
     </dll>
 </makefile>
 
index a7b24cf6da4498d012d69951d62d059cb60bb581..4d45baa72373c851f69a9a23f8e14989873b86a5 100644 (file)
 <?xml version="1.0" ?>
 <makefile>
-     <set append="1" var="WEBCORE_SOURCES_KWQ">
-               
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_DERIVEDSOURCES">
-               
-               DerivedSources/WebCore/ColorData.c
-               DerivedSources/WebCore/CSSGrammar.cpp
-               DerivedSources/WebCore/HTMLEntityNames.c
-               DerivedSources/WebCore/HTMLNames.cpp
-               DerivedSources/WebCore/JSAttr.cpp
-               DerivedSources/WebCore/JSCanvasGradient.cpp
-               DerivedSources/WebCore/JSCanvasPattern.cpp
-               DerivedSources/WebCore/JSCanvasRenderingContext2D.cpp
-               DerivedSources/WebCore/JSCharacterData.cpp
-               DerivedSources/WebCore/JSCounter.cpp
-               DerivedSources/WebCore/JSCSSPrimitiveValue.cpp
-               DerivedSources/WebCore/JSCSSRule.cpp
-               DerivedSources/WebCore/JSCSSRuleList.cpp
-               DerivedSources/WebCore/JSCSSStyleDeclaration.cpp
-               DerivedSources/WebCore/JSCSSValue.cpp
-               DerivedSources/WebCore/JSCSSValueList.cpp
-               DerivedSources/WebCore/JSDocument.cpp
-               DerivedSources/WebCore/JSDocumentFragment.cpp
-               DerivedSources/WebCore/JSDocumentType.cpp
-               DerivedSources/WebCore/JSDOMImplementation.cpp
-               DerivedSources/WebCore/JSDOMParser.cpp
-               DerivedSources/WebCore/JSDOMWindow.cpp
-               DerivedSources/WebCore/JSElement.cpp
-               DerivedSources/WebCore/JSEntity.cpp
-               DerivedSources/WebCore/JSEvent.cpp
-               DerivedSources/WebCore/JSHTMLAnchorElement.cpp
-               DerivedSources/WebCore/JSHTMLAppletElement.cpp
-               DerivedSources/WebCore/JSHTMLAreaElement.cpp
-               DerivedSources/WebCore/JSHTMLBaseElement.cpp
-               DerivedSources/WebCore/JSHTMLBaseFontElement.cpp
-               DerivedSources/WebCore/JSHTMLBlockquoteElement.cpp
-               DerivedSources/WebCore/JSHTMLBodyElement.cpp
-               DerivedSources/WebCore/JSHTMLBRElement.cpp
-               DerivedSources/WebCore/JSHTMLButtonElement.cpp
-               DerivedSources/WebCore/JSHTMLCanvasElement.cpp
-               DerivedSources/WebCore/JSHTMLDirectoryElement.cpp
-               DerivedSources/WebCore/JSHTMLDivElement.cpp
-               DerivedSources/WebCore/JSHTMLDListElement.cpp
-               DerivedSources/WebCore/JSHTMLDocument.cpp
-               DerivedSources/WebCore/JSHTMLElement.cpp
-               DerivedSources/WebCore/JSHTMLFieldSetElement.cpp
-               DerivedSources/WebCore/JSHTMLFontElement.cpp
-               DerivedSources/WebCore/JSHTMLFormElement.cpp
-               DerivedSources/WebCore/JSHTMLHeadElement.cpp
-               DerivedSources/WebCore/JSHTMLHeadingElement.cpp
-               DerivedSources/WebCore/JSHTMLHRElement.cpp
-               DerivedSources/WebCore/JSHTMLHtmlElement.cpp
-               DerivedSources/WebCore/JSHTMLImageElement.cpp
-               DerivedSources/WebCore/JSHTMLInputElement.cpp
-               DerivedSources/WebCore/JSHTMLIsIndexElement.cpp
-               DerivedSources/WebCore/JSHTMLLabelElement.cpp
-               DerivedSources/WebCore/JSHTMLLegendElement.cpp
-               DerivedSources/WebCore/JSHTMLLIElement.cpp
-               DerivedSources/WebCore/JSHTMLLinkElement.cpp
-               DerivedSources/WebCore/JSHTMLMapElement.cpp
-               DerivedSources/WebCore/JSHTMLMenuElement.cpp
-               DerivedSources/WebCore/JSHTMLMetaElement.cpp
-               DerivedSources/WebCore/JSHTMLModElement.cpp
-               DerivedSources/WebCore/JSHTMLOListElement.cpp
-               DerivedSources/WebCore/JSHTMLOptGroupElement.cpp
-               DerivedSources/WebCore/JSHTMLOptionsCollection.cpp
-               DerivedSources/WebCore/JSHTMLOptionElement.cpp
-               DerivedSources/WebCore/JSHTMLParagraphElement.cpp
-               DerivedSources/WebCore/JSHTMLParamElement.cpp
-               DerivedSources/WebCore/JSHTMLPreElement.cpp
-               DerivedSources/WebCore/JSHTMLQuoteElement.cpp
-               DerivedSources/WebCore/JSHTMLScriptElement.cpp
-               DerivedSources/WebCore/JSHTMLStyleElement.cpp
-               DerivedSources/WebCore/JSHTMLTextAreaElement.cpp
-               DerivedSources/WebCore/JSHTMLTitleElement.cpp
-               DerivedSources/WebCore/JSHTMLUListElement.cpp
-               DerivedSources/WebCore/JSKeyboardEvent.cpp
-               DerivedSources/WebCore/JSMouseEvent.cpp
-               DerivedSources/WebCore/JSMutationEvent.cpp
-               DerivedSources/WebCore/JSNode.cpp
-               DerivedSources/WebCore/JSNodeFilter.cpp
-               DerivedSources/WebCore/JSNodeIterator.cpp
-               DerivedSources/WebCore/JSNotation.cpp
-               DerivedSources/WebCore/JSProcessingInstruction.cpp
-               DerivedSources/WebCore/JSRange.cpp
-               DerivedSources/WebCore/JSRangeException.cpp
-               DerivedSources/WebCore/JSText.cpp
-               DerivedSources/WebCore/JSTreeWalker.cpp
-               DerivedSources/WebCore/JSOverflowEvent.cpp
-               DerivedSources/WebCore/JSUIEvent.cpp
-               DerivedSources/WebCore/JSWheelEvent.cpp
-               DerivedSources/WebCore/JSXMLSerializer.cpp
-               DerivedSources/WebCore/JSXPathEvaluator.cpp
-               DerivedSources/WebCore/JSXPathExpression.cpp
-               DerivedSources/WebCore/JSXPathNSResolver.cpp
-               DerivedSources/WebCore/JSXPathResult.cpp
-               DerivedSources/WebCore/UserAgentStyleSheetsData.cpp
-               DerivedSources/WebCore/XLinkNames.cpp
-               DerivedSources/WebCore/XMLNames.cpp
-               DerivedSources/WebCore/XPathGrammar.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_KHTML">
-               
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_MISC">
-               
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_PAGE">
-               
-               page/DOMWindow.cpp
-               page/Frame.cpp
-               page/FrameTree.cpp
-               page/FrameView.cpp
-               page/MouseEventWithHitTestResults.cpp
-               page/Page.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_LOADER">
-
-    loader/Cache.cpp
-    loader/CachedCSSStyleSheet.cpp
-    loader/CachedImage.cpp
-    loader/CachedResource.cpp
-    loader/CachedResourceClientWalker.cpp
-    loader/CachedScript.cpp
-    loader/CachedXSLStyleSheet.cpp
-    loader/DocLoader.cpp
-    loader/DocumentLoader.cpp
-    loader/FormState.cpp
-    loader/FrameLoader.cpp
-    loader/ImageDocument.cpp
-    loader/MainResourceLoader.cpp
-    loader/NetscapePlugInStreamLoader.cpp
-    loader/PluginDocument.cpp
-    loader/Request.cpp
-    loader/ResourceLoader.cpp
-    loader/SubresourceLoader.cpp
-    loader/TextDocument.cpp
-    loader/TextResourceDecoder.cpp
-    loader/loader.cpp
-
-  </set>
-       <set append="1" var="WEBCORE_SOURCES_PLATFORM">
-               
-               platform/Arena.cpp
-               platform/ArrayImpl.cpp
-               platform/AtomicString.cpp
-               platform/Color.cpp
-               platform/CString.cpp
-               platform/DeprecatedCString.cpp
-               platform/DeprecatedPtrListImpl.cpp
-               platform/DeprecatedString.cpp
-               platform/DeprecatedStringList.cpp
-               platform/DeprecatedValueListImpl.cpp
-               platform/FloatPoint.cpp
-               platform/FloatRect.cpp
-               platform/FloatSize.cpp
-               platform/Font.cpp
-               platform/FontCache.cpp
-               platform/FontData.cpp
-               platform/FontFallbackList.cpp
-               platform/FontFamily.cpp
-               platform/GlyphMap.cpp
-               platform/GlyphWidthMap.cpp
-               platform/GraphicsContext.cpp
-               platform/GraphicsTypes.cpp
-               platform/Image.cpp
-               platform/IntRect.cpp
-               platform/KURL.cpp
-               platform/Logging.cpp
-               platform/Pen.cpp
-               platform/RegularExpression.cpp
-               platform/SegmentedString.cpp
-               platform/TextCodec.cpp
-               platform/TextCodecICU.cpp
-               platform/String.cpp
-               platform/StringImpl.cpp
-               platform/TextCodecLatin1.cpp
-               platform/TextCodecUTF16.cpp
-               platform/TextDecoder.cpp
-               platform/TextEncoding.cpp
-               platform/TextEncodingRegistry.cpp
-               platform/TextStream.cpp
-               platform/Timer.cpp
-               platform/network/ResourceHandle.cpp
-                platform/network/FormData.cpp
-               platform/Widget.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_WIN">
-               
-               platform/win/CookieJarWin.cpp
-               platform/win/CursorWin.cpp
-               platform/win/FontCacheWin.cpp
-               platform/win/FontDataWin.cpp
-               platform/win/FontPlatformDataWin.cpp
-               platform/win/FontWin.cpp
-               platform/win/GlyphMapWin.cpp
-               platform/win/IntPointWin.cpp
-               platform/win/IntRectWin.cpp
-               platform/win/IntSizeWin.cpp
-               platform/win/KeyEventWin.cpp
-               platform/win/MouseEventWin.cpp
-               platform/win/ScreenWin.cpp
-               platform/win/ScrollViewWin.cpp
-               platform/win/SharedTimerWin.cpp
-               platform/win/SystemTimeWin.cpp
-               platform/win/TemporaryLinkStubs.cpp
-               platform/network/win/ResourceHandleWin.cpp
-               platform/win/WidgetWin.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_IMAGE-DECODERS">
-               
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_GIF">
-               
-               platform/image-decoders/gif/GIFImageDecoder.cpp
-               platform/image-decoders/gif/GIFImageReader.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_PNG">
-               
-               platform/image-decoders/png/png.c
-               platform/image-decoders/png/pngerror.c
-               platform/image-decoders/png/pnggccrd.c
-               platform/image-decoders/png/pngget.c
-               platform/image-decoders/png/PNGImageDecoder.cpp
-               platform/image-decoders/png/pngmem.c
-               platform/image-decoders/png/pngpread.c
-               platform/image-decoders/png/pngread.c
-               platform/image-decoders/png/pngrio.c
-               platform/image-decoders/png/pngrtran.c
-               platform/image-decoders/png/pngrutil.c
-               platform/image-decoders/png/pngset.c
-               platform/image-decoders/png/pngtrans.c
-               platform/image-decoders/png/pngvcrd.c
-               platform/image-decoders/png/pngwio.c
-               platform/image-decoders/png/pngwrite.c
-               platform/image-decoders/png/pngwtran.c
-               platform/image-decoders/png/pngwutil.c
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_ZLIB">
-               
-               platform/image-decoders/zlib/adler32.c
-               platform/image-decoders/zlib/compress.c
-               platform/image-decoders/zlib/crc32.c
-               platform/image-decoders/zlib/deflate.c
-               platform/image-decoders/zlib/gzio.c
-               platform/image-decoders/zlib/infback.c
-               platform/image-decoders/zlib/inffast.c
-               platform/image-decoders/zlib/inflate.c
-               platform/image-decoders/zlib/inftrees.c
-               platform/image-decoders/zlib/trees.c
-               platform/image-decoders/zlib/uncompr.c
-               platform/image-decoders/zlib/zutil.c
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_JPEG">
-               
-               platform/image-decoders/jpeg/jcomapi.c
-               platform/image-decoders/jpeg/jdapimin.c
-               platform/image-decoders/jpeg/jdapistd.c
-               platform/image-decoders/jpeg/jdatadst.c
-               platform/image-decoders/jpeg/jdatasrc.c
-               platform/image-decoders/jpeg/jdcoefct.c
-               platform/image-decoders/jpeg/jdcolor.c
-               platform/image-decoders/jpeg/jddctmgr.c
-               platform/image-decoders/jpeg/jdhuff.c
-               platform/image-decoders/jpeg/jdinput.c
-               platform/image-decoders/jpeg/jdmainct.c
-               platform/image-decoders/jpeg/jdmarker.c
-               platform/image-decoders/jpeg/jdmaster.c
-               platform/image-decoders/jpeg/jdmerge.c
-               platform/image-decoders/jpeg/jdphuff.c
-               platform/image-decoders/jpeg/jdpostct.c
-               platform/image-decoders/jpeg/jdsample.c
-               platform/image-decoders/jpeg/jerror.c
-               platform/image-decoders/jpeg/jfdctflt.c
-               platform/image-decoders/jpeg/jfdctfst.c
-               platform/image-decoders/jpeg/jfdctint.c
-               platform/image-decoders/jpeg/jidctflt.c
-               platform/image-decoders/jpeg/jidctfst.c
-               platform/image-decoders/jpeg/jidctint.c
-               platform/image-decoders/jpeg/jmemmgr.c
-               platform/image-decoders/jpeg/jmemnobs.c
-               platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-               platform/image-decoders/jpeg/jquant1.c
-               platform/image-decoders/jpeg/jquant2.c
-               platform/image-decoders/jpeg/jutils.c
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_BMP">
-               
-               platform/image-decoders/bmp/BMPImageDecoder.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_ICO">
-               
-               platform/image-decoders/ico/ICOImageDecoder.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_XBM">
-               
-               platform/image-decoders/xbm/XBMImageDecoder.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_CAIRO">
-               
-               platform/cairo/GraphicsContextCairo.cpp
-               platform/cairo/ImageCairo.cpp
-               platform/cairo/ImageSourceCairo.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_PIXMAN">
-               
-               platform/cairo/pixman/src/fbcompose.c
-               platform/cairo/pixman/src/fbedge.c
-               platform/cairo/pixman/src/fbpict.c
-               platform/cairo/pixman/src/fbtrap.c
-               platform/cairo/pixman/src/icblt.c
-               platform/cairo/pixman/src/icbltone.c
-               platform/cairo/pixman/src/iccolor.c
-               platform/cairo/pixman/src/icformat.c
-               platform/cairo/pixman/src/icimage.c
-               platform/cairo/pixman/src/icpixels.c
-               platform/cairo/pixman/src/icrect.c
-               platform/cairo/pixman/src/icstipple.c
-               platform/cairo/pixman/src/ictransform.c
-               platform/cairo/pixman/src/ictrap.c
-               platform/cairo/pixman/src/ictri.c
-               platform/cairo/pixman/src/icutil.c
-               platform/cairo/pixman/src/pixregion.c
-               platform/cairo/pixman/src/renderedge.c
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_CAIRO">
-               
-               platform/cairo/cairo/src/cairo-arc.c
-               platform/cairo/cairo/src/cairo-array.c
-               platform/cairo/cairo/src/cairo-cache.c
-               platform/cairo/cairo/src/cairo-clip.c
-               platform/cairo/cairo/src/cairo-color.c
-               platform/cairo/cairo/src/cairo-debug.c
-               platform/cairo/cairo/src/cairo-fixed.c
-               platform/cairo/cairo/src/cairo-font-options.c
-               platform/cairo/cairo/src/cairo-font.c
-               platform/cairo/cairo/src/cairo-gstate.c
-               platform/cairo/cairo/src/cairo-hash.c
-               platform/cairo/cairo/src/cairo-hull.c
-               platform/cairo/cairo/src/cairo-image-surface.c
-               platform/cairo/cairo/src/cairo-matrix.c
-               platform/cairo/cairo/src/cairo-meta-surface.c
-               platform/cairo/cairo/src/cairo-output-stream.c
-               platform/cairo/cairo/src/cairo-paginated-surface.c
-               platform/cairo/cairo/src/cairo-path-bounds.c
-               platform/cairo/cairo/src/cairo-path-data.c
-               platform/cairo/cairo/src/cairo-path-fill.c
-               platform/cairo/cairo/src/cairo-path-stroke.c
-               platform/cairo/cairo/src/cairo-path.c
-               platform/cairo/cairo/src/cairo-pattern.c
-               platform/cairo/cairo/src/cairo-pen.c
-               platform/cairo/cairo/src/cairo-polygon.c
-               platform/cairo/cairo/src/cairo-region.c
-               platform/cairo/cairo/src/cairo-scaled-font.c
-               platform/cairo/cairo/src/cairo-slope.c
-               platform/cairo/cairo/src/cairo-spline.c
-               platform/cairo/cairo/src/cairo-stroke-style.c
-               platform/cairo/cairo/src/cairo-surface-fallback.c
-               platform/cairo/cairo/src/cairo-surface.c
-               platform/cairo/cairo/src/cairo-traps.c
-               platform/cairo/cairo/src/cairo-unicode.c
-               platform/cairo/cairo/src/cairo-wideint.c
-               platform/cairo/cairo/src/cairo-win32-font.c
-               platform/cairo/cairo/src/cairo-win32-surface.c
-               platform/cairo/cairo/src/cairo.c
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_CSS">
-               
-               css/CSSBorderImageValue.cpp
-               css/CSSCharsetRule.cpp
-               css/CSSComputedStyleDeclaration.cpp
-               css/CSSCursorImageValue.cpp
-               css/CSSFontFaceRule.cpp
-               css/csshelper.cpp
-               css/CSSImageValue.cpp
-               css/CSSImportRule.cpp
-               css/CSSInheritedValue.cpp
-               css/CSSInitialValue.cpp
-               css/CSSMediaRule.cpp
-               css/CSSMutableStyleDeclaration.cpp
-               css/CSSPageRule.cpp
-               css/cssparser.cpp
-               css/CSSPrimitiveValue.cpp
-               css/CSSProperty.cpp
-               css/CSSRule.cpp
-               css/CSSRuleList.cpp
-               css/CSSSelector.cpp
-               css/CSSStyleDeclaration.cpp
-               css/CSSStyleRule.cpp
-               css/cssstyleselector.cpp
-               css/CSSStyleSheet.cpp
-               css/CSSValueList.cpp
-               css/FontFamilyValue.cpp
-               css/FontValue.cpp
-               css/MediaFeatureNames.cpp
-               css/MediaList.cpp
-               css/MediaQuery.cpp
-               css/MediaQueryExp.cpp
-               css/MediaQueryEvaluator.cpp
-               css/ShadowValue.cpp
-               css/StyleBase.cpp
-               css/StyleList.cpp
-               css/StyleSheet.cpp
-               css/StyleSheetList.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_RENDERING">
-               
-               rendering/AutoTableLayout.cpp
-               rendering/bidi.cpp
-               rendering/break_lines.cpp
-               rendering/CounterNode.cpp
-               rendering/CounterResetNode.cpp
-               rendering/EllipsisBox.cpp
-               rendering/FixedTableLayout.cpp
-               rendering/InlineBox.cpp
-               rendering/InlineFlowBox.cpp
-               rendering/InlineTextBox.cpp
-               rendering/ListMarkerBox.cpp
-               rendering/RenderStyle.cpp
-               rendering/RenderApplet.cpp
-               rendering/RenderArena.cpp
-               rendering/RenderBlock.cpp
-               rendering/RenderBox.cpp
-               rendering/RenderBR.cpp
-               rendering/RenderButton.cpp
-               rendering/RenderContainer.cpp
-               rendering/RenderCounter.cpp
-               rendering/RenderFieldset.cpp
-               rendering/RenderFileUploadControl.cpp
-               rendering/RenderFlexibleBox.cpp
-               rendering/RenderFlow.cpp
-               rendering/RenderFormElement.cpp
-               rendering/RenderFrame.cpp
-               rendering/RenderFrameSet.cpp
-               rendering/RenderHTMLCanvas.cpp
-               rendering/RenderImage.cpp
-               rendering/RenderInline.cpp
-               rendering/RenderLabel.cpp
-               rendering/RenderLayer.cpp
-               rendering/RenderLegend.cpp
-               rendering/RenderLineEdit.cpp
-               rendering/RenderListBox.cpp
-               rendering/RenderListItem.cpp
-               rendering/RenderListMarker.cpp
-               rendering/RenderMenuList.cpp
-               rendering/RenderObject.cpp
-               rendering/RenderPart.cpp
-               rendering/RenderPartObject.cpp
-               rendering/RenderPopupMenu.cpp
-               rendering/RenderReplaced.cpp
-               rendering/DeprecatedRenderSelect.cpp
-               rendering/DeprecatedSlider.cpp
-               rendering/RenderTable.cpp
-               rendering/RenderTableCell.cpp
-               rendering/RenderTableCol.cpp
-               rendering/RenderTableRow.cpp
-               rendering/RenderTableSection.cpp
-               rendering/RenderText.cpp
-               rendering/RenderTextControl.cpp
-               rendering/RenderTextFragment.cpp
-               rendering/RenderTheme.cpp
-               
-               rendering/RenderTreeAsText.cpp
-               rendering/RenderView.cpp
-               rendering/RenderWidget.cpp
-               rendering/RootInlineBox.cpp
-
-       </set>
-
-       <set append="1" var="WEBCORE_SOURCES_XML">
-               xml/DOMParser.cpp
-               xml/xmlhttprequest.cpp
-               xml/XMLSerializer.cpp
-               xml/XPathEvaluator.cpp
-               xml/XPathExpression.cpp
-               xml/XPathExpressionNode.cpp
-               xml/XPathFunctions.cpp
-               xml/XPathNamespace.cpp
-               xml/XPathNSResolver.cpp
-               xml/XPathParser.cpp
-               xml/XPathPath.cpp
-               xml/XPathPredicate.cpp
-               xml/XPathResult.cpp
-               xml/XPathStep.cpp
-               xml/XPathUtil.cpp
-               xml/XPathValue.cpp
-               xml/XPathVariableReference.cpp
-               xml/XSLImportRule.cpp
-               xml/XSLStyleSheet.cpp
-               xml/XSLTProcessor.cpp
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_DOM">
-               
-               dom/Attr.cpp
-               dom/Attribute.cpp
-               dom/BeforeTextInsertedEvent.cpp
-               dom/BeforeUnloadEvent.cpp
-               dom/CDATASection.cpp
-               dom/CharacterData.cpp
-               dom/ChildNodeList.cpp
-               dom/ClipboardEvent.cpp
-               dom/Comment.cpp
-               dom/ContainerNode.cpp
-               dom/CSSMappedAttributeDeclaration.cpp
-               dom/Document.cpp
-               dom/DocumentFragment.cpp
-               dom/DocumentType.cpp
-               dom/DOMImplementation.cpp
-               dom/EditingText.cpp
-               dom/Element.cpp
-               dom/Entity.cpp
-               dom/EntityReference.cpp
-               dom/Event.cpp
-               dom/EventNames.cpp
-               dom/EventTargetNode.cpp
-               dom/KeyboardEvent.cpp
-               dom/MappedAttribute.cpp
-               dom/MouseEvent.cpp
-               dom/MouseRelatedEvent.cpp
-               dom/MutationEvent.cpp
-               dom/NamedAttrMap.cpp
-               dom/NamedMappedAttrMap.cpp
-               dom/NodeIterator.cpp
-               dom/NameNodeList.cpp
-               dom/Node.cpp
-               dom/NodeFilter.cpp
-               dom/NodeFilterCondition.cpp
-               dom/NodeList.cpp
-               dom/Notation.cpp
-               dom/OverflowEvent.cpp
-               dom/Position.cpp
-               dom/ProcessingInstruction.cpp
-               dom/QualifiedName.cpp
-               dom/Range.cpp
-               dom/RegisteredEventListener.cpp
-               dom/StyledElement.cpp
-               dom/Text.cpp
-               dom/Traversal.cpp
-               dom/TreeWalker.cpp
-               dom/UIEvent.cpp
-               dom/WheelEvent.cpp
-               dom/XMLTokenizer.cpp
-
-       </set>
-
-       <set append="1" var="WEBCORE_SOURCES_ICON">
-               icon/IconDatabase.cpp
-               icon/IconLoader.cpp
-               icon/SQLDatabase.cpp
-               icon/SQLStatement.cpp
-               icon/SiteIcon.cpp
-       </set>
-
-       <set append="1" var="WEBCORE_SOURCES_BRIDGE">
-               
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_WIN">
-               
-               bridge/win/FrameWin.cpp
-               bridge/win/PageWin.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_EDITING">
-               
-               editing/AppendNodeCommand.cpp
-               editing/ApplyStyleCommand.cpp
-               editing/BreakBlockquoteCommand.cpp
-               editing/CommandByName.cpp
-               editing/CompositeEditCommand.cpp
-               editing/CreateLinkCommand.cpp
-               editing/DeleteFromTextNodeCommand.cpp
-               editing/DeleteSelectionCommand.cpp
-               editing/EditCommand.cpp
-               editing/FormatBlockCommand.cpp
-               editing/htmlediting.cpp
-               editing/HTMLInterchange.cpp
-               editing/IndentOutdentCommand.cpp
-               editing/InsertIntoTextNodeCommand.cpp
-               editing/InsertLineBreakCommand.cpp
-               editing/InsertListCommand.cpp
-               editing/InsertNodeBeforeCommand.cpp
-               editing/InsertParagraphSeparatorCommand.cpp
-               editing/InsertTextCommand.cpp
-               editing/JoinTextNodesCommand.cpp
-               editing/JSEditor.cpp
-               editing/markup.cpp
-               editing/MergeIdenticalElementsCommand.cpp
-               editing/ModifySelectionListLevel.cpp
-               editing/MoveSelectionCommand.cpp
-               editing/RebalanceWhitespaceCommand.cpp
-               editing/RemoveCSSPropertyCommand.cpp
-               editing/RemoveNodeAttributeCommand.cpp
-               editing/RemoveNodeCommand.cpp
-               editing/RemoveNodePreservingChildrenCommand.cpp
-               editing/ReplaceSelectionCommand.cpp
-               editing/Selection.cpp
-               editing/SelectionController.cpp
-               editing/SetNodeAttributeCommand.cpp
-               editing/SplitElementCommand.cpp
-               editing/SplitTextNodeCommand.cpp
-               editing/SplitTextNodeContainingElementCommand.cpp
-               editing/TextIterator.cpp
-               editing/TypingCommand.cpp
-               editing/UnlinkCommand.cpp
-               editing/visible_units.cpp
-               editing/VisiblePosition.cpp
-               editing/WrapContentsInDummySpanCommand.cpp
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_HTML">
-
-               html/CanvasGradient.cpp
-               html/CanvasPattern.cpp
-               html/CanvasRenderingContext2D.cpp
-               html/CanvasStyle.cpp
-               html/FormDataList.cpp
-               html/HTMLAnchorElement.cpp
-               html/HTMLAppletElement.cpp
-               html/HTMLAreaElement.cpp
-               html/HTMLBaseElement.cpp
-               html/HTMLBaseFontElement.cpp
-               html/HTMLBlockquoteElement.cpp
-               html/HTMLBodyElement.cpp
-               html/HTMLBRElement.cpp
-               html/HTMLButtonElement.cpp
-               html/HTMLCanvasElement.cpp
-               html/HTMLCollection.cpp
-               html/HTMLDirectoryElement.cpp
-               html/HTMLDivElement.cpp
-               html/HTMLDListElement.cpp
-               html/HTMLDocument.cpp
-               html/HTMLElement.cpp
-               html/HTMLElementFactory.cpp
-               html/HTMLEmbedElement.cpp
-               html/HTMLFieldSetElement.cpp
-               html/HTMLFontElement.cpp
-               html/HTMLFormCollection.cpp
-               html/HTMLFormElement.cpp
-               html/HTMLFrameElement.cpp
-               html/HTMLFrameSetElement.cpp
-               html/HTMLGenericFormElement.cpp
-               html/HTMLHeadElement.cpp
-               html/HTMLHeadingElement.cpp
-               html/HTMLHRElement.cpp
-               html/HTMLHtmlElement.cpp
-               html/HTMLIFrameElement.cpp
-               html/HTMLImageElement.cpp
-               html/HTMLImageLoader.cpp
-               html/HTMLInputElement.cpp
-               html/HTMLIsIndexElement.cpp
-               html/HTMLKeygenElement.cpp
-               html/HTMLLabelElement.cpp
-               html/HTMLLegendElement.cpp
-               html/HTMLLIElement.cpp
-               html/HTMLLinkElement.cpp
-               html/HTMLMapElement.cpp
-               html/HTMLMarqueeElement.cpp
-               html/HTMLMenuElement.cpp
-               html/HTMLMetaElement.cpp
-               html/HTMLModElement.cpp
-               html/HTMLNameCollection.cpp
-               html/HTMLObjectElement.cpp
-               html/HTMLOListElement.cpp
-               html/HTMLOptGroupElement.cpp
-               html/HTMLOptionElement.cpp
-               html/HTMLOptionsCollection.cpp
-               html/HTMLParagraphElement.cpp
-               html/HTMLParamElement.cpp
-               html/HTMLParser.cpp
-               html/HTMLPlugInElement.cpp
-               html/HTMLPreElement.cpp
-               html/HTMLQuoteElement.cpp
-               html/HTMLScriptElement.cpp
-               html/HTMLSelectElement.cpp
-               html/HTMLStyleElement.cpp
-               html/HTMLTableCaptionElement.cpp
-               html/HTMLTableCellElement.cpp
-               html/HTMLTableColElement.cpp
-               html/HTMLTableElement.cpp
-               html/HTMLTablePartElement.cpp
-               html/HTMLTableRowElement.cpp
-               html/HTMLTableSectionElement.cpp
-               html/HTMLTextAreaElement.cpp
-               html/HTMLTextFieldInnerElement.cpp
-               html/HTMLTitleElement.cpp
-               html/HTMLTokenizer.cpp
-               html/HTMLUListElement.cpp
-           html/HTMLViewSourceDocument.cpp     
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_BINDINGS">
-               
-
-       </set>
-       <set append="1" var="WEBCORE_SOURCES_JS">
-               
-               bindings/js/JSCanvasRenderingContext2DCustom.cpp
-               bindings/js/JSHTMLElementWrapperFactory.cpp
-               bindings/js/JSHTMLFormElementCustom.cpp
-               bindings/js/JSHTMLInputElementBase.cpp
-               bindings/js/JSHTMLOptionElementConstructor.cpp
-               bindings/js/JSHTMLOptionsCollectionCustom.cpp
-               bindings/js/JSNodeIteratorCustom.cpp
-               bindings/js/JSTreeWalkerCustom.cpp
-               bindings/js/JSXMLHttpRequest.cpp
-               bindings/js/JSXSLTProcessor.cpp
-               bindings/js/kjs_binding.cpp
-               bindings/js/kjs_css.cpp
-               bindings/js/kjs_dom.cpp
-               bindings/js/kjs_events.cpp
-               bindings/js/kjs_html.cpp
-               bindings/js/kjs_navigator.cpp
-               bindings/js/kjs_proxy.cpp
-               bindings/js/kjs_traversal.cpp
-               bindings/js/kjs_window.cpp
-
-       </set>
-
+    <set append="1" var="WEBCORE_SOURCES_DERIVEDSOURCES">
+        DerivedSources/WebCore/CSSGrammar.cpp
+        DerivedSources/WebCore/ColorData.c
+        DerivedSources/WebCore/HTMLEntityNames.c
+        DerivedSources/WebCore/HTMLNames.cpp
+        DerivedSources/WebCore/JSAttr.cpp
+        DerivedSources/WebCore/JSCSSPrimitiveValue.cpp
+        DerivedSources/WebCore/JSCSSRule.cpp
+        DerivedSources/WebCore/JSCSSRuleList.cpp
+        DerivedSources/WebCore/JSCSSStyleDeclaration.cpp
+        DerivedSources/WebCore/JSCSSValue.cpp
+        DerivedSources/WebCore/JSCSSValueList.cpp
+        DerivedSources/WebCore/JSCanvasGradient.cpp
+        DerivedSources/WebCore/JSCanvasPattern.cpp
+        DerivedSources/WebCore/JSCanvasRenderingContext2D.cpp
+        DerivedSources/WebCore/JSCharacterData.cpp
+        DerivedSources/WebCore/JSCounter.cpp
+        DerivedSources/WebCore/JSDOMImplementation.cpp
+        DerivedSources/WebCore/JSDOMParser.cpp
+        DerivedSources/WebCore/JSDOMWindow.cpp
+        DerivedSources/WebCore/JSDocument.cpp
+        DerivedSources/WebCore/JSDocumentFragment.cpp
+        DerivedSources/WebCore/JSDocumentType.cpp
+        DerivedSources/WebCore/JSElement.cpp
+        DerivedSources/WebCore/JSEntity.cpp
+        DerivedSources/WebCore/JSEvent.cpp
+        DerivedSources/WebCore/JSHTMLAnchorElement.cpp
+        DerivedSources/WebCore/JSHTMLAppletElement.cpp
+        DerivedSources/WebCore/JSHTMLAreaElement.cpp
+        DerivedSources/WebCore/JSHTMLBRElement.cpp
+        DerivedSources/WebCore/JSHTMLBaseElement.cpp
+        DerivedSources/WebCore/JSHTMLBaseFontElement.cpp
+        DerivedSources/WebCore/JSHTMLBlockquoteElement.cpp
+        DerivedSources/WebCore/JSHTMLBodyElement.cpp
+        DerivedSources/WebCore/JSHTMLButtonElement.cpp
+        DerivedSources/WebCore/JSHTMLCanvasElement.cpp
+        DerivedSources/WebCore/JSHTMLDListElement.cpp
+        DerivedSources/WebCore/JSHTMLDirectoryElement.cpp
+        DerivedSources/WebCore/JSHTMLDivElement.cpp
+        DerivedSources/WebCore/JSHTMLDocument.cpp
+        DerivedSources/WebCore/JSHTMLElement.cpp
+        DerivedSources/WebCore/JSHTMLFieldSetElement.cpp
+        DerivedSources/WebCore/JSHTMLFontElement.cpp
+        DerivedSources/WebCore/JSHTMLFormElement.cpp
+        DerivedSources/WebCore/JSHTMLHRElement.cpp
+        DerivedSources/WebCore/JSHTMLHeadElement.cpp
+        DerivedSources/WebCore/JSHTMLHeadingElement.cpp
+        DerivedSources/WebCore/JSHTMLHtmlElement.cpp
+        DerivedSources/WebCore/JSHTMLImageElement.cpp
+        DerivedSources/WebCore/JSHTMLInputElement.cpp
+        DerivedSources/WebCore/JSHTMLIsIndexElement.cpp
+        DerivedSources/WebCore/JSHTMLLIElement.cpp
+        DerivedSources/WebCore/JSHTMLLabelElement.cpp
+        DerivedSources/WebCore/JSHTMLLegendElement.cpp
+        DerivedSources/WebCore/JSHTMLLinkElement.cpp
+        DerivedSources/WebCore/JSHTMLMapElement.cpp
+        DerivedSources/WebCore/JSHTMLMenuElement.cpp
+        DerivedSources/WebCore/JSHTMLMetaElement.cpp
+        DerivedSources/WebCore/JSHTMLModElement.cpp
+        DerivedSources/WebCore/JSHTMLOListElement.cpp
+        DerivedSources/WebCore/JSHTMLOptGroupElement.cpp
+        DerivedSources/WebCore/JSHTMLOptionElement.cpp
+        DerivedSources/WebCore/JSHTMLOptionsCollection.cpp
+        DerivedSources/WebCore/JSHTMLParagraphElement.cpp
+        DerivedSources/WebCore/JSHTMLParamElement.cpp
+        DerivedSources/WebCore/JSHTMLPreElement.cpp
+        DerivedSources/WebCore/JSHTMLQuoteElement.cpp
+        DerivedSources/WebCore/JSHTMLScriptElement.cpp
+        DerivedSources/WebCore/JSHTMLStyleElement.cpp
+        DerivedSources/WebCore/JSHTMLTextAreaElement.cpp
+        DerivedSources/WebCore/JSHTMLTitleElement.cpp
+        DerivedSources/WebCore/JSHTMLUListElement.cpp
+        DerivedSources/WebCore/JSKeyboardEvent.cpp
+        DerivedSources/WebCore/JSMouseEvent.cpp
+        DerivedSources/WebCore/JSMutationEvent.cpp
+        DerivedSources/WebCore/JSNode.cpp
+        DerivedSources/WebCore/JSNodeFilter.cpp
+        DerivedSources/WebCore/JSNodeIterator.cpp
+        DerivedSources/WebCore/JSNotation.cpp
+        DerivedSources/WebCore/JSOverflowEvent.cpp
+        DerivedSources/WebCore/JSProcessingInstruction.cpp
+        DerivedSources/WebCore/JSRange.cpp
+        DerivedSources/WebCore/JSRangeException.cpp
+        DerivedSources/WebCore/JSText.cpp
+        DerivedSources/WebCore/JSTreeWalker.cpp
+        DerivedSources/WebCore/JSUIEvent.cpp
+        DerivedSources/WebCore/JSWheelEvent.cpp
+        DerivedSources/WebCore/JSXMLSerializer.cpp
+        DerivedSources/WebCore/JSXPathEvaluator.cpp
+        DerivedSources/WebCore/JSXPathExpression.cpp
+        DerivedSources/WebCore/JSXPathNSResolver.cpp
+        DerivedSources/WebCore/JSXPathResult.cpp
+        DerivedSources/WebCore/UserAgentStyleSheetsData.cpp
+        DerivedSources/WebCore/XLinkNames.cpp
+        DerivedSources/WebCore/XMLNames.cpp
+        DerivedSources/WebCore/XPathGrammar.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_PAGE">
+        page/Chrome.cpp
+        page/DOMWindow.cpp
+        page/Frame.cpp
+        page/FrameTree.cpp
+        page/FrameView.cpp
+        page/MouseEventWithHitTestResults.cpp
+        page/Page.cpp
+        page/PageState.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_LOADER">
+        loader/Cache.cpp
+        loader/CachedCSSStyleSheet.cpp
+        loader/CachedImage.cpp
+        loader/CachedResource.cpp
+        loader/CachedResourceClientWalker.cpp
+        loader/CachedScript.cpp
+        loader/CachedXSLStyleSheet.cpp
+        loader/DocLoader.cpp
+        loader/DocumentLoader.cpp
+        loader/FormState.cpp
+        loader/FrameLoader.cpp
+        loader/ImageDocument.cpp
+        loader/MainResourceLoader.cpp
+        loader/NetscapePlugInStreamLoader.cpp
+        loader/PluginDocument.cpp
+        loader/Request.cpp
+        loader/ResourceLoader.cpp
+        loader/SubresourceLoader.cpp
+        loader/TextDocument.cpp
+        loader/TextResourceDecoder.cpp
+        loader/loader.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_PLATFORM">
+        platform/Arena.cpp
+        platform/ArrayImpl.cpp
+        platform/AtomicString.cpp
+        platform/CString.cpp
+        platform/DeprecatedCString.cpp
+        platform/DeprecatedPtrListImpl.cpp
+        platform/DeprecatedString.cpp
+        platform/DeprecatedStringList.cpp
+        platform/DeprecatedValueListImpl.cpp
+        platform/Font.cpp
+        platform/FontCache.cpp
+        platform/FontData.cpp
+        platform/FontFallbackList.cpp
+        platform/FontFamily.cpp
+        platform/GlyphMap.cpp
+        platform/GlyphWidthMap.cpp
+        platform/KURL.cpp
+        platform/Logging.cpp
+        platform/MimeTypeRegistry.cpp
+        platform/RegularExpression.cpp
+        platform/ScrollBar.cpp
+        platform/SegmentedString.cpp
+        platform/String.cpp
+        platform/StringImpl.cpp
+        platform/TextCodec.cpp
+        platform/TextCodecICU.cpp
+        platform/TextCodecLatin1.cpp
+        platform/TextCodecUTF16.cpp
+        platform/TextDecoder.cpp
+        platform/TextEncoding.cpp
+        platform/TextEncodingRegistry.cpp
+        platform/TextStream.cpp
+        platform/Timer.cpp
+        platform/Widget.cpp
+        platform/graphics/AffineTransform.cpp
+        platform/graphics/Color.cpp
+        platform/graphics/FloatPoint.cpp
+        platform/graphics/FloatRect.cpp
+        platform/graphics/FloatSize.cpp
+        platform/graphics/GraphicsContext.cpp
+        platform/graphics/GraphicsTypes.cpp
+        platform/graphics/Image.cpp
+        platform/graphics/IntRect.cpp
+        platform/graphics/Path.cpp
+        platform/graphics/Pen.cpp
+        platform/network/FormData.cpp
+        platform/network/ResourceHandle.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_WIN">
+        platform/network/win/ResourceHandleWin.cpp
+        platform/win/CookieJarWin.cpp
+        platform/win/CursorWin.cpp
+        platform/win/FontCacheWin.cpp
+        platform/win/FontDataWin.cpp
+        platform/win/FontPlatformDataWin.cpp
+        platform/win/FontWin.cpp
+        platform/win/GlyphMapWin.cpp
+        platform/win/IntPointWin.cpp
+        platform/win/IntRectWin.cpp
+        platform/win/IntSizeWin.cpp
+        platform/win/KeyEventWin.cpp
+        platform/win/MouseEventWin.cpp
+        platform/win/ScreenWin.cpp
+        platform/win/ScrollViewWin.cpp
+        platform/win/SharedTimerWin.cpp
+        platform/win/SystemTimeWin.cpp
+        platform/win/TemporaryLinkStubs.cpp
+        platform/win/WidgetWin.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_GIF">
+        platform/image-decoders/gif/GIFImageDecoder.cpp
+        platform/image-decoders/gif/GIFImageReader.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_PNG">
+        platform/image-decoders/png/PNGImageDecoder.cpp
+        platform/image-decoders/png/png.c
+        platform/image-decoders/png/pngerror.c
+        platform/image-decoders/png/pnggccrd.c
+        platform/image-decoders/png/pngget.c
+        platform/image-decoders/png/pngmem.c
+        platform/image-decoders/png/pngpread.c
+        platform/image-decoders/png/pngread.c
+        platform/image-decoders/png/pngrio.c
+        platform/image-decoders/png/pngrtran.c
+        platform/image-decoders/png/pngrutil.c
+        platform/image-decoders/png/pngset.c
+        platform/image-decoders/png/pngtrans.c
+        platform/image-decoders/png/pngvcrd.c
+        platform/image-decoders/png/pngwio.c
+        platform/image-decoders/png/pngwrite.c
+        platform/image-decoders/png/pngwtran.c
+        platform/image-decoders/png/pngwutil.c
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_ZLIB">
+        platform/image-decoders/zlib/adler32.c
+        platform/image-decoders/zlib/compress.c
+        platform/image-decoders/zlib/crc32.c
+        platform/image-decoders/zlib/deflate.c
+        platform/image-decoders/zlib/gzio.c
+        platform/image-decoders/zlib/infback.c
+        platform/image-decoders/zlib/inffast.c
+        platform/image-decoders/zlib/inflate.c
+        platform/image-decoders/zlib/inftrees.c
+        platform/image-decoders/zlib/trees.c
+        platform/image-decoders/zlib/uncompr.c
+        platform/image-decoders/zlib/zutil.c
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_JPEG">
+        platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+        platform/image-decoders/jpeg/jcomapi.c
+        platform/image-decoders/jpeg/jdapimin.c
+        platform/image-decoders/jpeg/jdapistd.c
+        platform/image-decoders/jpeg/jdatadst.c
+        platform/image-decoders/jpeg/jdatasrc.c
+        platform/image-decoders/jpeg/jdcoefct.c
+        platform/image-decoders/jpeg/jdcolor.c
+        platform/image-decoders/jpeg/jddctmgr.c
+        platform/image-decoders/jpeg/jdhuff.c
+        platform/image-decoders/jpeg/jdinput.c
+        platform/image-decoders/jpeg/jdmainct.c
+        platform/image-decoders/jpeg/jdmarker.c
+        platform/image-decoders/jpeg/jdmaster.c
+        platform/image-decoders/jpeg/jdmerge.c
+        platform/image-decoders/jpeg/jdphuff.c
+        platform/image-decoders/jpeg/jdpostct.c
+        platform/image-decoders/jpeg/jdsample.c
+        platform/image-decoders/jpeg/jerror.c
+        platform/image-decoders/jpeg/jfdctflt.c
+        platform/image-decoders/jpeg/jfdctfst.c
+        platform/image-decoders/jpeg/jfdctint.c
+        platform/image-decoders/jpeg/jidctflt.c
+        platform/image-decoders/jpeg/jidctfst.c
+        platform/image-decoders/jpeg/jidctint.c
+        platform/image-decoders/jpeg/jmemmgr.c
+        platform/image-decoders/jpeg/jmemnobs.c
+        platform/image-decoders/jpeg/jquant1.c
+        platform/image-decoders/jpeg/jquant2.c
+        platform/image-decoders/jpeg/jutils.c
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_BMP">
+        platform/image-decoders/bmp/BMPImageDecoder.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_ICO">
+        platform/image-decoders/ico/ICOImageDecoder.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_XBM">
+        platform/image-decoders/xbm/XBMImageDecoder.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_CAIRO">
+        platform/graphics/cairo/GraphicsContextCairo.cpp
+        platform/graphics/cairo/ImageCairo.cpp
+        platform/graphics/cairo/ImageSourceCairo.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_PIXMAN">
+        platform/graphics/cairo/pixman/src/fbcompose.c
+        platform/graphics/cairo/pixman/src/fbedge.c
+        platform/graphics/cairo/pixman/src/fbpict.c
+        platform/graphics/cairo/pixman/src/fbtrap.c
+        platform/graphics/cairo/pixman/src/icblt.c
+        platform/graphics/cairo/pixman/src/icbltone.c
+        platform/graphics/cairo/pixman/src/iccolor.c
+        platform/graphics/cairo/pixman/src/icformat.c
+        platform/graphics/cairo/pixman/src/icimage.c
+        platform/graphics/cairo/pixman/src/icpixels.c
+        platform/graphics/cairo/pixman/src/icrect.c
+        platform/graphics/cairo/pixman/src/icstipple.c
+        platform/graphics/cairo/pixman/src/ictransform.c
+        platform/graphics/cairo/pixman/src/ictrap.c
+        platform/graphics/cairo/pixman/src/ictri.c
+        platform/graphics/cairo/pixman/src/icutil.c
+        platform/graphics/cairo/pixman/src/pixregion.c
+        platform/graphics/cairo/pixman/src/renderedge.c
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_CAIRO">
+        platform/graphics/cairo/cairo/src/cairo-arc.c
+        platform/graphics/cairo/cairo/src/cairo-array.c
+        platform/graphics/cairo/cairo/src/cairo-cache.c
+        platform/graphics/cairo/cairo/src/cairo-clip.c
+        platform/graphics/cairo/cairo/src/cairo-color.c
+        platform/graphics/cairo/cairo/src/cairo-debug.c
+        platform/graphics/cairo/cairo/src/cairo-fixed.c
+        platform/graphics/cairo/cairo/src/cairo-font-options.c
+        platform/graphics/cairo/cairo/src/cairo-font.c
+        platform/graphics/cairo/cairo/src/cairo-gstate.c
+        platform/graphics/cairo/cairo/src/cairo-hash.c
+        platform/graphics/cairo/cairo/src/cairo-hull.c
+        platform/graphics/cairo/cairo/src/cairo-image-surface.c
+        platform/graphics/cairo/cairo/src/cairo-matrix.c
+        platform/graphics/cairo/cairo/src/cairo-meta-surface.c
+        platform/graphics/cairo/cairo/src/cairo-output-stream.c
+        platform/graphics/cairo/cairo/src/cairo-paginated-surface.c
+        platform/graphics/cairo/cairo/src/cairo-path-bounds.c
+        platform/graphics/cairo/cairo/src/cairo-path-data.c
+        platform/graphics/cairo/cairo/src/cairo-path-fill.c
+        platform/graphics/cairo/cairo/src/cairo-path-stroke.c
+        platform/graphics/cairo/cairo/src/cairo-path.c
+        platform/graphics/cairo/cairo/src/cairo-pattern.c
+        platform/graphics/cairo/cairo/src/cairo-pen.c
+        platform/graphics/cairo/cairo/src/cairo-polygon.c
+        platform/graphics/cairo/cairo/src/cairo-region.c
+        platform/graphics/cairo/cairo/src/cairo-scaled-font.c
+        platform/graphics/cairo/cairo/src/cairo-slope.c
+        platform/graphics/cairo/cairo/src/cairo-spline.c
+        platform/graphics/cairo/cairo/src/cairo-stroke-style.c
+        platform/graphics/cairo/cairo/src/cairo-surface-fallback.c
+        platform/graphics/cairo/cairo/src/cairo-surface.c
+        platform/graphics/cairo/cairo/src/cairo-traps.c
+        platform/graphics/cairo/cairo/src/cairo-unicode.c
+        platform/graphics/cairo/cairo/src/cairo-wideint.c
+        platform/graphics/cairo/cairo/src/cairo-win32-font.c
+        platform/graphics/cairo/cairo/src/cairo-win32-surface.c
+        platform/graphics/cairo/cairo/src/cairo.c
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_CSS">
+        css/CSSBorderImageValue.cpp
+        css/CSSCharsetRule.cpp
+        css/CSSComputedStyleDeclaration.cpp
+        css/CSSCursorImageValue.cpp
+        css/CSSFontFaceRule.cpp
+        css/CSSImageValue.cpp
+        css/CSSImportRule.cpp
+        css/CSSInheritedValue.cpp
+        css/CSSInitialValue.cpp
+        css/CSSMediaRule.cpp
+        css/CSSMutableStyleDeclaration.cpp
+        css/CSSPageRule.cpp
+        css/CSSPrimitiveValue.cpp
+        css/CSSProperty.cpp
+        css/CSSRule.cpp
+        css/CSSRuleList.cpp
+        css/CSSSelector.cpp
+        css/CSSStyleDeclaration.cpp
+        css/CSSStyleRule.cpp
+        css/CSSStyleSheet.cpp
+        css/CSSValueList.cpp
+        css/FontFamilyValue.cpp
+        css/FontValue.cpp
+        css/MediaFeatureNames.cpp
+        css/MediaList.cpp
+        css/MediaQuery.cpp
+        css/MediaQueryEvaluator.cpp
+        css/MediaQueryExp.cpp
+        css/ShadowValue.cpp
+        css/StyleBase.cpp
+        css/StyleList.cpp
+        css/StyleSheet.cpp
+        css/StyleSheetList.cpp
+        css/csshelper.cpp
+        css/cssparser.cpp
+        css/cssstyleselector.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_RENDERING">
+        rendering/AutoTableLayout.cpp
+        rendering/CounterNode.cpp
+        rendering/CounterResetNode.cpp
+        rendering/DeprecatedSlider.cpp
+        rendering/EllipsisBox.cpp
+        rendering/FixedTableLayout.cpp
+        rendering/HitTestResult.cpp
+        rendering/InlineBox.cpp
+        rendering/InlineFlowBox.cpp
+        rendering/InlineTextBox.cpp
+        rendering/ListMarkerBox.cpp
+        rendering/RenderApplet.cpp
+        rendering/RenderArena.cpp
+        rendering/RenderBR.cpp
+        rendering/RenderBlock.cpp
+        rendering/RenderBox.cpp
+        rendering/RenderButton.cpp
+        rendering/RenderContainer.cpp
+        rendering/RenderCounter.cpp
+        rendering/RenderFieldset.cpp
+        rendering/RenderFileUploadControl.cpp
+        rendering/RenderFlexibleBox.cpp
+        rendering/RenderFlow.cpp
+        rendering/RenderFormElement.cpp
+        rendering/RenderFrame.cpp
+        rendering/RenderFrameSet.cpp
+        rendering/RenderHTMLCanvas.cpp
+        rendering/RenderImage.cpp
+        rendering/RenderInline.cpp
+        rendering/RenderLabel.cpp
+        rendering/RenderLayer.cpp
+        rendering/RenderLegend.cpp
+        rendering/RenderLineEdit.cpp
+        rendering/RenderListBox.cpp
+        rendering/RenderListItem.cpp
+        rendering/RenderListMarker.cpp
+        rendering/RenderMenuList.cpp
+        rendering/RenderObject.cpp
+        rendering/RenderPart.cpp
+        rendering/RenderPartObject.cpp
+        rendering/RenderReplaced.cpp
+        rendering/RenderStyle.cpp
+        rendering/RenderTable.cpp
+        rendering/RenderTableCell.cpp
+        rendering/RenderTableCol.cpp
+        rendering/RenderTableRow.cpp
+        rendering/RenderTableSection.cpp
+        rendering/RenderText.cpp
+        rendering/RenderTextControl.cpp
+        rendering/RenderTextFragment.cpp
+        rendering/RenderTheme.cpp
+        rendering/RenderTreeAsText.cpp
+        rendering/RenderView.cpp
+        rendering/RenderWidget.cpp
+        rendering/RootInlineBox.cpp
+        rendering/bidi.cpp
+        rendering/break_lines.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_XML">
+        xml/DOMParser.cpp
+        xml/XMLSerializer.cpp
+        xml/XPathEvaluator.cpp
+        xml/XPathExpression.cpp
+        xml/XPathExpressionNode.cpp
+        xml/XPathFunctions.cpp
+        xml/XPathNSResolver.cpp
+        xml/XPathNamespace.cpp
+        xml/XPathParser.cpp
+        xml/XPathPath.cpp
+        xml/XPathPredicate.cpp
+        xml/XPathResult.cpp
+        xml/XPathStep.cpp
+        xml/XPathUtil.cpp
+        xml/XPathValue.cpp
+        xml/XPathVariableReference.cpp
+        xml/XSLImportRule.cpp
+        xml/XSLStyleSheet.cpp
+        xml/XSLTProcessor.cpp
+        xml/xmlhttprequest.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_DOM">
+        dom/Attr.cpp
+        dom/Attribute.cpp
+        dom/BeforeTextInsertedEvent.cpp
+        dom/BeforeUnloadEvent.cpp
+        dom/CDATASection.cpp
+        dom/CSSMappedAttributeDeclaration.cpp
+        dom/CharacterData.cpp
+        dom/ChildNodeList.cpp
+        dom/ClipboardEvent.cpp
+        dom/Comment.cpp
+        dom/ContainerNode.cpp
+        dom/DOMImplementation.cpp
+        dom/Document.cpp
+        dom/DocumentFragment.cpp
+        dom/DocumentType.cpp
+        dom/EditingText.cpp
+        dom/Element.cpp
+        dom/Entity.cpp
+        dom/EntityReference.cpp
+        dom/Event.cpp
+        dom/EventNames.cpp
+        dom/EventTargetNode.cpp
+        dom/KeyboardEvent.cpp
+        dom/MappedAttribute.cpp
+        dom/MouseEvent.cpp
+        dom/MouseRelatedEvent.cpp
+        dom/MutationEvent.cpp
+        dom/NameNodeList.cpp
+        dom/NamedAttrMap.cpp
+        dom/NamedMappedAttrMap.cpp
+        dom/Node.cpp
+        dom/NodeFilter.cpp
+        dom/NodeFilterCondition.cpp
+        dom/NodeIterator.cpp
+        dom/NodeList.cpp
+        dom/Notation.cpp
+        dom/OverflowEvent.cpp
+        dom/Position.cpp
+        dom/ProcessingInstruction.cpp
+        dom/QualifiedName.cpp
+        dom/Range.cpp
+        dom/RegisteredEventListener.cpp
+        dom/StyledElement.cpp
+        dom/Text.cpp
+        dom/Traversal.cpp
+        dom/TreeWalker.cpp
+        dom/UIEvent.cpp
+        dom/WheelEvent.cpp
+        dom/XMLTokenizer.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_ICON">
+        loader/icon/IconDataCache.cpp
+        loader/icon/IconDatabase.cpp
+        loader/icon/IconLoader.cpp
+        loader/icon/SQLDatabase.cpp
+        loader/icon/SQLStatement.cpp
+        loader/icon/SQLTransaction.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_WIN">
+        bridge/win/FrameWin.cpp
+        bridge/win/PageWin.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_EDITING">
+        editing/AppendNodeCommand.cpp
+        editing/ApplyStyleCommand.cpp
+        editing/BreakBlockquoteCommand.cpp
+        editing/CommandByName.cpp
+        editing/CompositeEditCommand.cpp
+        editing/CreateLinkCommand.cpp
+        editing/DeleteButton.cpp
+        editing/DeleteButtonController.cpp
+        editing/DeleteFromTextNodeCommand.cpp
+        editing/DeleteSelectionCommand.cpp
+        editing/EditCommand.cpp
+        editing/Editor.cpp
+        editing/FormatBlockCommand.cpp
+        editing/HTMLInterchange.cpp
+        editing/IndentOutdentCommand.cpp
+        editing/InsertIntoTextNodeCommand.cpp
+        editing/InsertLineBreakCommand.cpp
+        editing/InsertListCommand.cpp
+        editing/InsertNodeBeforeCommand.cpp
+        editing/InsertParagraphSeparatorCommand.cpp
+        editing/InsertTextCommand.cpp
+        editing/JSEditor.cpp
+        editing/JoinTextNodesCommand.cpp
+        editing/MergeIdenticalElementsCommand.cpp
+        editing/ModifySelectionListLevel.cpp
+        editing/MoveSelectionCommand.cpp
+        editing/RebalanceWhitespaceCommand.cpp
+        editing/RemoveCSSPropertyCommand.cpp
+        editing/RemoveNodeAttributeCommand.cpp
+        editing/RemoveNodeCommand.cpp
+        editing/RemoveNodePreservingChildrenCommand.cpp
+        editing/ReplaceSelectionCommand.cpp
+        editing/Selection.cpp
+        editing/SelectionController.cpp
+        editing/SetNodeAttributeCommand.cpp
+        editing/SplitElementCommand.cpp
+        editing/SplitTextNodeCommand.cpp
+        editing/SplitTextNodeContainingElementCommand.cpp
+        editing/TextIterator.cpp
+        editing/TypingCommand.cpp
+        editing/UnlinkCommand.cpp
+        editing/VisiblePosition.cpp
+        editing/WrapContentsInDummySpanCommand.cpp
+        editing/htmlediting.cpp
+        editing/markup.cpp
+        editing/visible_units.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_HTML">
+        html/CanvasGradient.cpp
+        html/CanvasPattern.cpp
+        html/CanvasRenderingContext2D.cpp
+        html/CanvasStyle.cpp
+        html/FormDataList.cpp
+        html/HTMLAnchorElement.cpp
+        html/HTMLAppletElement.cpp
+        html/HTMLAreaElement.cpp
+        html/HTMLBRElement.cpp
+        html/HTMLBaseElement.cpp
+        html/HTMLBaseFontElement.cpp
+        html/HTMLBlockquoteElement.cpp
+        html/HTMLBodyElement.cpp
+        html/HTMLButtonElement.cpp
+        html/HTMLCanvasElement.cpp
+        html/HTMLCollection.cpp
+        html/HTMLDListElement.cpp
+        html/HTMLDirectoryElement.cpp
+        html/HTMLDivElement.cpp
+        html/HTMLDocument.cpp
+        html/HTMLElement.cpp
+        html/HTMLElementFactory.cpp
+        html/HTMLEmbedElement.cpp
+        html/HTMLFieldSetElement.cpp
+        html/HTMLFontElement.cpp
+        html/HTMLFormCollection.cpp
+        html/HTMLFormElement.cpp
+        html/HTMLFrameElement.cpp
+        html/HTMLFrameElementBase.cpp
+        html/HTMLFrameSetElement.cpp
+        html/HTMLGenericFormElement.cpp
+        html/HTMLHRElement.cpp
+        html/HTMLHeadElement.cpp
+        html/HTMLHeadingElement.cpp
+        html/HTMLHtmlElement.cpp
+        html/HTMLIFrameElement.cpp
+        html/HTMLImageElement.cpp
+        html/HTMLImageLoader.cpp
+        html/HTMLInputElement.cpp
+        html/HTMLIsIndexElement.cpp
+        html/HTMLKeygenElement.cpp
+        html/HTMLLIElement.cpp
+        html/HTMLLabelElement.cpp
+        html/HTMLLegendElement.cpp
+        html/HTMLLinkElement.cpp
+        html/HTMLMapElement.cpp
+        html/HTMLMarqueeElement.cpp
+        html/HTMLMenuElement.cpp
+        html/HTMLMetaElement.cpp
+        html/HTMLModElement.cpp
+        html/HTMLNameCollection.cpp
+        html/HTMLOListElement.cpp
+        html/HTMLObjectElement.cpp
+        html/HTMLOptGroupElement.cpp
+        html/HTMLOptionElement.cpp
+        html/HTMLOptionsCollection.cpp
+        html/HTMLParagraphElement.cpp
+        html/HTMLParamElement.cpp
+        html/HTMLParser.cpp
+        html/HTMLPlugInElement.cpp
+        html/HTMLPreElement.cpp
+        html/HTMLQuoteElement.cpp
+        html/HTMLScriptElement.cpp
+        html/HTMLSelectElement.cpp
+        html/HTMLStyleElement.cpp
+        html/HTMLTableCaptionElement.cpp
+        html/HTMLTableCellElement.cpp
+        html/HTMLTableColElement.cpp
+        html/HTMLTableElement.cpp
+        html/HTMLTablePartElement.cpp
+        html/HTMLTableRowElement.cpp
+        html/HTMLTableSectionElement.cpp
+        html/HTMLTextAreaElement.cpp
+        html/HTMLTextFieldInnerElement.cpp
+        html/HTMLTitleElement.cpp
+        html/HTMLTokenizer.cpp
+        html/HTMLUListElement.cpp
+        html/HTMLViewSourceDocument.cpp
+    </set>
+
+    <set append="1" var="WEBCORE_SOURCES_JS">
+        bindings/js/JSCanvasRenderingContext2DCustom.cpp
+        bindings/js/JSHTMLElementWrapperFactory.cpp
+        bindings/js/JSHTMLFormElementCustom.cpp
+        bindings/js/JSHTMLInputElementBase.cpp
+        bindings/js/JSHTMLOptionElementConstructor.cpp
+        bindings/js/JSHTMLOptionsCollectionCustom.cpp
+        bindings/js/JSNodeIteratorCustom.cpp
+        bindings/js/JSTreeWalkerCustom.cpp
+        bindings/js/JSXMLHttpRequest.cpp
+        bindings/js/JSXSLTProcessor.cpp
+        bindings/js/kjs_binding.cpp
+        bindings/js/kjs_css.cpp
+        bindings/js/kjs_dom.cpp
+        bindings/js/kjs_events.cpp
+        bindings/js/kjs_html.cpp
+        bindings/js/kjs_navigator.cpp
+        bindings/js/kjs_proxy.cpp
+        bindings/js/kjs_traversal.cpp
+        bindings/js/kjs_window.cpp
+    </set>
 </makefile>
index 858ddf802e2850539d5310cbb98c10459469f826..4ba5cc0013001708f6e53312f276f349be512d68 100644 (file)
@@ -31,7 +31,9 @@
 #include "FrameLoader.h"
 #include "FrameView.h"
 #include "Page.h"
+#ifdef SVG_SUPPORT
 #include "SVGDocumentExtensions.h"
+#endif
 #include "kjs_proxy.h"
 #include "kjs_window.h"
 #include "kjs_window.h"
index 540d23a589e0a39f4c5caf8bc2f09976517716fe..a649998f45afd864953da63862758a07be1f7257 100644 (file)
@@ -28,7 +28,7 @@
 
 namespace WebCore {
 
-    class ChromeClientGdk : public ChromeClient {
+    class ChromeClientGdk : public ChromeClient, public Shared<ChromeClientGdk> {
     public:
         virtual ~ChromeClientGdk() { }
             
@@ -39,6 +39,9 @@ namespace WebCore {
 
         virtual float scaleFactor();
 
+        virtual void ref() { Shared<ChromeClientGdk>::ref(); }
+        virtual void deref() { Shared<ChromeClientGdk>::deref(); }
+
         virtual void focus();
         virtual void unfocus();
 
index 8840b954fdbcd0a6ea5477114344c2ce173d7125..4861d532ac923dcf1770da5310e905ef4ee81486 100644 (file)
 
 #include "config.h"
 #include "FrameGdk.h"
+
 #include "ChromeClientGdk.h"
-#include "Document.h"
 #include "DOMImplementation.h"
 #include "DOMWindow.h"
+#include "Document.h"
+#include "EditorClient.h"
 #include "Element.h"
-#include "FrameView.h"
 #include "FrameLoadRequest.h"
+#include "FrameLoader.h"
 #include "FramePrivate.h"
-#include <gdk/gdk.h>
+#include "FrameView.h"
 #include "GraphicsContext.h"
-#include "HitTestResult.h"
-#include "HitTestRequest.h"
 #include "HTMLDocument.h"
+#include "HitTestRequest.h"
+#include "HitTestResult.h"
 #include "KeyboardCodes.h"
 #include "MouseEventWithHitTestResults.h"
 #include "Page.h"
-#include "PlatformMouseEvent.h"
 #include "PlatformKeyboardEvent.h"
+#include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
 #include "Plugin.h"
+#include "RenderLayer.h"
 #include "RenderObject.h"
 #include "RenderWidget.h"
-#include "RenderLayer.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleInternal.h"
-#include "ScreenClientGdk.h"
+#include "SSLKeyGenerator.h"
 #include "SelectionController.h"
 #include "Settings.h"
-#include "SSLKeyGenerator.h"
 #include "TypingCommand.h"
+#include <gdk/gdk.h>
 
 // This function loads resources from WebKit
 // This does not belong here and I'm not sure where
@@ -91,7 +93,7 @@ void FrameGdkClientDefault::setFrame(const FrameGdk* frame)
 
 void FrameGdkClientDefault::openURL(const KURL& url)
 {
-    m_frame->didOpenURL(url);
+    m_frame->loader()->didOpenURL(url);
     m_beginCalled = false;
 
     ResourceRequest request(url);
@@ -128,15 +130,15 @@ void FrameGdkClientDefault::didReceiveData(ResourceHandle* job, const char* data
             m_frame->setResourceRequest(request);
         }
 #endif
-        m_frame->begin(job->url());
+        m_frame->loader()->begin(job->url());
     }
 
-    m_frame->write(data, length);
+    m_frame->loader()->write(data, length);
 }
 
 void FrameGdkClientDefault::receivedAllData(ResourceHandle* job, PlatformData data)
 {
-    m_frame->end();
+    m_frame->loader()->end();
     m_beginCalled = false;
 }
 
@@ -159,7 +161,7 @@ static void doScroll(const RenderObject* r, float deltaX, float deltaY)
 }
 
 FrameGdk::FrameGdk(GdkDrawable* gdkdrawable)
-    : Frame(new Page(new ChromeClientGdk(), new ScreenClientGdk()), 0, 0), m_drawable(gdkdrawable)
+    : Frame(new Page(new ChromeClientGdk()), 0, 0), m_drawable(gdkdrawable)
 {
     Settings* settings = new Settings;
     settings->setAutoLoadImages(true);
@@ -196,24 +198,9 @@ FrameGdk::FrameGdk(Page* page, Element* element, PassRefPtr<EditorClient> editor
 
 FrameGdk::~FrameGdk()
 {
-    cancelAndClear();
+    loader()->cancelAndClear();
 }
 
-void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest, Event*)
-{
-    ResourceRequest request = frameLoadRequest.resourceRequest();
-
-    // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
-    if (d->m_submittedFormURL == request.url())
-        return;
-
-    d->m_submittedFormURL = request.url();
-
-    if (client())
-        client()->submitForm(request.httpMethod(), request.url(), &request.httpBody());
-
-    clearRecordedFormValues();
-}
 
 void FrameGdk::urlSelected(const FrameLoadRequest& frameLoadRequest, Event*)
 {
index 4e24aade16f1a8cfbc0340117fc53afa99a7c8c0..c4c6abfe923d31532b7d161a7653cb20ff582d44 100644 (file)
 #define FrameGdk_H_
 
 #include "Frame.h"
-#include "ResourceHandleClient.h"
 #include "EditorClient.h"
+#include "ResourceHandleClient.h"
 #include <gdk/gdk.h>
 
 namespace WebCore {
 
 class Element;
 class FrameGdk;
-class EditorClient;
+class FormData;
 
 class FrameGdkClient {
 public:
@@ -85,9 +85,6 @@ public:
 
     virtual void setTitle(const String&);
 
-    virtual ObjectContentType objectContentType(const KURL&, const String& mimeType);
-    virtual Plugin* createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&);
-
     virtual void scheduleClose();
 
     virtual void unfocusWindow();
index e7cdd0636ddf483116979ce59a020adcad7ff157..8c84cfdddc205d70d4ae5e1aaad3d0bb13dd2bfd 100644 (file)
@@ -132,7 +132,7 @@ static String keyIdentifierForGdkKeyCode(guint keyCode)
         case GDK_Delete:
             return "U+00007F";
         default:
-            return String::sprintf("U+%06X", toupper(keyCode));
+            return String::format("U+%06X", toupper(keyCode));
     }
 }
 
diff --git a/WebCore/platform/gdk/ScreenClientGdk.h b/WebCore/platform/gdk/ScreenClientGdk.h
deleted file mode 100644 (file)
index 8868b2a..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScreenClientGdk_h
-#define ScreenClientGdk_h
-
-#include "ScreenClient.h"
-
-namespace WebCore {
-
-    class ScreenClientGdk : public ScreenClient {
-
-        virtual ~ScreenClientGdk() { }
-
-        virtual int depth();
-        virtual int depthPerComponent();
-
-        virtual bool isMonochrome();
-
-        virtual FloatRect rect();
-        virtual FloatRect usableRect();
-    };
-
-}
-
-#endif // ScreenClientGdk_h
index 743b1c222e0b24428ae8ab148891e5f5e5103dee..ae628ee67ab67845e683a310c385595dac34eb22 100644 (file)
@@ -161,12 +161,10 @@ bool FrameGdk::statusbarVisible() { notImplemented(); return 0; }
 bool FrameGdk::toolbarVisible() { notImplemented(); return 0; }
 void FrameGdk::issueTransposeCommand() { notImplemented(); }
 bool FrameGdk::canPaste() const { notImplemented(); return 0; }
-enum WebCore::ObjectContentType FrameGdk::objectContentType(KURL const&, String const&) { notImplemented(); return (ObjectContentType)0; }
 bool FrameGdk::canGoBackOrForward(int) const { notImplemented(); return 0; }
 void FrameGdk::issuePasteAndMatchStyleCommand() { notImplemented(); }
 bool FrameGdk::isLoadTypeReload() { notImplemented(); return false; }
 KURL FrameGdk::originalRequestURL() const { return KURL(); }
-Plugin* FrameGdk::createPlugin(Element*, KURL const&, const Vector<String>&, const Vector<String>&, String const&) { notImplemented(); return 0; }
 
 void FrameGdk::goBackOrForward(int distance) { notImplemented(); }
 int FrameGdk::getHistoryLength() {notImplemented(); return 0; }
@@ -305,7 +303,7 @@ void Path::addRect(const FloatRect&) { }
 void Path::addEllipse(const FloatRect&) { }
 void Path::transform(const AffineTransform& transform) {}
 
-TextField::TextField(TextField::Type) { }
+TextField::TextField() { }
 TextField::~TextField() { }
 void TextField::setFont(WebCore::Font const&) { }
 void TextField::setAlignment(HorizontalAlignment) { }
@@ -362,8 +360,6 @@ Icon::~Icon() { notImplemented(); }
 PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); }
 void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
 
-void IconLoader::notifyIconChanged(const KURL&) { notImplemented(); }
-
 FloatRect Font::selectionRectForComplexText(const TextRun&, const TextStyle&, const IntPoint&, int) const { return FloatRect(); }
 void Font::drawComplexText(GraphicsContext*, const TextRun&, const TextStyle&, const FloatPoint&) const { notImplemented(); }
 float Font::floatWidthForComplexText(const TextRun&, const TextStyle&) const { notImplemented(); return 0; }
index cbba9a0598a9c1242804e2a4d7303d095b124873..596705573e02289bebee16458532b3ec0859af2b 100644 (file)
@@ -147,7 +147,7 @@ void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>*
                         }
                         default:
                             printf("Curl ERROR %s\n", curl_easy_strerror(msg->data.result));
-                            job->setError(msg->data.result);
+                            // FIXME: report an error?
                             remove(job);
                             break;
                     }
@@ -209,7 +209,7 @@ void ResourceHandleManager::add(ResourceHandle* job)
         // timeout will occur and do curl_multi_perform
         if (ret && ret != CURLM_CALL_MULTI_PERFORM) {
             printf("Error %d starting job %s\n", ret, job->url().url().ascii());
-            job->setError(1);
+            // FIXME: report an error?
             startTimer =false;
         } else
             jobs->add(job);
@@ -221,7 +221,7 @@ void ResourceHandleManager::add(ResourceHandle* job)
 void ResourceHandleManager::cancel(ResourceHandle* job)
 {
     remove(job);
-    job->setError(1);
+    // FIXME: report an error?
 }
 
 } // namespace WebCore
index fb275aebe82e87f0eb8e887557a2c5ff5383dd03..0eee24544a22d494a02532adbb86081af5e06609 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- 
+<!--
 Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions
 are met:
 
 1.  Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
+    notice, this list of conditions and the following disclaimer.
 2.  Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution. 
+    documentation and/or other materials provided with the distribution.
 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
     its contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission. 
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
 EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,89 +30,81 @@ Base settings shared by all Bakefile-based ports.
 -->
 
 <makefile>
-
-    <!-- Common definitions etc.: -->
-
     <set var="SRCDIR" append="0">../..</set>
 
-    <include file="../Bakefiles/presets.bkl"/>
-    <include file="WebCoreSources.bkl"/>
-    
-       <set var="WEBCORE_BASE_SOURCES">        
-               $(WEBCORE_SOURCES_DERIVEDSOURCES)
-               $(WEBCORE_SOURCES_KHTML)
-               $(WEBCORE_SOURCES_MISC)
-               $(WEBCORE_SOURCES_PAGE)
-               $(WEBCORE_SOURCES_LOADER)
-               $(WEBCORE_SOURCES_PLATFORM)
-               $(WEBCORE_SOURCES_IMAGE-DECODERS)
-               $(WEBCORE_SOURCES_BMP)
-               $(WEBCORE_SOURCES_GIF)
-               $(WEBCORE_SOURCES_ICO)
-               $(WEBCORE_SOURCES_PNG)
-               $(WEBCORE_SOURCES_XBM)
-               $(WEBCORE_SOURCES_ZLIB)
-               $(WEBCORE_SOURCES_JPEG)
-               $(WEBCORE_SOURCES_CSS)
-               $(WEBCORE_SOURCES_RENDERING)
-               $(WEBCORE_SOURCES_XML)
-               $(WEBCORE_SOURCES_DOM)
-               $(WEBCORE_SOURCES_BRIDGE)
-               $(WEBCORE_SOURCES_EDITING)
-               $(WEBCORE_SOURCES_HTML)
-               $(WEBCORE_SOURCES_BINDINGS)
-               $(WEBCORE_SOURCES_JS)
-       </set>
+    <include file="../Bakefiles/presets.bkl" />
+    <include file="WebCoreSources.bkl" />
+
+    <set var="WEBCORE_BASE_SOURCES">
+        $(WEBCORE_SOURCES_BMP)
+        $(WEBCORE_SOURCES_CSS)
+        $(WEBCORE_SOURCES_DERIVEDSOURCES)
+        $(WEBCORE_SOURCES_DOM)
+        $(WEBCORE_SOURCES_EDITING)
+        $(WEBCORE_SOURCES_GIF)
+        $(WEBCORE_SOURCES_HTML)
+        $(WEBCORE_SOURCES_ICO)
+        $(WEBCORE_SOURCES_ICON)
+        $(WEBCORE_SOURCES_JPEG)
+        $(WEBCORE_SOURCES_JS)
+        $(WEBCORE_SOURCES_LOADER)
+        $(WEBCORE_SOURCES_PAGE)
+        $(WEBCORE_SOURCES_PLATFORM)
+        $(WEBCORE_SOURCES_PNG)
+        $(WEBCORE_SOURCES_RENDERING)
+        $(WEBCORE_SOURCES_XBM)
+        $(WEBCORE_SOURCES_XML)
+        $(WEBCORE_SOURCES_ZLIB)
+    </set>
 
     <set var="BUILDDIR">obj-$(FORMAT)</set>
-    
+
     <template id="webcore_cairo">
-        <include>$(SRCDIR)/platform/cairo/cairo/src</include>
-        <include>$(SRCDIR)/platform/cairo/pixman/src</include>
+        <include>$(SRCDIR)/platform/graphics/cairo/cairo/src</include>
+        <include>$(SRCDIR)/platform/graphics/cairo/pixman/src</include>
         <sources>
-            $(WEBCORE_SOURCES_CAIRO) 
-                   $(WEBCORE_SOURCES_PIXMAN) 
+            $(WEBCORE_SOURCES_CAIRO)
+            $(WEBCORE_SOURCES_PIXMAN)
         </sources>
     </template>
-    
+
     <template id="webcore_base" template="xml2,iconv,xslt,icu,jscore">
-        <include>$(SRCDIR)/.</include>
-        <include>$(SRCDIR)/include</include>
+        <include>$(SRCDIR)</include>
         <include>$(SRCDIR)/DerivedSources/WebCore</include>
         <include>$(SRCDIR)/bindings/js</include>
         <include>$(SRCDIR)/bridge</include>
-        <include>$(SRCDIR)/editing</include>
-        <include>$(SRCDIR)/html</include>
         <include>$(SRCDIR)/css</include>
         <include>$(SRCDIR)/dom</include>
-        <include>$(SRCDIR)/loader</include>
+        <include>$(SRCDIR)/editing</include>
+        <include>$(SRCDIR)/html</include>
+        <include>$(SRCDIR)/include</include>
+        <include>$(SRCDIR)/kcanvas/device</include>
+        <include>$(SRCDIR)/kcanvas</include>
         <include>$(SRCDIR)/loader/icon</include>
+        <include>$(SRCDIR)/loader</include>
         <include>$(SRCDIR)/page</include>
-        <include>$(SRCDIR)/platform</include>
-        <include>$(SRCDIR)/platform/image-decoders</include>
+        <include>$(SRCDIR)/platform/graphics</include>
         <include>$(SRCDIR)/platform/image-decoders/bmp</include>
         <include>$(SRCDIR)/platform/image-decoders/gif</include>
         <include>$(SRCDIR)/platform/image-decoders/ico</include>
         <include>$(SRCDIR)/platform/image-decoders/jpeg</include>
-        <include>$(SRCDIR)/platform/image-decoders/xbm</include>
         <include>$(SRCDIR)/platform/image-decoders/png</include>
+        <include>$(SRCDIR)/platform/image-decoders/xbm</include>
         <include>$(SRCDIR)/platform/image-decoders/zlib</include>
-        <include>$(SRCDIR)/platform/netowrk</include>
+        <include>$(SRCDIR)/platform/image-decoders</include>
+        <include>$(SRCDIR)/platform/network</include>
+        <include>$(SRCDIR)/platform</include>
         <include>$(SRCDIR)/rendering</include>
         <include>$(SRCDIR)/xml</include>
-        <include>$(SRCDIR)/kcanvas</include>
-        <include>$(SRCDIR)/kcanvas/device</include>
-        
+
         <sources>$(WEBCORE_BASE_SOURCES)</sources>
 
 
-<!-- HACK ALERT! FIX THESE LATER!! -->
-      <if cond="PLATFORM_MACOSX=='1'">
-        <include>$(SRCDIR)/platform/mac</include> <!-- when building on Mac, ExtraCFEncodings.h is needed -->      
-         </if>
-<!-- END HACKS -->
+        <!-- FIXME: when building on Mac, ExtraCFEncodings.h is needed -->
+        <if cond="PLATFORM_MACOSX=='1'">
+            <include>$(SRCDIR)/platform/mac</include>
+        </if>
 
-        <define>APPLE_CHANGES=1</define>
         <define>XSLT_SUPPORT=1</define>
 
         <!-- TODO: is there a Linux-specific platform define? -->
@@ -121,14 +113,15 @@ Base settings shared by all Bakefile-based ports.
                 <define>LINUX</define>
             </if>
         </if>
+
         <!-- this GC version requires Mach's thread suspend/resume: -->
         <if cond="PLATFORM_MACOSX!='1'">
             <define>USE_CONSERVATIVE_GC=0</define>
         </if>
-        
+
         <if cond="PLATFORM_MACOSX=='1'">
             <define>USE_CONSERVATIVE_GC=1</define>
-        </if> 
+        </if>
 
         <if cond="FORMAT=='gnu'">
             <!-- FIXME: we need proper configure checks -->
@@ -143,4 +136,3 @@ Base settings shared by all Bakefile-based ports.
         </if>
     </template>
 </makefile>
-
index 0588c6da6de61a9001e8d736fb5e82679bcef5f2..8ebcfcfef0b259a2e495d0923cf3622ae233fa9f 100644 (file)
@@ -1,3 +1,11 @@
+2006-11-12  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Mitz.
+
+        Clean up of GdkLauncher bakefile.
+
+        * GdkLauncher/gdklauncher.bkl:
+
 2006-11-11  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed and landed by Anders.
index 0a722192801f64b78fd274afe1cdb812fb4bfa44..ec1b065a873c4ca67d81b8b1166799ee7b9eb510 100644 (file)
@@ -1,26 +1,21 @@
 <?xml version="1.0" ?>
-<!-- generate GnuMakefile with
-       bakefile -f gnu gdkwebcore.bkl
-       consider forcing includes agian
-       CXX = g++  -I. include config.h
--->
+<!-- generate GNUmakefile with 'bakefile -f gnu gdklauncher.bkl' -->
 
 <makefile>
-       <include file="../../Bakefiles/presets.bkl"/>
+    <include file="../../Bakefiles/presets.bkl" />
 
-   <template id="webcore_gdk_link" template="gtk,freetype">
-               
+    <template id="webcore_gdk_link" template="gtk,freetype">
         <define>APPLE_CHANGES=1</define>
         <!-- this GC version requires Mach's thread suspend/resume: -->
-        <if cond="PLATFORM_MACOSX=='1'">
+        <if cond="PLATFORM_MACOSX!='1'">
             <define>USE_CONSERVATIVE_GC=0</define>
         </if>
-        
+
         <if cond="PLATFORM_MACOSX=='1'">
             <define>USE_CONSERVATIVE_GC=1</define>
-        </if> 
+        </if>
 
-        <define>KHTML_XSLT=1</define>
+        <define>XSLT_SUPPORT=1</define>
 
         <if cond="FORMAT=='gnu'">
             <!-- FIXME: we need proper configure checks -->
 
         <include>$(TOPDIR)/JavaScriptCore</include>
 
-        <include>$(TOPDIR)/WebCore/.</include>
-        <include>$(TOPDIR)/WebCore/include</include>
+        <include>$(TOPDIR)/WebCore</include>
         <include>$(TOPDIR)/WebCore/DerivedSources/WebCore</include>
         <include>$(TOPDIR)/WebCore/bindings/js</include>
         <include>$(TOPDIR)/WebCore/bridge</include>
-        <include>$(TOPDIR)/WebCore/editing</include>
-        <include>$(TOPDIR)/WebCore/html</include>
         <include>$(TOPDIR)/WebCore/css</include>
         <include>$(TOPDIR)/WebCore/dom</include>
-        <include>$(TOPDIR)/WebCore/kwq</include>
+        <include>$(TOPDIR)/WebCore/editing</include>
+        <include>$(TOPDIR)/WebCore/html</include>
+        <include>$(TOPDIR)/WebCore/include</include>
         <include>$(TOPDIR)/WebCore/loader</include>
         <include>$(TOPDIR)/WebCore/page</include>
-        <include>$(TOPDIR)/WebCore/platform</include>
-        <include>$(TOPDIR)/WebCore/platform/image-decoders</include>
+        <include>$(TOPDIR)/WebCore/platform/gdk</include>
+        <include>$(TOPDIR)/WebCore/platform/graphics/cairo</include>
+        <include>$(TOPDIR)/WebCore/platform/graphics</include>
         <include>$(TOPDIR)/WebCore/platform/image-decoders/gif</include>
         <include>$(TOPDIR)/WebCore/platform/image-decoders/jpeg</include>
         <include>$(TOPDIR)/WebCore/platform/image-decoders/png</include>
         <include>$(TOPDIR)/WebCore/platform/image-decoders/zlib</include>
+        <include>$(TOPDIR)/WebCore/platform/image-decoders</include>
+        <include>$(TOPDIR)/WebCore/platform/network</include>
+        <include>$(TOPDIR)/WebCore/platform</include>
         <include>$(TOPDIR)/WebCore/rendering</include>
         <include>$(TOPDIR)/WebCore/xml</include>
 
-        <include>$(TOPDIR)/WebCore/platform/cairo</include>
-        <include>$(TOPDIR)/WebCore/platform/gdk</include>
         <pic>on</pic>
         <threading>multi</threading>
         <warnings>default</warnings>
 
    </template>
 
-       <set var="TOPDIR">../..</set>
-    <exe id="gdklauncher" template="webcore_gdk_link">        
-               <ldflags>-L$(TOPDIR)/WebCore/Projects/gdk -lwebcore-gdk</ldflags>
+    <set var="TOPDIR">../..</set>
+    <exe id="gdklauncher" template="webcore_gdk_link">
+        <ldflags>-L$(TOPDIR)/WebCore/Projects/gdk -lwebcore-gdk</ldflags>
         <warnings>default</warnings>
         <cxx-rtti>off</cxx-rtti>
         <cxx-exceptions>off</cxx-exceptions>
         <debug-info>on</debug-info>
-        <sources>              
-          main.cpp
-               </sources>
+        <sources>
+            main.cpp
+        </sources>
     </exe>
 </makefile>