SOURCES: kde4-kdelibs-branch.diff - updated
arekm
arekm at pld-linux.org
Mon Feb 9 21:20:22 CET 2009
Author: arekm Date: Mon Feb 9 20:20:22 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kde4-kdelibs-branch.diff (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/kde4-kdelibs-branch.diff
diff -u SOURCES/kde4-kdelibs-branch.diff:1.2 SOURCES/kde4-kdelibs-branch.diff:1.3
--- SOURCES/kde4-kdelibs-branch.diff:1.2 Tue Feb 3 12:14:25 2009
+++ SOURCES/kde4-kdelibs-branch.diff Mon Feb 9 21:20:16 2009
@@ -1,7 +1,7 @@
Index: khtml/misc/borderarcstroker.cpp
===================================================================
---- khtml/misc/borderarcstroker.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
-+++ khtml/misc/borderarcstroker.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+--- khtml/misc/borderarcstroker.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/misc/borderarcstroker.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
@@ -347,7 +347,7 @@
const KCubicBezier inner(innerPath.elementAt(0), innerPath.elementAt(1), innerPath.elementAt(2), innerPath.elementAt(3));
const KCubicBezier outer(outerPath.elementAt(0), outerPath.elementAt(1), outerPath.elementAt(2), outerPath.elementAt(3));
@@ -11,10 +11,47 @@
if (a < 0)
a += 360.0;
+Index: khtml/misc/loader.cpp
+===================================================================
+--- khtml/misc/loader.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/misc/loader.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -85,6 +85,8 @@
+
+ #include "blocked_icon.cpp"
+
++#include <QPaintEngine>
++
+ using namespace khtml;
+ using namespace DOM;
+ using namespace khtmlImLoad;
+@@ -613,18 +615,20 @@
+ int w = i->size().width();
+ int h = i->size().height();
+
+- if (i->hasAlpha()) {
++ QPixmap pm(w, h);
++ if (i->hasAlpha() && !pm.paintEngine()->hasFeature(QPaintEngine::PorterDuff)) {
+ QImage im(w, h, QImage::Format_ARGB32_Premultiplied);
+
+ QPainter paint(&im);
+- paint.setCompositionMode(QPainter::CompositionMode_Source);
+ ImagePainter pi(i);
+ pi.paint(0, 0, &paint);
+ paint.end();
+ return QPixmap::fromImage( im );
+ } else {
+- QPixmap pm(w, h);
++ pm.fill(Qt::transparent);
+ QPainter paint(&pm);
++ if (i->hasAlpha())
++ paint.setCompositionMode(QPainter::CompositionMode_Source);
+ ImagePainter pi(i);
+ pi.paint(0, 0, &paint);
+ paint.end();
Index: khtml/khtml_part.cpp
===================================================================
---- khtml/khtml_part.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
-+++ khtml/khtml_part.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+--- khtml/khtml_part.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/khtml_part.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
@@ -291,16 +291,26 @@
if ( prof == BrowserViewGUI ) {
d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), this );
@@ -53,11 +90,164 @@
d->m_paSelectAll->setShortcuts( KShortcut() ); // avoid clashes
d->m_paToggleCaretMode = new KToggleAction(i18n("Toggle Caret Mode"), this );
+Index: khtml/html/html_headimpl.cpp
+===================================================================
+--- khtml/html/html_headimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/html/html_headimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -604,6 +604,12 @@
+ void HTMLStyleElementImpl::insertedIntoDocument()
+ {
+ HTMLElementImpl::insertedIntoDocument();
++
++ // If we're empty, we have to call parseText here, since we won't get childrenChanged();
++ // but we still want a CSSOM object
++ if (!firstChild())
++ parseText();
++
+ if (m_sheet)
+ document()->updateStyleSelector();
+ }
+@@ -619,6 +625,11 @@
+ {
+ HTMLElementImpl::childrenChanged();
+
++ parseText();
++}
++
++void HTMLStyleElementImpl::parseText()
++{
+ DOMString text = "";
+
+ for (NodeImpl *c = firstChild(); c != 0; c = c->nextSibling()) {
+Index: khtml/html/html_objectimpl.cpp
+===================================================================
+--- khtml/html/html_objectimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/html/html_objectimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -789,9 +789,7 @@
+
+ DocumentImpl* HTMLObjectElementImpl::contentDocument() const
+ {
+- if ( !m_render ) return 0;
+- if ( !m_render->isWidget() ) return 0;
+- QWidget* widget = static_cast<RenderWidget*>( m_render )->widget();
++ QWidget* widget = childWidget();
+ if( widget && qobject_cast<KHTMLView*>( widget ) )
+ return static_cast<KHTMLView*>( widget )->part()->xmlDocImpl();
+ return 0;
+Index: khtml/html/html_headimpl.h
+===================================================================
+--- khtml/html/html_headimpl.h (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/html/html_headimpl.h (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -205,6 +205,8 @@
+ virtual bool checkRemovePendingSheet();
+
+ protected:
++ void parseText();
++
+ CSSStyleSheetImpl *m_sheet;
+ DOMString m_type;
+ QString m_media;
+Index: khtml/ecma/debugger/debugwindow.cpp
+===================================================================
+--- khtml/ecma/debugger/debugwindow.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/debugger/debugwindow.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -350,6 +350,12 @@
+ }
+ }
+
++void DebugWindow::forceStopAtNext()
++{
++ DebugWindow* self = window();
++ self->m_breakAtNext = true;
++}
++
+ void DebugWindow::stopAtNext()
+ {
+ m_breakAtNext = m_stopAct->isChecked();
+Index: khtml/ecma/debugger/debugwindow.h
+===================================================================
+--- khtml/ecma/debugger/debugwindow.h (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/debugger/debugwindow.h (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -113,6 +113,9 @@
+ // Called by KJSProxy when we navigate away from a page
+ void clearInterpreter(KJS::Interpreter* interp);
+
++ // Hook for activating the debugger from gdb or such
++ static void forceStopAtNext();
++
+ public Q_SLOTS:
+ void stopAtNext();
+ void continueExecution();
+Index: khtml/ecma/kjs_range.cpp
+===================================================================
+--- khtml/ecma/kjs_range.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_range.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -61,7 +61,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMRangeProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMRangeProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMRange",DOMRangeProto,DOMRangeProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMRange",DOMRangeProto,DOMRangeProtoFunc,ObjectPrototype)
+
+ DOMRange::DOMRange(ExecState *exec, DOM::RangeImpl* r)
+ : m_impl(r)
+Index: khtml/ecma/kjs_audio.cpp
+===================================================================
+--- khtml/ecma/kjs_audio.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_audio.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -64,7 +64,7 @@
+
+ KJS_DEFINE_PROTOTYPE(AudioProto)
+ KJS_IMPLEMENT_PROTOFUNC(AudioProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("Audio", AudioProto, AudioProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("Audio", AudioProto, AudioProtoFunc, ObjectPrototype)
+
+ const ClassInfo Audio::info = { "Audio", 0, &AudioTable, 0 };
+
+Index: khtml/ecma/kjs_binding.h
+===================================================================
+--- khtml/ecma/kjs_binding.h (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_binding.h (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -35,6 +35,7 @@
+ #include <kjs/lookup.h>
+ #include <kjs/function.h>
+ #include <kjs/JSVariableObject.h>
++#include <kjs/object_object.h>
+
+ #include <stdlib.h> // for abort
+
+@@ -358,6 +359,8 @@
+ #define IMPLEMENT_PSEUDO_CONSTRUCTOR_IMP(Class,ClassName,ProtoClass,ParentProto) \
+ const ClassInfo Class::info = { ClassName, 0, 0, 0 }; \
+ Class::Class(ExecState* exec): DOMObject(ParentProto) {\
++ /* Since ProtoClass ctor might need us, make sure we're registered */ \
++ exec->lexicalInterpreter()->globalObject()->put(exec, "[[" ClassName ".constructor]]", this, KJS::Internal | KJS::DontEnum); \
+ JSObject* proto = ProtoClass::self(exec); \
+ putDirect(exec->propertyNames().prototype, proto, DontDelete|ReadOnly); \
+ }\
Index: khtml/ecma/kjs_dom.cpp
===================================================================
---- khtml/ecma/kjs_dom.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
-+++ khtml/ecma/kjs_dom.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
-@@ -655,15 +655,15 @@
+--- khtml/ecma/kjs_dom.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_dom.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -101,7 +101,16 @@
+ @end
+ */
+ KJS_IMPLEMENT_PROTOFUNC(DOMNodeProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMNode", DOMNodeProto, DOMNodeProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE_IMP("DOMNode", DOMNodeProto, DOMNodeProtoFunc, DOMNodeConstants)
++{
++ // We need to setup the constructor property to the ctor here, but NodeConstructor::self
++ // will try to make us again, since we're in the middle of cacheGlobalObject.
++ // To workaround that, register ourselves so the re-entry of cacheGlobalObject
++ // will pick us. NodeCtor ctor does the same already, to fix the problem
++ // in the other direction.
++ exec->lexicalInterpreter()->globalObject()->put(exec, *name(), this, KJS::Internal | KJS::DontEnum);
++ putDirect(exec->propertyNames().constructor, NodeConstructor::self(exec), DontEnum);
++}
+
+ const ClassInfo DOMNode::info = { "Node", 0, &DOMNodeTable, 0 };
+
+@@ -655,15 +664,15 @@
static_cast<DOM::DocumentFragmentImpl*>(range->createContextualFragment(args[1]->toString(exec).domString(), exception).handle());
if (exception.triggered()) return jsUndefined();
@@ -78,10 +268,683 @@
if (node.nextSibling())
node.parentNode()->insertBefore(docFrag.get(), node.nextSibling(),exception);
else
+@@ -691,7 +700,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMNodeListProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMNodeListProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMNodeList",DOMNodeListProto,DOMNodeListProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMNodeList",DOMNodeListProto,DOMNodeListProtoFunc, ObjectPrototype)
+
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(NodeListPseudoCtor, "NodeList", DOMNodeListProto)
+
+@@ -917,7 +926,7 @@
+ */
+
+ KJS_IMPLEMENT_PROTOFUNC(DOMDocumentProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMDocument",DOMDocumentProto, DOMDocumentProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMDocument",DOMDocumentProto, DOMDocumentProtoFunc, DOMNodeProto)
+
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(DocumentPseudoCtor, "Document", DOMDocumentProto)
+
+@@ -1187,7 +1196,7 @@
+ @end
+ */
+ KJS_IMPLEMENT_PROTOFUNC(DOMElementProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMElement",DOMElementProto,DOMElementProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMElement",DOMElementProto,DOMElementProtoFunc,DOMNodeProto)
+
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(ElementPseudoCtor, "Element", DOMElementProto)
+
+@@ -1376,7 +1385,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMDOMImplementationProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMDOMImplementationProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMImplementation",DOMDOMImplementationProto,DOMDOMImplementationProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMImplementation",DOMDOMImplementationProto,DOMDOMImplementationProtoFunc,ObjectPrototype)
+
+ const ClassInfo DOMDOMImplementation::info = { "DOMImplementation", 0, 0, 0 };
+
+@@ -1508,7 +1517,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMNamedNodeMapProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMNamedNodeMapProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("NamedNodeMap",DOMNamedNodeMapProto,DOMNamedNodeMapProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("NamedNodeMap",DOMNamedNodeMapProto,DOMNamedNodeMapProtoFunc,ObjectPrototype)
+
+ const ClassInfo DOMNamedNodeMap::info = { "NamedNodeMap", 0, &DOMNamedNodeMapTable, 0 };
+
+@@ -1903,9 +1912,9 @@
+ replaceData DOMCharacterData::ReplaceData DontDelete|Function 2
+ @end
+ */
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(DOMCharacterDataProto, DOMNodeProto)
++KJS_DEFINE_PROTOTYPE(DOMCharacterDataProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMCharacterDataProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMCharacterData",DOMCharacterDataProto,DOMCharacterDataProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMCharacterData",DOMCharacterDataProto,DOMCharacterDataProtoFunc,DOMNodeProto)
+
+ DOMCharacterData::DOMCharacterData(ExecState *exec, DOM::CharacterDataImpl* d)
+ : DOMNode(exec, d)
+@@ -1987,9 +1996,9 @@
+ replaceWholeText DOMText::ReplaceWholeText DontDelete|Function 1
+ @end
+ */
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(DOMTextProto, DOMCharacterDataProto)
++KJS_DEFINE_PROTOTYPE(DOMTextProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMTextProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMText",DOMTextProto,DOMTextProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMText",DOMTextProto,DOMTextProtoFunc,DOMCharacterDataProto)
+
+ DOMText::DOMText(ExecState *exec, DOM::TextImpl* t)
+ : DOMCharacterData(exec, t)
+Index: khtml/ecma/xmlserializer.cpp
+===================================================================
+--- khtml/ecma/xmlserializer.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/xmlserializer.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -39,7 +39,7 @@
+ namespace KJS {
+ KJS_DEFINE_PROTOTYPE(XMLSerializerProto)
+ KJS_IMPLEMENT_PROTOFUNC(XMLSerializerProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("XMLSerializer", XMLSerializerProto,XMLSerializerProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("XMLSerializer", XMLSerializerProto,XMLSerializerProtoFunc, ObjectPrototype)
+
+ XMLSerializerConstructorImp::XMLSerializerConstructorImp(ExecState* exec)
+ : JSObject(exec->lexicalInterpreter()->builtinObjectPrototype())
+Index: khtml/ecma/kjs_css.cpp
+===================================================================
+--- khtml/ecma/kjs_css.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_css.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -135,7 +135,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMCSSStyleDeclarationProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMCSSStyleDeclarationProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMCSSStyleDeclaration", DOMCSSStyleDeclarationProto, DOMCSSStyleDeclarationProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMCSSStyleDeclaration", DOMCSSStyleDeclarationProto, DOMCSSStyleDeclarationProtoFunc, ObjectPrototype)
+
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(CSSStyleDeclarationPseudoCtor, "DOMCSSStyleDeclaration",DOMCSSStyleDeclarationProto)
+
+@@ -495,7 +495,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMMediaListProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMMediaListProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMMediaList", DOMMediaListProto, DOMMediaListProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMMediaList", DOMMediaListProto, DOMMediaListProtoFunc, ObjectPrototype)
+
+ DOMMediaList::DOMMediaList(ExecState *exec, DOM::MediaListImpl* ml)
+ : m_impl(ml)
+@@ -593,7 +593,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMCSSStyleSheetProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMCSSStyleSheetProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMCSSStyleSheet",DOMCSSStyleSheetProto,DOMCSSStyleSheetProtoFunc) // warning, use _WITH_PARENT if DOMStyleSheet gets a proto
++KJS_IMPLEMENT_PROTOTYPE("DOMCSSStyleSheet",DOMCSSStyleSheetProto,DOMCSSStyleSheetProtoFunc, ObjectPrototype) // warning, give a parent if DOMStyleSheet gets a proto
+
+ DOMCSSStyleSheet::DOMCSSStyleSheet(ExecState *exec, DOM::CSSStyleSheetImpl* ss): DOMStyleSheet(exec, ss)
+ {
+@@ -1119,7 +1119,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMCSSPrimitiveValueProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMCSSPrimitiveValueProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMCSSPrimitiveValue",DOMCSSPrimitiveValueProto,DOMCSSPrimitiveValueProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMCSSPrimitiveValue",DOMCSSPrimitiveValueProto,DOMCSSPrimitiveValueProtoFunc,ObjectPrototype)
+
+ DOMCSSPrimitiveValue::DOMCSSPrimitiveValue(ExecState *exec, DOM::CSSPrimitiveValueImpl* v)
+ : DOMCSSValue(exec, v) {
+Index: khtml/ecma/kjs_views.cpp
+===================================================================
+--- khtml/ecma/kjs_views.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_views.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -40,7 +40,7 @@
+
+ KJS_DEFINE_PROTOTYPE(DOMAbstractViewProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMAbstractViewProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMAbstractView", DOMAbstractViewProto,DOMAbstractViewProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMAbstractView", DOMAbstractViewProto,DOMAbstractViewProtoFunc,ObjectPrototype)
+
+ DOMAbstractView::DOMAbstractView(ExecState *exec, DOM::AbstractViewImpl* av)
+ : m_impl(av)
+Index: khtml/ecma/xmlhttprequest.cpp
+===================================================================
+--- khtml/ecma/xmlhttprequest.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/xmlhttprequest.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -68,7 +68,7 @@
+
+ KJS_DEFINE_PROTOTYPE(XMLHttpRequestProto)
+ KJS_IMPLEMENT_PROTOFUNC(XMLHttpRequestProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("XMLHttpRequest", XMLHttpRequestProto,XMLHttpRequestProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("XMLHttpRequest", XMLHttpRequestProto,XMLHttpRequestProtoFunc, ObjectPrototype)
+
+
+ XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject)
+Index: khtml/ecma/kjs_traversal.cpp
+===================================================================
+--- khtml/ecma/kjs_traversal.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_traversal.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -61,7 +61,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMNodeIteratorProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMNodeIteratorProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMNodeIterator",DOMNodeIteratorProto,DOMNodeIteratorProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMNodeIterator",DOMNodeIteratorProto,DOMNodeIteratorProtoFunc,ObjectPrototype)
+
+ DOMNodeIterator::DOMNodeIterator(ExecState *exec, DOM::NodeIteratorImpl* ni)
+ : DOMObject(DOMNodeIteratorProto::self(exec)), m_impl(ni) {}
+@@ -194,7 +194,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMTreeWalkerProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMTreeWalkerProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMTreeWalker",DOMTreeWalkerProto,DOMTreeWalkerProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMTreeWalker",DOMTreeWalkerProto,DOMTreeWalkerProtoFunc,ObjectPrototype)
+
+ DOMTreeWalker::DOMTreeWalker(ExecState *exec, DOM::TreeWalkerImpl* tw)
+ : m_impl(tw) {
+Index: khtml/ecma/kjs_html.cpp
+===================================================================
+--- khtml/ecma/kjs_html.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_html.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -73,9 +73,9 @@
+
+ namespace KJS {
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLDocumentProto, DOMDocumentProto)
++KJS_DEFINE_PROTOTYPE(HTMLDocumentProto)
+ KJS_IMPLEMENT_PROTOFUNC(HTMLDocFunction)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLDocument", HTMLDocumentProto, HTMLDocFunction)
++KJS_IMPLEMENT_PROTOTYPE("HTMLDocument", HTMLDocumentProto, HTMLDocFunction, DOMDocumentProto)
+
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLDocumentPseudoCtor, "HTMLDocument", HTMLDocumentProto)
+
+@@ -444,7 +444,7 @@
+ switch (token) {
+ case Body: {
+ DOM::NodeImpl* body = toNode(value);
+- if (body->isHTMLElement())
++ if (body && body->isHTMLElement())
+ doc.setBody(static_cast<DOM::HTMLElementImpl*>(body), exception);
+ return;
+ }
+@@ -2575,8 +2575,8 @@
+
+
+ //Prototype mess for this...
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLElementProto, DOMElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLElement", HTMLElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLElement", HTMLElementProto, HTMLElementFunction, DOMElementProto )
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLElementPseudoCtor, "HTMLElement", HTMLElementProto)
+
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLHtmlElement", HTMLHtmlElementProto, HTMLElementProto)
+@@ -2603,16 +2603,16 @@
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLStyleElement", HTMLStyleElementProto, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLStyleElementPseudoCtor, "HTMLStyleElement", HTMLStyleElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLBodyElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLBodyElement", HTMLBodyElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLBodyElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLBodyElement", HTMLBodyElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLBodyElementPseudoCtor, "HTMLBodyElement", HTMLBodyElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLFormElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLFormElement", HTMLFormElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLFormElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLFormElement", HTMLFormElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLFormElementPseudoCtor, "HTMLFormElement", HTMLFormElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLSelectElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLSelectElement", HTMLSelectElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLSelectElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLSelectElement", HTMLSelectElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLSelectElementPseudoCtor, "HTMLSelectElement", HTMLSelectElementProto)
+
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLOptGroupElement", HTMLOptGroupElementProto, HTMLElementProto)
+@@ -2621,16 +2621,16 @@
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLOptionElement", HTMLOptionElementProto, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLOptionElementPseudoCtor, "HTMLOptionElement", HTMLOptionElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLInputElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLInputElement", HTMLInputElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLInputElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLInputElement", HTMLInputElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLInputElementPseudoCtor, "HTMLInputElement", HTMLInputElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLTextAreaElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLTextAreaElement", HTMLTextAreaElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLTextAreaElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLTextAreaElement", HTMLTextAreaElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLTextAreaElementPseudoCtor, "HTMLTextAreaElement", HTMLTextAreaElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLButtonElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLButtonElement", HTMLButtonElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLButtonElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLButtonElement", HTMLButtonElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLButtonElementPseudoCtor, "HTMLButtonElement", HTMLButtonElementProto)
+
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLLabelElement", HTMLLabelElementProto, HTMLElementProto)
+@@ -2693,8 +2693,8 @@
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLModElement", HTMLModElementProto, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLModElementPseudoCtor, "HTMLModElement", HTMLModElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLAnchorElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLAnchorElement", HTMLAnchorElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLAnchorElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLAnchorElement", HTMLAnchorElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLAnchorElementPseudoCtor, "HTMLAnchorElement", HTMLAnchorElementProto)
+
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLImageElement", HTMLImageElementProto, HTMLElementProto)
+@@ -2718,8 +2718,8 @@
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLScriptElement", HTMLScriptElementProto, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLScriptElementPseudoCtor, "HTMLScriptElement", HTMLScriptElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLTableElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLTableElement", HTMLTableElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLTableElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLTableElement", HTMLTableElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLTableElementPseudoCtor, "HTMLTableElement", HTMLTableElementProto)
+
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLTableCaptionElement", HTMLTableCaptionElementProto, HTMLElementProto)
+@@ -2728,12 +2728,12 @@
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLTableColElement", HTMLTableColElementProto, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLTableColElementPseudoCtor, "HTMLTableColElement", HTMLTableColElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLTableSectionElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLTableSectionElement", HTMLTableSectionElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLTableSectionElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLTableSectionElement", HTMLTableSectionElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLTableSectionElementPseudoCtor, "HTMLTableSectionElement", HTMLTableSectionElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLTableRowElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLTableRowElement", HTMLTableRowElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLTableRowElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLTableRowElement", HTMLTableRowElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLTableRowElementPseudoCtor, "HTMLTableRowElement", HTMLTableRowElementProto)
+
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLTableCellElement", HTMLTableCellElementProto, HTMLElementProto)
+@@ -2751,12 +2751,12 @@
+ KJS_EMPTY_PROTOTYPE_WITH_PROTOTYPE("HTMLIFrameElement", HTMLIFrameElementProto, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLIFrameElementPseudoCtor, "HTMLIFrameElement", HTMLIFrameElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLMarqueeElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLMarqueeElement", HTMLMarqueeElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLMarqueeElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLMarqueeElement", HTMLMarqueeElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLMarqueeElementPseudoCtor, "HTMLMarqueeElement", HTMLMarqueeElementProto)
+
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLCanvasElementProto, HTMLElementProto)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLCanvasElement", HTMLCanvasElementProto, HTMLElementFunction)
++KJS_DEFINE_PROTOTYPE(HTMLCanvasElementProto)
++KJS_IMPLEMENT_PROTOTYPE("HTMLCanvasElement", HTMLCanvasElementProto, HTMLElementFunction, HTMLElementProto)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLCanvasElementPseudoCtor, "HTMLCanvasElement", HTMLCanvasElementProto)
+
+
+@@ -2900,7 +2900,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(HTMLCollectionProto)
+ KJS_IMPLEMENT_PROTOFUNC(HTMLCollectionProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLCollection", HTMLCollectionProto,HTMLCollectionProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("HTMLCollection", HTMLCollectionProto, HTMLCollectionProtoFunc, ObjectPrototype)
+ IMPLEMENT_PSEUDO_CONSTRUCTOR(HTMLCollectionPseudoCtor, "HTMLCollection", HTMLCollectionProto)
+
+ const ClassInfo KJS::HTMLCollection::info = { "HTMLCollection", 0, 0, 0 };
+@@ -3130,9 +3130,9 @@
+ add HTMLSelectCollection::Add DontDelete|Function 2
+ @end
+ */
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLSelectCollectionProto, HTMLCollectionProto)
++KJS_DEFINE_PROTOTYPE(HTMLSelectCollectionProto)
+ KJS_IMPLEMENT_PROTOFUNC(HTMLSelectCollectionProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("HTMLOptionsCollection", HTMLSelectCollectionProto, HTMLSelectCollectionProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("HTMLOptionsCollection", HTMLSelectCollectionProto, HTMLSelectCollectionProtoFunc, HTMLCollectionProto)
+
+ const ClassInfo KJS::HTMLSelectCollection::info = { "HTMLOptionsCollection", &HTMLCollection::info, 0, 0 };
+
+Index: khtml/ecma/kjs_events.cpp
+===================================================================
+--- khtml/ecma/kjs_events.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
++++ khtml/ecma/kjs_events.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+@@ -255,7 +255,7 @@
+ */
+ KJS_DEFINE_PROTOTYPE(DOMEventProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMEventProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMEvent", DOMEventProto, DOMEventProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMEvent", DOMEventProto, DOMEventProtoFunc,ObjectPrototype)
+
+ DOMEvent::DOMEvent(ExecState *exec, DOM::EventImpl* e)
+ : m_impl(e) {
+@@ -476,9 +476,9 @@
+ initUIEvent DOMUIEvent::InitUIEvent DontDelete|Function 5
+ @end
+ */
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(DOMUIEventProto,DOMEventProto)
++KJS_DEFINE_PROTOTYPE(DOMUIEventProto)
+ KJS_IMPLEMENT_PROTOFUNC(DOMUIEventProtoFunc)
+-KJS_IMPLEMENT_PROTOTYPE("DOMUIEvent",DOMUIEventProto,DOMUIEventProtoFunc)
++KJS_IMPLEMENT_PROTOTYPE("DOMUIEvent",DOMUIEventProto,DOMUIEventProtoFunc,DOMEventProto)
+
+ DOMUIEvent::DOMUIEvent(ExecState *exec, DOM::UIEventImpl* ue) :
+ DOMEvent(DOMUIEventProto::self(exec), ue) {}
+@@ -575,9 +575,9 @@
+ initMouseEvent DOMMouseEvent::InitMouseEvent DontDelete|Function 15
+ @end
+ */
+-KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(DOMMouseEventProto,DOMUIEventProto)
++KJS_DEFINE_PROTOTYPE(DOMMouseEventProto)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdelibs-branch.diff?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list