From kfm-devel Fri Jan 10 01:39:41 2003 From: Alan Gutierrez Date: Fri, 10 Jan 2003 01:39:41 +0000 To: kfm-devel Subject: Re: Win32 Port of Safari X-MARC-Message: https://marc.info/?l=kfm-devel&m=104216305002935 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------070009070206030409070201" This is a multi-part message in MIME format. --------------070009070206030409070201 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Dirk Mueller wrote: > On Don, 09 Jan 2003, Alan Gutierrez wrote: > >>I am going to set up KDeveloper and build KHTML on Linux. This way I can >>make sure that I send you patches that compile under gcc. It will also help >>me better understand the differences between VC++ and GCC. > > They don't have to compile. I just want to see what you needed to change, to > see if its worth bothering trying to fix it in KHTML codebase. > >>Have the Apple changes been check into your repository? I'd rather work with >>them so you don't have to do a three way merge. > > Yes, incrementally. It will take a few weeks though I guess till we have a > common codebase. Here is a diff of the khtml directory. Not all of the them were *necessary* to build. Some were made to hush warnings, which I can turn of in VC++ if we don't care about them. Alan Gutierrez --------------070009070206030409070201 Content-Type: text/plain; name="khtml.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="khtml.diff" diff -r /home/alan/build/WebCore/khtml/css/cssstyleselector.cpp khtml/css/cssstyleselector.cpp 253c253 < const float factor = 1.2; --- > const float factor = 1.2F; diff -r /home/alan/build/WebCore/khtml/dom/dom_node.h khtml/dom/dom_node.h 950a951,953 > #if defined (WIN32_NATIVE) > typedef int64_t DOMTimeStamp; > #else 951a955 > #endif diff -r /home/alan/build/WebCore/khtml/ecma/kjs_window.cpp khtml/ecma/kjs_window.cpp 1090c1090 < LOG(PopupBlocking, "Allowed JavaScript window open of %s", args[0].toString(exec).qstring().ascii()); --- > LOG1(PopupBlocking, "Allowed JavaScript window open of %s", args[0].toString(exec).qstring().ascii()); 1092c1092 < LOG(PopupBlocking, "Blocked JavaScript window open of %s", args[0].toString(exec).qstring().ascii()); --- > LOG1(PopupBlocking, "Blocked JavaScript window open of %s", args[0].toString(exec).qstring().ascii()); diff -r /home/alan/build/WebCore/khtml/khtml_part.h khtml/khtml_part.h 1057a1058,1060 > #if defined(WIN32_NATIVE) > protected: > #endif 1058a1062,1064 > #if defined(WIN32_NATIVE) > private: > #endif diff -r /home/alan/build/WebCore/khtml/rendering/render_arena.h khtml/rendering/render_arena.h 38c38 < #include "arena.h" --- > #include "misc/arena.h" diff -r /home/alan/build/WebCore/khtml/rendering/render_object.h khtml/rendering/render_object.h 256c256 < virtual void paintObject( QPainter */*p*/, int /*x*/, int /*y*/, --- > virtual void paintObject( QPainter * /*p*/, int /*x*/, int /*y*/, diff -r /home/alan/build/WebCore/khtml/rendering/render_style.h khtml/rendering/render_style.h 632c632 < bool hasPseudoStyle() const { return pseudoStyle; } --- > bool hasPseudoStyle() const { return pseudoStyle != NULL; } // AJG diff -r /home/alan/build/WebCore/khtml/xml/dom2_traversalimpl.cpp khtml/xml/dom2_traversalimpl.cpp 255c255 < if( ( ( 1 << n->nodeType()-1) & m_whatToShow) != 0 ) --- > if( ( ( 1 << (n->nodeType()-1)) & m_whatToShow) != 0 ) // AJG 529c529 < if( ( ( 1 << n.nodeType()-1 ) & m_whatToShow) != 0 ) --- > if( ( ( 1 << (n.nodeType()-1) ) & m_whatToShow) != 0 ) diff -r /home/alan/build/WebCore/khtml/xml/dom2_viewsimpl.cpp khtml/xml/dom2_viewsimpl.cpp 36c36 < CSSStyleDeclarationImpl *AbstractViewImpl::getComputedStyle(ElementImpl */*elt*/, DOMStringImpl */*pseudoElt*/) --- > CSSStyleDeclarationImpl *AbstractViewImpl::getComputedStyle(ElementImpl * /*elt*/, DOMStringImpl * /*pseudoElt*/) diff -r /home/alan/build/WebCore/khtml/xml/dom_docimpl.cpp khtml/xml/dom_docimpl.cpp 48c48 < #include "render_arena.h" --- > #include "rendering/render_arena.h" 191c191 < CSSStyleSheetImpl *DOMImplementationImpl::createCSSStyleSheet(DOMStringImpl */*title*/, DOMStringImpl *media, --- > CSSStyleSheetImpl *DOMImplementationImpl::createCSSStyleSheet(DOMStringImpl * /*title*/, DOMStringImpl *media, 2068c2068 < CSSStyleDeclarationImpl *DocumentImpl::getOverrideStyle(ElementImpl */*elt*/, DOMStringImpl */*pseudoElt*/) --- > CSSStyleDeclarationImpl *DocumentImpl::getOverrideStyle(ElementImpl * /*elt*/, DOMStringImpl * /*pseudoElt*/) diff -r /home/alan/build/WebCore/khtml/xml/dom_docimpl.h khtml/xml/dom_docimpl.h 355c355 < bool hasListenerType(ListenerType listenerType) const { return (m_listenerTypes & listenerType); } --- > bool hasListenerType(ListenerType listenerType) const { return (m_listenerTypes & listenerType) == listenerType; } // AJG: TODO! diff -r /home/alan/build/WebCore/khtml/xml/dom_elementimpl.cpp khtml/xml/dom_elementimpl.cpp 557c557,558 < AttrImpl *NamedAttrMapImpl::getNamedItem ( NodeImpl::Id id ) const --- > // AttrImpl *NamedAttrMapImpl::getNamedItem ( NodeImpl::Id id ) const AJG > NodeImpl *NamedAttrMapImpl::getNamedItem ( NodeImpl::Id id ) const 637c638,639 < AttrImpl *NamedAttrMapImpl::item ( unsigned long index ) const --- > // AttrImpl *NamedAttrMapImpl::item ( unsigned long index ) const > NodeImpl *NamedAttrMapImpl::item ( unsigned long index ) const 705c707,708 < for (uint i = 0; i < len; i++) { --- > uint i; > for (i = 0; i < len; i++) { 710c713 < for(uint i = 0; i < len; i++) --- > for(i = 0; i < len; i++) diff -r /home/alan/build/WebCore/khtml/xml/dom_elementimpl.h khtml/xml/dom_elementimpl.h 197c197 < virtual void mouseEventHandler( MouseEvent */*ev*/, bool /*inside*/ ) {}; --- > virtual void mouseEventHandler( MouseEvent * /*ev*/, bool /*inside*/ ) {}; 267c267,268 < virtual AttrImpl *getNamedItem ( NodeImpl::Id id ) const; --- > // virtual AttrImpl *getNamedItem ( NodeImpl::Id id ) const; AJG > virtual NodeImpl *getNamedItem ( NodeImpl::Id id ) const; 271c272,273 < virtual AttrImpl *item ( unsigned long index ) const; --- > // virtual AttrImpl *item ( unsigned long index ); // AJG const; > virtual NodeImpl *item ( unsigned long index ) const; diff -r /home/alan/build/WebCore/khtml/xml/dom_nodeimpl.cpp khtml/xml/dom_nodeimpl.cpp 658,660c658,660 < bool ctrlKey = (_mouse->state() & Qt::ControlButton); < bool altKey = (_mouse->state() & Qt::AltButton); < bool shiftKey = (_mouse->state() & Qt::ShiftButton); --- > bool ctrlKey = (_mouse->state() & Qt::ControlButton) == Qt::ControlButton; > bool altKey = (_mouse->state() & Qt::AltButton) == Qt::AltButton; > bool shiftKey = (_mouse->state() & Qt::ShiftButton) == Qt::ShiftButton; 907c907 < *stream << endl; --- > *stream << endl; // AJG VC++ got confused and call kdbgstream version of endl 1784c1784 < bool ChildNodeListImpl::nodeMatches( NodeImpl */*testNode*/ ) const --- > bool ChildNodeListImpl::nodeMatches( NodeImpl * /*testNode*/ ) const diff -r /home/alan/build/WebCore/khtml/xml/dom_stringimpl.cpp khtml/xml/dom_stringimpl.cpp 200c200 < #if !APPLE_CHANGES --- > #if !APPLE_CHANGES || WIN32_NATIVE 210c210 < #if APPLE_CHANGES --- > #if APPLE_CHANGES && !WIN32_NATIVE diff -r /home/alan/build/WebCore/khtml/xml/dom_textimpl.cpp khtml/xml/dom_textimpl.cpp 372,373c372,375 < if (par->isTable() || par->isTableRow() || par->isTableSection()) < return CharacterDataImpl::attach(); --- > if (par->isTable() || par->isTableRow() || par->isTableSection()) { > CharacterDataImpl::attach(); > return; > } 378,379c380,383 < if (prevRender && prevRender->isFlow() && !prevRender->isInline()) < return CharacterDataImpl::attach(); --- > if (prevRender && prevRender->isFlow() && !prevRender->isInline()) { > CharacterDataImpl::attach(); > return; > } 384,385c388,391 < (!prevRender || !prevRender->isInline())) < return CharacterDataImpl::attach(); --- > (!prevRender || !prevRender->isInline())) { > CharacterDataImpl::attach(); > return; > } 389c395 < nextRender == par->firstChild())) --- > nextRender == par->firstChild())) { 392c398,400 < return CharacterDataImpl::attach(); --- > CharacterDataImpl::attach(); > return; > } --------------070009070206030409070201--