JavaScriptCore:

        - http://bugzilla.opendarwin.org/show_bug.cgi?id=8515
        Linux porting compile bug

        Fix by Mike Emmel, Reviewed by Darin.

        * JavaScriptCoreSources.bkl:
        * jscore.bkl:
        * wtf/Platform.h:

WebCore:

        - http://bugzilla.opendarwin.org/show_bug.cgi?id=8515
        Linux porting compile bug

        Fix by Mike Emmel, Reviewed by Darin.

        * Projects/gdk/webcore-gdk.bkl:
        * WebCoreSources.bkl:
        * css/maketokenizer:
        * html/HTMLCanvasElement.cpp:
        * html/HTMLImageElement.h:
        * icon/IconDatabase.cpp:
        * make-generated-sources.sh:
        * page/Frame.h:
        * page/FramePrivate.h:
        * platform/Cursor.h:
        * platform/FontData.h:
        (WebCore::FontData::getGlyphIndex):
        * platform/GlyphBuffer.h:
        (WebCore::GlyphBuffer::glyphAt):
        (WebCore::GlyphBuffer::advanceAt):
        (WebCore::GlyphBuffer::add):
        * platform/GraphicsContext.h:
        * platform/PlatformKeyboardEvent.h:
        * platform/PlatformMouseEvent.h:
        * platform/PlatformWheelEvent.h:
        * platform/ScrollView.h:
        * platform/TransferJob.h:
        (WebCore::TransferJob::getInternal):
        * platform/TransferJobInternal.h:
        (WebCore::TransferJobInternal::TransferJobInternal):
        * platform/Widget.h:
        * platform/cairo/GraphicsContextCairo.cpp:
        (WebCore::GraphicsContext::GraphicsContext):
        (WebCore::GraphicsContext::roundToDevicePixels):
        * webcore-base.bkl:
        * xpath/impl/XPathValue.cpp:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5b91bc58cd79be56bee4c05d248690238a7344bc..0342649c1488e5b606739dfa540063d19bd4e76c 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-10  Geoffrey Garen  <ggaren@apple.com>
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=8515
+        Linux porting compile bug
+        
+        Fix by Mike Emmel, Reviewed by Darin.
+
+        * JavaScriptCoreSources.bkl:
+        * jscore.bkl:
+        * wtf/Platform.h:
+
 2006-06-09  Geoffrey Garen  <ggaren@apple.com>
 
         Build fix -- I think :).

diff --git a/JavaScriptCore/JavaScriptCoreSources.bkl b/JavaScriptCore/JavaScriptCoreSources.bkl
index d46ab6f2c8fb30e83d86541f60f6fd42e5d8c728..ebc8c56040724e26341dd001668097a743eca146 100644 (file)
--- a/JavaScriptCore/JavaScriptCoreSources.bkl
+++ b/JavaScriptCore/JavaScriptCoreSources.bkl
@@ -1,7 +1,8 @@
 <?xml version="1.0" ?>
 <makefile>
        <set append="1" var="JSCORE_SOURCES_KJS">
-               
+
+               DerivedSources/JavaScriptCore/grammar.cpp       
                kjs/array_object.cpp
                kjs/bool_object.cpp
                kjs/collector.cpp
@@ -12,7 +13,6 @@
                kjs/fpconst.cpp
                kjs/function.cpp
                kjs/function_object.cpp
-               <!-- ./grammarWrapper.cpp -->
                kjs/identifier.cpp
                kjs/internal.cpp
                kjs/interpreter.cpp

diff --git a/JavaScriptCore/jscore.bkl b/JavaScriptCore/jscore.bkl
index efffb8eaa6de0c88cf636490c8b2085c68a5dbf8..24da98219f1b06f47dc3403c13b7b386c8667da5 100644 (file)
--- a/JavaScriptCore/jscore.bkl
+++ b/JavaScriptCore/jscore.bkl
@@ -103,6 +103,9 @@ JavaScriptCore Bakefile project file.
             $(JSCORE_SOURCES_PCRE)
             $(JSCORE_SOURCES_KJS)
         </sources>
+        <if cond="PLATFORM_WIN32=='1'">
+            $(JSCORE_SOURCES_WIN)
+               </if>
                <install-to>$(BUILDDIR)</install-to>
     </lib>
 

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 276ffaf7859e6aa1c3fbe37964924b4944feb341..e1b9ec6a354fb86be1e9c0def8b03eaba9941974 100644 (file)
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -76,6 +76,10 @@
 #elif PLATFORM(WIN_OS)
 #define KXMLCORE_PLATFORM_WIN 1
 #endif
+#if defined(BUILDING_GDK__)
+#define KXMLCORE_PLATFORM_GDK 1
+#endif
+
 
 // CPU
 

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0ad14f9a1962817427031762224ee2142706bb07..d5e59d342ad91e3505ebb233e75b98fa071d8119 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,42 @@
+2006-06-10  Geoffrey Garen  <ggaren@apple.com>
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=8515
+        Linux porting compile bug
+        
+        Fix by Mike Emmel, Reviewed by Darin.
+
+        * Projects/gdk/webcore-gdk.bkl:
+        * WebCoreSources.bkl:
+        * css/maketokenizer:
+        * html/HTMLCanvasElement.cpp:
+        * html/HTMLImageElement.h:
+        * icon/IconDatabase.cpp:
+        * make-generated-sources.sh:
+        * page/Frame.h:
+        * page/FramePrivate.h:
+        * platform/Cursor.h:
+        * platform/FontData.h:
+        (WebCore::FontData::getGlyphIndex):
+        * platform/GlyphBuffer.h:
+        (WebCore::GlyphBuffer::glyphAt):
+        (WebCore::GlyphBuffer::advanceAt):
+        (WebCore::GlyphBuffer::add):
+        * platform/GraphicsContext.h:
+        * platform/PlatformKeyboardEvent.h:
+        * platform/PlatformMouseEvent.h:
+        * platform/PlatformWheelEvent.h:
+        * platform/ScrollView.h:
+        * platform/TransferJob.h:
+        (WebCore::TransferJob::getInternal):
+        * platform/TransferJobInternal.h:
+        (WebCore::TransferJobInternal::TransferJobInternal):
+        * platform/Widget.h:
+        * platform/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::GraphicsContext):
+        (WebCore::GraphicsContext::roundToDevicePixels):
+        * webcore-base.bkl:
+        * xpath/impl/XPathValue.cpp:
+
 2006-06-09  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Tim Omernick and Dave Hyatt.

diff --git a/WebCore/Projects/gdk/webcore-gdk.bkl b/WebCore/Projects/gdk/webcore-gdk.bkl
index bd4d75658239a015e2a3a674fbdbfa326dbc9d9e..41c1621691d4df63c0111876a8fc753b765b2a7a 100644 (file)
--- a/WebCore/Projects/gdk/webcore-gdk.bkl
+++ b/WebCore/Projects/gdk/webcore-gdk.bkl
@@ -9,28 +9,72 @@
 
 <makefile>
 
-    <include file="../../webcore-base.bkl"/>
-    
-    <dll id="webcore-gdk" template="webcore_base,freetype,gtk">        
+               <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>
+               <set var="FEATURE_DEFINES">XPATH_SUPPORT</set>
+               <set var="ENCODINGS_FILE">$(SRCDIR)/platform/gdk/gdk-encodings.txt</set>
+
+       <include file="../../webcore-base.bkl"/>
+
+   <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>
+        <command>bash -c "touch .DerivedSources"</command>
+   </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>
+       -->
+
+               <pre-build-target>.DerivedSources</pre-build-target>
         <dirname>.</dirname>
         <pic>on</pic>
         <threading>multi</threading>
         <warnings>no</warnings>
                <cxxflags>-w</cxxflags>
+        <include>$(SRCDIR)/platform/gdk</include>
                <cflags>-w</cflags>
        <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>
  
         <sources>              
+          platform/cairo/GraphicsContextCairo.cpp
+          platform/cairo/ImageCairo.cpp
+          platform/cairo/ImageSourceCairo.cpp
+          platform/gdk/CookieJarGdk.cpp
           platform/gdk/CursorGdk.cpp
-          platform/gdk/FontFtCairo.cpp
-          platform/gdk/FontPlatformDataFtCairo.cpp
+          platform/gdk/FontCacheGdk.cpp
+          platform/gdk/FontDataGdk.cpp
+          platform/gdk/FontGdk.cpp
+          platform/gdk/FontPlatformDataGdk.cpp
           platform/gdk/FrameGdk.cpp
-          platform/gdk/GtkGraphicsContext.cpp
-          platform/gdk/GtkIntPoint.cpp
-          platform/gdk/GtkIntRect.cpp
-          platform/gdk/GtkMouseEvent.cpp
+          platform/gdk/GlyphMapGdk.cpp
+          platform/gdk/KeyEventGdk.cpp
+          platform/gdk/MouseEventGdk.cpp
           platform/gdk/PageGdk.cpp
+          platform/gdk/TransferJobManager.cpp
           platform/gdk/RenderThemeGdk.cpp
           platform/gdk/ScreenGdk.cpp
           platform/gdk/ScrollViewGdk.cpp
@@ -38,9 +82,17 @@
           platform/gdk/SystemTimeLinux.cpp
           platform/gdk/TemporaryLinkStubs.cpp
           platform/gdk/TransferJobCurl.cpp
+          platform/gdk/WheelEventGdk.cpp
           platform/gdk/WidgetGdk.cpp
                </sources>
-        <include>$(SRCDIR)/platform/gdk</include>
+
+               <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 -->
     </dll>
 </makefile>
 

diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl
index e69d7134dc13d926dd6495344f9f157ece16e954..43dcd5b858ab1705537d8e8d4198f0cc31162842 100644 (file)
--- a/WebCore/WebCoreSources.bkl
+++ b/WebCore/WebCoreSources.bkl
@@ -7,11 +7,11 @@
 
        </set>
        <set append="1" var="WEBCORE_SOURCES_DERIVEDSOURCES">
-               
                DerivedSources/WebCore/CharsetData.cpp
                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
@@ -20,16 +20,63 @@
                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/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/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
@@ -45,19 +92,17 @@
                DerivedSources/WebCore/JSXPathExpression.cpp
                DerivedSources/WebCore/JSXPathNSResolver.cpp
                DerivedSources/WebCore/JSXPathResult.cpp
-               DerivedSources/WebCore/JSWheelEvent.cpp
                DerivedSources/WebCore/UserAgentStyleSheetsData.cpp
+               DerivedSources/WebCore/XLinkNames.cpp
                DerivedSources/WebCore/XPathGrammar.cpp
-
        </set>
-       <set append="1" var="WEBCORE_SOURCES_KHTML">
-               
 
+       <set append="1" var="WEBCORE_SOURCES_KHTML">
        </set>
-       <set append="1" var="WEBCORE_SOURCES_MISC">
-               
 
+       <set append="1" var="WEBCORE_SOURCES_MISC">
        </set>
+
        <set append="1" var="WEBCORE_SOURCES_PAGE">
                
                page/DOMWindow.cpp
@@ -80,6 +125,7 @@
                loader/Decoder.cpp
                loader/DocLoader.cpp
                loader/FormData.cpp
+               loader/ImageDocument.cpp
                loader/loader.cpp
                loader/Request.cpp
                loader/TextDocument.cpp
@@ -100,7 +146,12 @@
                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
@@ -122,9 +173,13 @@
        </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
@@ -149,6 +204,19 @@
                platform/image-decoders/gif/GIFImageReader.cpp
 
        </set>
+
+       <set append="1" var="WEBCORE_SOURCES_XBM">
+               platform/image-decoders/xbm/XBMImageDecoder.cpp
+       </set>
+
+       <set append="1" var="WEBCORE_SOURCES_ICO">
+               platform/image-decoders/ico/ICOImageDecoder.cpp
+       </set>
+
+       <set append="1" var="WEBCORE_SOURCES_BMP">
+               platform/image-decoders/bmp/BMPImageDecoder.cpp
+       </set>
+
        <set append="1" var="WEBCORE_SOURCES_PNG">
                
                platform/image-decoders/png/png.c
@@ -171,6 +239,7 @@
                platform/image-decoders/png/pngwutil.c
 
        </set>
+
        <set append="1" var="WEBCORE_SOURCES_ZLIB">
                
                platform/image-decoders/zlib/adler32.c
@@ -250,7 +319,7 @@
                platform/cairo/pixman/src/renderedge.c
 
        </set>
-       <set append="1" var="WEBCORE_SOURCES_CAIRO">
+       <set append="1" var="WEBCORE_SOURCES_CAIRO_CAIRO">
                
                platform/cairo/cairo/src/cairo-arc.c
                platform/cairo/cairo/src/cairo-array.c
@@ -294,54 +363,94 @@
        </set>
        <set append="1" var="WEBCORE_SOURCES_CSS">
                
-               css/css_base.cpp
-               css/css_ruleimpl.cpp
-               css/css_stylesheetimpl.cpp
-               css/css_valueimpl.cpp
+               css/CSSBorderImageValue.cpp
                css/CSSComputedStyleDeclaration.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/MediaList.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/EllipsisBox.cpp
+               rendering/FixedTableLayout.cpp
+               rendering/InlineBox.cpp
+               rendering/InlineFlowBox.cpp
                rendering/InlineTextBox.cpp
-               rendering/render_button.cpp
-               rendering/render_form.cpp
-               rendering/render_frames.cpp
-               rendering/render_line.cpp
-               rendering/render_list.cpp
-               rendering/render_replaced.cpp
+               rendering/ListMarkerBox.cpp
                rendering/render_style.cpp
                rendering/RenderApplet.cpp
                rendering/RenderArena.cpp
                rendering/RenderBlock.cpp
                rendering/RenderBox.cpp
                rendering/RenderBR.cpp
-               rendering/RenderCanvas.cpp
+               rendering/RenderButton.cpp
                rendering/RenderContainer.cpp
+               rendering/RenderFieldset.cpp
+               rendering/RenderFileButton.cpp
                rendering/RenderFlexibleBox.cpp
                rendering/RenderFlow.cpp
+               rendering/RenderView.cpp
+               rendering/RenderFormElement.cpp
+               rendering/RenderFrame.cpp
+               rendering/RenderFrameSet.cpp
                rendering/RenderHTMLCanvas.cpp
                rendering/RenderImage.cpp
+               rendering/RenderImageButton.cpp
                rendering/RenderInline.cpp
+               rendering/RenderLabel.cpp
                rendering/RenderLayer.cpp
+               rendering/RenderLegend.cpp
+               rendering/RenderLineEdit.cpp
+               rendering/RenderListItem.cpp
+               rendering/RenderListMarker.cpp
                rendering/RenderObject.cpp
+               rendering/RenderPart.cpp
+               rendering/RenderPartObject.cpp
+               rendering/RenderReplaced.cpp
+               rendering/RenderSelect.cpp
+               rendering/RenderSlider.cpp
                rendering/RenderTable.cpp
                rendering/RenderTableCell.cpp
                rendering/RenderTableCol.cpp
                rendering/RenderTableRow.cpp
                rendering/RenderTableSection.cpp
                rendering/RenderText.cpp
+               rendering/RenderTextArea.cpp
                rendering/RenderTextField.cpp
                rendering/RenderTextFragment.cpp
                rendering/RenderTheme.cpp
-               <!-- rendering/RenderThemeWin.cpp -->
                rendering/RenderTreeAsText.cpp
-               rendering/table_layout.cpp
+               rendering/RenderWidget.cpp
+               rendering/RootInlineBox.cpp
 
        </set>
        <set append="1" var="WEBCORE_SOURCES_XPATH">
@@ -388,27 +497,40 @@
                dom/DocumentFragment.cpp
                dom/DocumentType.cpp
                dom/dom2_eventsimpl.cpp
-               dom/dom2_traversalimpl.cpp
-               dom/dom_xmlimpl.cpp
                dom/DOMImplementation.cpp
                dom/EditingText.cpp
                dom/Element.cpp
+               dom/Entity.cpp
+               dom/EntityReference.cpp
                dom/EventNames.cpp
                dom/EventTargetNode.cpp
                dom/MappedAttribute.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/Position.cpp
+               dom/ProcessingInstruction.cpp
                dom/QualifiedName.cpp
                dom/Range.cpp
                dom/StyledElement.cpp
                dom/Text.cpp
+               dom/Traversal.cpp
+               dom/TreeWalker.cpp
                dom/xml_tokenizer.cpp
 
        </set>
+
+       <set append="1" var="WEBCORE_SOURCES_ICON">
+
+               icon/IconDatabase.cpp
+       </set>
+
        <set append="1" var="WEBCORE_SOURCES_BRIDGE">
                
 
@@ -433,6 +555,7 @@
                editing/HTMLInterchange.cpp
                editing/InsertIntoTextNodeCommand.cpp
                editing/InsertLineBreakCommand.cpp
+               editing/InsertListCommand.cpp
                editing/InsertNodeBeforeCommand.cpp
                editing/InsertParagraphSeparatorCommand.cpp
                editing/InsertTextCommand.cpp
@@ -440,7 +563,7 @@
                editing/JSEditor.cpp
                editing/markup.cpp
                editing/MergeIdenticalElementsCommand.cpp
-               editing/ModifySelectionListLevelCommand.cpp
+               editing/ModifySelectionListLevel.cpp
                editing/MoveSelectionCommand.cpp
                editing/RebalanceWhitespaceCommand.cpp
                editing/RemoveCSSPropertyCommand.cpp
@@ -470,40 +593,77 @@
                html/CanvasRenderingContext2D.cpp
                html/CanvasStyle.cpp
                html/FormDataList.cpp
-               html/html_baseimpl.cpp
-               html/html_blockimpl.cpp
-               html/html_headimpl.cpp
-               html/html_imageimpl.cpp
-               html/html_inlineimpl.cpp
-               html/html_listimpl.cpp
-               html/html_objectimpl.cpp
-               html/html_tableimpl.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/HTMLNames.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
 
        </set>
        <set append="1" var="WEBCORE_SOURCES_BINDINGS">
@@ -512,9 +672,12 @@
        </set>
        <set append="1" var="WEBCORE_SOURCES_JS">
                
-               bindings/js/JSCanvasRenderingContext2DBase.cpp
+               bindings/js/JSCanvasRenderingContext2DCustom.cpp
                bindings/js/JSDOMParser.cpp
                bindings/js/JSHTMLElementWrapperFactory.cpp
+               bindings/js/JSHTMLFormElementCustom.cpp
+               bindings/js/JSHTMLInputElementBase.cpp
+               bindings/js/JSHTMLOptionElementConstructor.cpp
                bindings/js/JSXMLHttpRequest.cpp
                bindings/js/JSXMLSerializer.cpp
                bindings/js/JSXSLTProcessor.cpp
@@ -527,6 +690,6 @@
                bindings/js/kjs_proxy.cpp
                bindings/js/kjs_traversal.cpp
                bindings/js/kjs_window.cpp
-
        </set>
+
 </makefile>

diff --git a/WebCore/css/maketokenizer b/WebCore/css/maketokenizer
index af09587a9d178df715091dfaf4c4126fb958d271..8779f286bed4c92f9af10f8463c9f061a715a021 100644 (file)
--- a/WebCore/css/maketokenizer
+++ b/WebCore/css/maketokenizer
@@ -43,6 +43,33 @@ print <<END;
 
 END
 
+# Not sure what the earliest version with the defines is
+# Using the OS for now
+$os=`uname`;
+if( $os = ~/Linux/ ) {
+print<<END
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t;
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+END
+}
+
+
 while (<>) {
     last if /YY_NUM_RULES/;
 }

diff --git a/WebCore/html/HTMLCanvasElement.cpp b/WebCore/html/HTMLCanvasElement.cpp
index e99ad7e5fe6380c125a16a65d51a8c2fc4f403ba..8edce8cf816889395ea3ef187735dcc701dcf021 100644 (file)
--- a/WebCore/html/HTMLCanvasElement.cpp
+++ b/WebCore/html/HTMLCanvasElement.cpp
@@ -35,6 +35,7 @@
 #include "GraphicsContext.h"
 #include "HTMLNames.h"
 #include "RenderHTMLCanvas.h"
+#include <math.h>
 
 namespace WebCore {
 

diff --git a/WebCore/html/HTMLImageElement.h b/WebCore/html/HTMLImageElement.h
index 49501712861edd43d5fec4163c8afddaf2bb2dbf..f8b7cd1dc4ab820c353991b82a2ae620314c333c 100644 (file)
--- a/WebCore/html/HTMLImageElement.h
+++ b/WebCore/html/HTMLImageElement.h
@@ -30,6 +30,7 @@
 #include "HTMLImageLoader.h"
 
 namespace WebCore {
+    class HTMLFormElement;
 
 class HTMLImageElement : public HTMLElement {
     friend class HTMLFormElement;

diff --git a/WebCore/icon/IconDatabase.cpp b/WebCore/icon/IconDatabase.cpp
index f788bea2eb68ab7a2db2035a33f08ba574f07b2a..d19f07549a34523ff4d85c39d9b0159e26226d8b 100644 (file)
--- a/WebCore/icon/IconDatabase.cpp
+++ b/WebCore/icon/IconDatabase.cpp
@@ -30,6 +30,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 const char* DefaultIconDatabaseFilename = "/icon.db";
 

diff --git a/WebCore/make-generated-sources.sh b/WebCore/make-generated-sources.sh
index 2d8d60964f4b3c9f4005b22344297b8607f4f955..5e2302061f375f04eff4a05d95bf875873ca309a 100755 (executable)
--- a/WebCore/make-generated-sources.sh
+++ b/WebCore/make-generated-sources.sh
@@ -6,5 +6,7 @@ export CREATE_HASH_TABLE="$SRCROOT/../JavaScriptCore/kjs/create_hash_table"
 mkdir -p DerivedSources/WebCore
 cd DerivedSources/WebCore
 
-make -f ../../DerivedSources.make ENCODINGS_FILE=$1 ENCODINGS_PREFIX=""
+# note ENCODINGS_PREFIX needs to be a ws string so it does not turn into
+# a null value
+make -f ../../DerivedSources.make ENCODINGS_FILE=$1 ENCODINGS_PREFIX=" "
 cd ../..

diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h
index 49a6061b30b2d1b6d462da3aab5513f6525c74e6..acac61b59e5f87f42d8a0d3672421cca4f0aa461 100644 (file)
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -774,10 +774,13 @@ protected:
 public:
   friend class FrameMac;
   friend class FrameWin;
+#if PLATFORM(GDK)
+  friend class FrameGdk;
+#endif
 
   RenderObject::NodeInfo nodeInfoAtPoint(const IntPoint&, bool allowShadowContent);
   bool hasSelection();
-  String Frame::documentTypeString() const;
+  String documentTypeString() const;
 
   void checkEmitLoadEvent();
   bool didOpenURL(const KURL&);

diff --git a/WebCore/page/FramePrivate.h b/WebCore/page/FramePrivate.h
index b99442307cf5f2a455d830dc37cb54aa565a98e4..cbaf485ae209d3f3f814bffcccbf90a83000ebcc 100644 (file)
--- a/WebCore/page/FramePrivate.h
+++ b/WebCore/page/FramePrivate.h
@@ -37,6 +37,8 @@
 #include "kjs_proxy.h"
 #include "KWQKIOGlobal.h"
 #include <wtf/HashMap.h>
+#include "CSSMutableStyleDeclaration.h"
+#include "Decoder.h"
 
 namespace WebCore {
 

diff --git a/WebCore/platform/Cursor.h b/WebCore/platform/Cursor.h
index d3bbebb1ff3dc0ab40160d022f06bee4212a0969..869369599904517068bce18841820f8abe71b691 100644 (file)
--- a/WebCore/platform/Cursor.h
+++ b/WebCore/platform/Cursor.h
@@ -28,6 +28,8 @@
 
 #ifdef WIN32
 #include <windows.h>
+#elif PLATFORM(GDK)
+#include <gdk/gdk.h>
 #endif
 
 #ifdef __APPLE__
@@ -46,6 +48,8 @@ namespace WebCore {
     typedef HCURSOR PlatformCursor;
 #elif defined(__APPLE__)
     typedef NSCursor* PlatformCursor;
+#elif PLATFORM(GDK)
+    typedef GdkCursor* PlatformCursor;
 #else
     typedef void* PlatformCursor;
 #endif

diff --git a/WebCore/platform/FontData.h b/WebCore/platform/FontData.h
index 19de140ad81dce31208ff5fdb534d435afb9d042..e8484047632ee43dea88c5cd41ef6f18da27c32f 100644 (file)
--- a/WebCore/platform/FontData.h
+++ b/WebCore/platform/FontData.h
@@ -78,6 +78,11 @@ public:
     void setIsMLangFont() { m_isMLangFont = true; }
 #endif
 
+#if PLATFORM(GDK)
+    void setFont(cairo_t*) const;
+    Glyph getGlyphIndex(UChar c) const { return m_font.index(c); }
+#endif
+
 private:
     void platformInit();
     void platformDestroy();

diff --git a/WebCore/platform/GlyphBuffer.h b/WebCore/platform/GlyphBuffer.h
index 94aafa66e82a4ec638b3ce8e39d4a92a36f7b179..33ac6b64e36c03880207cd0c41e0acad45fe2901 100644 (file)
--- a/WebCore/platform/GlyphBuffer.h
+++ b/WebCore/platform/GlyphBuffer.h
@@ -36,7 +36,7 @@
 
 #if __APPLE__
 #include <ApplicationServices/ApplicationServices.h>
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) || PLATFORM(GDK)
 #include <cairo.h>
 #include "FloatSize.h"
 #endif
@@ -51,7 +51,7 @@ class FontData;
 #if __APPLE__
 typedef Glyph GlyphBufferGlyph;
 typedef CGSize GlyphBufferAdvance;
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) || PLATFORM(GDK)
 typedef cairo_glyph_t GlyphBufferGlyph;
 typedef FloatSize GlyphBufferAdvance;
 #endif
@@ -95,7 +95,7 @@ public:
     {
 #if __APPLE__
         return m_glyphs[index];
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) || PLATFORM(GDK)
         return m_glyphs[index].index;
 #endif
     }
@@ -104,7 +104,7 @@ public:
     {
 #if __APPLE__
         return m_advances[index].width;
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) || PLATFORM(GDK)
         return m_advances[index].width();
 #endif
     }
@@ -118,7 +118,7 @@ public:
         advance.width = width;
         advance.height = 0;
         m_advances.append(advance);
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) || PLATFORM(GDK)
         cairo_glyph_t cairoGlyph;
         cairoGlyph.index = glyph;
         cairoGlyph.y = 0;

diff --git a/WebCore/platform/GraphicsContext.h b/WebCore/platform/GraphicsContext.h
index 35ad7b6434337305523ca47c96fa5b00202373a4..d30ee50e13286ee0405014aff1b55cce4b8e3917 100644 (file)
--- a/WebCore/platform/GraphicsContext.h
+++ b/WebCore/platform/GraphicsContext.h
@@ -40,6 +40,8 @@ typedef struct CGContext PlatformGraphicsContext;
 #elif WIN32
 typedef struct HDC__* HDC;
 typedef struct _cairo PlatformGraphicsContext;
+#elif PLATFORM(GDK)
+typedef struct _cairo PlatformGraphicsContext;
 #else
 typedef void PlatformGraphicsContext;
 #endif

diff --git a/WebCore/platform/PlatformKeyboardEvent.h b/WebCore/platform/PlatformKeyboardEvent.h
index e3cdc8d10a5b4763a427b1cc1d832405c9327e13..31df8b509c9fffb8c520a699c66bb6a508ef2be0 100644 (file)
--- a/WebCore/platform/PlatformKeyboardEvent.h
+++ b/WebCore/platform/PlatformKeyboardEvent.h
@@ -40,6 +40,11 @@ typedef unsigned    WPARAM;
 typedef long        LPARAM;
 #endif
 
+#if PLATFORM(GDK)
+typedef union _GdkEvent GdkEvent;
+#endif
+
+
 namespace WebCore {
 
     class PlatformKeyboardEvent {
@@ -64,6 +69,10 @@ namespace WebCore {
         PlatformKeyboardEvent(HWND, WPARAM, LPARAM);
 #endif
 
+#if PLATFORM(GDK)
+        PlatformKeyboardEvent(GdkEvent*);
+#endif
+
     private:
         String m_text;
         String m_unmodifiedText;

diff --git a/WebCore/platform/PlatformMouseEvent.h b/WebCore/platform/PlatformMouseEvent.h
index 8ae285eed4e1b6c705c51a1c71019bea6b5501e1..15d264b07e905cf11a749f60908086f121c779de 100644 (file)
--- a/WebCore/platform/PlatformMouseEvent.h
+++ b/WebCore/platform/PlatformMouseEvent.h
@@ -42,6 +42,10 @@ typedef unsigned WPARAM;
 typedef long LPARAM;
 #endif
 
+#if PLATFORM(GDK)
+typedef union _GdkEvent GdkEvent;
+#endif
+
 namespace WebCore {
 
     // These button numbers match the one used in the DOM API.
@@ -75,6 +79,9 @@ namespace WebCore {
 #if WIN32
         PlatformMouseEvent(HWND, WPARAM, LPARAM, int clickCount);
 #endif
+#if PLATFORM(GDK) 
+        PlatformMouseEvent(GdkEvent*);
+#endif
 
     private:
         IntPoint m_position;

diff --git a/WebCore/platform/PlatformWheelEvent.h b/WebCore/platform/PlatformWheelEvent.h
index b8b0b3a2221d389af3bab560f3adb6a81dde9134..027229e20fc93c9c501c5431d28e38a9a79bf667 100644 (file)
--- a/WebCore/platform/PlatformWheelEvent.h
+++ b/WebCore/platform/PlatformWheelEvent.h
@@ -36,6 +36,10 @@ class NSEvent;
 #endif
 #endif
 
+#if PLATFORM(GDK)
+typedef union _GdkEvent GdkEvent;
+#endif
+
 namespace WebCore {
 
     class PlatformWheelEvent {
@@ -62,6 +66,10 @@ namespace WebCore {
         PlatformWheelEvent(NSEvent*);
 #endif
 
+#if PLATFORM(GDK)
+        PlatformWheelEvent(GdkEvent*);
+#endif
+
     private:
         IntPoint m_position;
         IntPoint m_globalPosition;

diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h
index a712bbda50e32f0eb68e5c706660947e39d535bd..10eda43f584b5eb05be263a6b5b0fb02579b36b7 100644 (file)
--- a/WebCore/platform/ScrollView.h
+++ b/WebCore/platform/ScrollView.h
@@ -86,6 +86,20 @@ namespace WebCore {
         class ScrollViewPrivate;
         ScrollViewPrivate* m_data;
 #endif
+
+#if  PLATFORM(GDK)
+        void updateView(const IntRect&, bool now = false);
+        virtual void setDrawable(GdkDrawable* drawable);
+        virtual void setFrameGeometry(const IntRect&);
+        ScrollView();
+        ~ScrollView();
+    private:
+        void updateScrollBars();
+        IntSize maximumScroll() const;
+        int updateScrollInfo(short type, int current, int max, int pageSize);
+        class ScrollViewPrivate;
+        ScrollViewPrivate* m_data;
+#endif
     };
 
 }

diff --git a/WebCore/platform/TransferJob.h b/WebCore/platform/TransferJob.h
index e408403bb003f0d1b883325b5ce8b82bc6b2a890..bfaae60140d55fb358a142825339c1ace43e9b74 100644 (file)
--- a/WebCore/platform/TransferJob.h
+++ b/WebCore/platform/TransferJob.h
@@ -89,6 +89,10 @@ public:
     friend LRESULT __stdcall TransferJobWndProc(HWND, unsigned message, WPARAM, LPARAM);
 #endif
 
+#if PLATFORM(GDK)
+    TransferJobInternal * getInternal() { return d;}
+#endif
+
     void cancel();
     
     TransferJobClient* client() const;

diff --git a/WebCore/platform/TransferJobInternal.h b/WebCore/platform/TransferJobInternal.h
index d6b6896bdc1b2a0856976a5e491820bf8d7a952e..a9b4f202c9c860bf19924802979797900e5ba48a 100644 (file)
--- a/WebCore/platform/TransferJobInternal.h
+++ b/WebCore/platform/TransferJobInternal.h
@@ -35,6 +35,10 @@
 typedef void* HANDLE;
 #endif
 
+#if PLATFORM(GDK)
+typedef void CURL;
+#endif
+
 // The allocations and releases in TransferJobInternal are
 // Cocoa-exception-free (either simple Foundation classes or
 // KWQResourceLoader which avoids doing work in dealloc).
@@ -66,6 +70,9 @@ namespace WebCore {
             , m_formDataString(0)
             , m_formDataLength(0)
             , m_bytesRemainingToWrite(0)
+#endif
+#if PLATFORM(GDK)
+            , m_handle(0)
 #endif
         {
         }
@@ -93,6 +100,9 @@ namespace WebCore {
             , m_formDataString(0)
             , m_formDataLength(0)
             , m_bytesRemainingToWrite(0)
+#endif
+#if PLATFORM(GDK)
+            , m_handle(0)
 #endif
         {
         }
@@ -127,6 +137,9 @@ namespace WebCore {
         int m_formDataLength;
         int m_bytesRemainingToWrite;
         DeprecatedString m_postReferrer;
+#endif
+#if PLATFORM(GDK)
+        CURL *m_handle;
 #endif
         };
 

diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h
index 0058b6c031efc2fa6cd628c48bf37acdc431820d..cec8cb715b5a708fcb5713371b60290adfc30871 100644 (file)
--- a/WebCore/platform/Widget.h
+++ b/WebCore/platform/Widget.h
@@ -43,6 +43,10 @@ typedef struct HWND__ *HWND;
 typedef struct HINSTANCE__ *HINSTANCE;
 #endif
 
+#if PLATFORM(GDK)
+typedef struct _GdkDrawable GdkDrawable;
+#endif
+
 namespace WebCore {
 
     class Cursor;
@@ -132,6 +136,12 @@ namespace WebCore {
         static HINSTANCE instanceHandle;
 #endif
 
+#if PLATFORM(GDK)
+      Widget(GdkDrawable* drawable);
+      virtual void setDrawable(GdkDrawable* drawable);
+      GdkDrawable* drawable() const;
+#endif
+
 #if __APPLE__
         Widget(NSView* view);
 

diff --git a/WebCore/platform/cairo/GraphicsContextCairo.cpp b/WebCore/platform/cairo/GraphicsContextCairo.cpp
index f52db6fd1e9527908f4bcd2b70b89ade55c6fa01..dafda282257346d2d142f7fe879a73e965924977 100644 (file)
--- a/WebCore/platform/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/cairo/GraphicsContextCairo.cpp
@@ -30,7 +30,11 @@
 #include "Font.h"
 #include "IntPointArray.h"
 #include "IntRect.h"
+#include <cairo.h>
+#include <math.h>
+#if WIN32
 #include <cairo-win32.h>
+#endif
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ -72,6 +76,7 @@ GraphicsContextPlatformPrivate::~GraphicsContextPlatformPrivate()
     cairo_destroy(context);
 }
 
+#if WIN32
 GraphicsContext::GraphicsContext(HDC dc)
     : m_common(createGraphicsContextPrivate())
     , m_data(new GraphicsContextPlatformPrivate)
@@ -79,13 +84,16 @@ GraphicsContext::GraphicsContext(HDC dc)
     cairo_surface_t* surface = cairo_win32_surface_create(dc);
     m_data->context = cairo_create(surface);
 }
+#endif
 
-GraphicsContext::GraphicsContext(cairo_t* context)
+#if PLATFORM(GDK)
+GraphicsContext::GraphicsContext(PlatformGraphicsContext* context)
     : m_common(createGraphicsContextPrivate())
     , m_data(new GraphicsContextPlatformPrivate)
 {
     m_data->context = cairo_reference(context);
 }
+#endif
 
 GraphicsContext::~GraphicsContext()
 {
@@ -414,4 +422,27 @@ void GraphicsContext::drawLineForMisspelling(const IntPoint& point, int width)
     // FIXME: Implement.
 }
 
+FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& frect)
+{
+    FloatRect result;
+    double x =frect.x();
+    double y = frect.y();
+    cairo_t* context = m_data->context;
+    cairo_user_to_device(context,&x,&y);
+    x = round(x);
+    y = round(y);
+    cairo_device_to_user(context,&x,&y);
+    result.setX((float)x);
+    result.setY((float)y);
+    x = frect.width();
+    y = frect.height();
+    cairo_user_to_device_distance(context,&x,&y);
+    x = round(x);
+    y = round(y);
+    cairo_device_to_user_distance(context,&x,&y);
+    result.setWidth((float)x);
+    result.setHeight((float)y);
+    return result; 
+}
+
 }

diff --git a/WebCore/webcore-base.bkl b/WebCore/webcore-base.bkl
index 4d0a229e2a67405b685f9aa808b4a29d0472423c..74f7dbaafe279fea47dccff1c11e6d432c8beff6 100644 (file)
--- a/WebCore/webcore-base.bkl
+++ b/WebCore/webcore-base.bkl
@@ -47,8 +47,12 @@ Base settings shared by all Bakefile-based ports.
                $(WEBCORE_SOURCES_LOADER)
                $(WEBCORE_SOURCES_PLATFORM)
                $(WEBCORE_SOURCES_IMAGE-DECODERS)
+               $(WEBCORE_SOURCES_BMP)
                $(WEBCORE_SOURCES_GIF)
+               $(WEBCORE_SOURCES_ICO)
+               $(WEBCORE_SOURCES_ICON)
                $(WEBCORE_SOURCES_PNG)
+               $(WEBCORE_SOURCES_XBM)
                $(WEBCORE_SOURCES_ZLIB)
                $(WEBCORE_SOURCES_JPEG)
                $(WEBCORE_SOURCES_CSS)
@@ -60,6 +64,8 @@ Base settings shared by all Bakefile-based ports.
                $(WEBCORE_SOURCES_HTML)
                $(WEBCORE_SOURCES_BINDINGS)
                $(WEBCORE_SOURCES_JS)
+               $(WEBCORE_SOURCES_XPATH)
+               $(WEBCORE_SOURCES_IMPL)
        </set>
 
     <set var="BUILDDIR">obj-$(FORMAT)</set>
@@ -88,25 +94,31 @@ Base settings shared by all Bakefile-based ports.
         <include>$(SRCDIR)/page</include>
         <include>$(SRCDIR)/platform</include>
         <include>$(SRCDIR)/platform/image-decoders</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/zlib</include>
         <include>$(SRCDIR)/rendering</include>
         <include>$(SRCDIR)/xml</include>
         <include>$(SRCDIR)/xpath</include>
         <include>$(SRCDIR)/xpath/impl</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 -->
 
         <define>APPLE_CHANGES=1</define>
         <define>KHTML_XSLT=1</define>
-        <define>XPATH_SUPPORT=1</define>
 
         <!-- TODO: is there a Linux-specific platform define? -->
         <if cond="PLATFORM_UNIX=='1'">
@@ -126,9 +138,6 @@ Base settings shared by all Bakefile-based ports.
         <if cond="FORMAT=='gnu'">
             <!-- FIXME: we need proper configure checks -->
             <define>HAVE_FUNC_ISNAN</define>
-            <!-- check for undefined symbols for debugging reasons -->
-            <!-- FIXME: create a debug option and set these accordingly -->
-            <ldflags>-Wl,--no-undefined</ldflags>
         </if>
 
         <if cond="PLATFORM_WIN32=='1'">

diff --git a/WebCore/xpath/impl/XPathValue.cpp b/WebCore/xpath/impl/XPathValue.cpp
index 5103e15aeb43af1a9cfc42c29e3df4d3aca27744..6894af1a4c247eba21e90d35adf85ab6fe2e7921 100644 (file)
--- a/WebCore/xpath/impl/XPathValue.cpp
+++ b/WebCore/xpath/impl/XPathValue.cpp
@@ -25,12 +25,13 @@
  */
 
 #include "config.h"
-#include "XPathValue.h"
 
 #if XPATH_SUPPORT
 
+#include "XPathValue.h"
 #include "Node.h"
 #include <wtf/MathExtras.h>
+#include <math.h>
 
 namespace WebCore {
 namespace XPath {