SOURCES: kde4-kdelibs-branch.diff - updated
shadzik
shadzik at pld-linux.org
Fri Feb 20 23:20:20 CET 2009
Author: shadzik Date: Fri Feb 20 22:20:20 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kde4-kdelibs-branch.diff (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/kde4-kdelibs-branch.diff
diff -u SOURCES/kde4-kdelibs-branch.diff:1.3 SOURCES/kde4-kdelibs-branch.diff:1.4
--- SOURCES/kde4-kdelibs-branch.diff:1.3 Mon Feb 9 21:20:16 2009
+++ SOURCES/kde4-kdelibs-branch.diff Fri Feb 20 23:20:15 2009
@@ -1,7 +1,31 @@
+Index: khtml/khtmladaptorpart.desktop
+===================================================================
+--- khtml/khtmladaptorpart.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/khtmladaptorpart.desktop (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -22,6 +22,7 @@
+ Name[gl]=Adaptador de extensión de KHTML
+ Name[gu]=KHTML એક્સટેન્સન સ્વિકારનાર
+ Name[he]=מתאם הרחבה של KHTML
++Name[hne]=केएचटीएमएल विस्तार एडाप्टर
+ Name[hu]=KHTML kiterjesztésadapter
+ Name[is]=Aðlögun KHTML-endinga
+ Name[it]=Adattatore estensione KHTML
+Index: khtml/kmultipart/kmultipart.desktop
+===================================================================
+--- khtml/kmultipart/kmultipart.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/kmultipart/kmultipart.desktop (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -29,6 +29,7 @@
+ Name[gu]=multipart/mixed માટે જડિત ભાગ
+ Name[he]=רכיב בר־שיבוץ עבור multipart/mixed
+ Name[hi]=मल्टीपार्ट/मिक्स्ड के लिए अंतर्निर्मित अवयव
++Name[hne]=मल्टीपार्ट/मिक्स्ड बर भीतर मं बने अवयव
+ Name[hr]=Ugradiva komponenta za multipart/mixed
+ Name[hsb]=Integrujomna komponenta za multipart/mixed
+ Name[hu]=Beágyazható komponens a multipart/mixed adattípushoz
Index: khtml/misc/borderarcstroker.cpp
===================================================================
---- khtml/misc/borderarcstroker.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/misc/borderarcstroker.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/misc/borderarcstroker.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/misc/borderarcstroker.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -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));
@@ -13,8 +37,8 @@
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)
+--- khtml/misc/loader.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/misc/loader.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -85,6 +85,8 @@
#include "blocked_icon.cpp"
@@ -50,8 +74,8 @@
paint.end();
Index: khtml/khtml_part.cpp
===================================================================
---- khtml/khtml_part.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/khtml_part.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/khtml_part.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/khtml_part.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -291,16 +291,26 @@
if ( prof == BrowserViewGUI ) {
d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), this );
@@ -90,10 +114,50 @@
d->m_paSelectAll->setShortcuts( KShortcut() ); // avoid clashes
d->m_paToggleCaretMode = new KToggleAction(i18n("Toggle Caret Mode"), this );
+Index: khtml/khtml.desktop
+===================================================================
+--- khtml/khtml.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/khtml.desktop (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -30,6 +30,7 @@
+ Comment[gu]=જડિત HTML દર્શક ભાગ
+ Comment[he]=רכיב בר־שיבוץ לתצוגת HTML
+ Comment[hi]=अंतर्निर्मित एचटीएमएल प्रदर्शक अवयव
++Comment[hne]=भीतर मं बने एचटीएमएल प्रदर्सक अवयव
+ Comment[hr]=Ugrađeni komponenta za pregledavanje HTML
+ Comment[hsb]=Integrowana HTML-komponenta
+ Comment[hu]=Beágyazható HTML-néző komponens
+@@ -87,6 +88,7 @@
+ Icon=konqueror
+ Name=KHTML
+ Name[hi]=के-एचटीएमएल
++Name[hne]=के-एचटीएमएल
+ Name[kn]=ಕೆಹೆಚ್ ಟಿ ಎಮ್ ಎಲ್
+ Name[mai]=के-एचटीएमएल
+ Name[ml]=കെഎച്ച്ടിഎംഎല്
+Index: khtml/khtmlimage.desktop
+===================================================================
+--- khtml/khtmlimage.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/khtmlimage.desktop (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -30,6 +30,7 @@
+ Comment[gu]=જડિત ચિત્ર દર્શક ભાગ
+ Comment[he]=רכיב בר־שיבוץ לתצוגת תמונות
+ Comment[hi]=अंतर्निर्मित छवि प्रदर्शक अवयव
++Comment[hne]=भीतर मं बने फोटू प्रदर्सक अवयव
+ Comment[hr]=Ugradiva komponenta za pregledavanje slika
+ Comment[hsb]=Integrujomna komponenta za wobrazy
+ Comment[hu]=Beágyazható képnéző komponens
+@@ -114,6 +115,7 @@
+ Name[gu]=જડિત ચિત્ર દર્શક
+ Name[he]=מציג תמונות הניתן לשיבוץ
+ Name[hi]=अंतर्निर्मित छवि प्रदर्शक
++Name[hne]=भीतर मं बने फोटू प्रदर्सक
+ Name[hr]=Ugradivi preglednik slika
+ Name[hsb]=Integrowany wobhladowar za wobrazy
+ Name[hu]=Beágyazható képnézegető
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)
+--- khtml/html/html_headimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/html/html_headimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -604,6 +604,12 @@
void HTMLStyleElementImpl::insertedIntoDocument()
{
@@ -121,8 +185,8 @@
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)
+--- khtml/html/html_objectimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/html/html_objectimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -789,9 +789,7 @@
DocumentImpl* HTMLObjectElementImpl::contentDocument() const
@@ -134,10 +198,54 @@
if( widget && qobject_cast<KHTMLView*>( widget ) )
return static_cast<KHTMLView*>( widget )->part()->xmlDocImpl();
return 0;
+Index: khtml/html/html_baseimpl.cpp
+===================================================================
+--- khtml/html/html_baseimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/html/html_baseimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -542,22 +542,10 @@
+ noresize = false;
+
+ m_resizing = false;
+-
+- m_onLoad = m_onUnLoad = 0;
+ }
+
+ HTMLFrameSetElementImpl::~HTMLFrameSetElementImpl()
+ {
+- //### this is likely not quite right since we may be effectively "overriding" some old value,
+- //which needs to be recomputed, but this is better than crashing...
+- if (document()) {
+- if (m_onLoad && document()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
+- document()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
+-
+- if (m_onUnLoad && document()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
+- document()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+- }
+-
+ delete [] m_rows;
+ delete [] m_cols;
+ }
+@@ -600,12 +588,12 @@
+ frameborder = false;
+ break;
+ case ATTR_ONLOAD:
+- m_onLoad = document()->createHTMLEventListener(attr->value().string(), "onload", this);
+- document()->setHTMLEventListener(EventImpl::LOAD_EVENT, m_onLoad);
++ document()->setHTMLWindowEventListener(EventImpl::LOAD_EVENT,
++ document()->createHTMLEventListener(attr->value().string(), "onload", NULL));
+ break;
+ case ATTR_ONUNLOAD:
+- m_onUnLoad = document()->createHTMLEventListener(attr->value().string(), "onunload", this);
+- document()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, m_onUnLoad);
++ document()->setHTMLWindowEventListener(EventImpl::UNLOAD_EVENT,
++ document()->createHTMLEventListener(attr->value().string(), "onunload", NULL));
+ break;
+ default:
+ HTMLElementImpl::parseAttribute(attr);
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)
+--- khtml/html/html_headimpl.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/html/html_headimpl.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -205,6 +205,8 @@
virtual bool checkRemovePendingSheet();
@@ -147,10 +255,24 @@
CSSStyleSheetImpl *m_sheet;
DOMString m_type;
QString m_media;
+Index: khtml/html/html_baseimpl.h
+===================================================================
+--- khtml/html/html_baseimpl.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/html/html_baseimpl.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -163,9 +163,6 @@
+ bool frameBorderSet : 1;
+ bool noresize : 1;
+ bool m_resizing : 1; // is the user resizing currently
+-
+- EventListener* m_onLoad;
+- EventListener* m_onUnLoad;
+ };
+
+ // -------------------------------------------------------------------------
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)
+--- khtml/ecma/debugger/debugwindow.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/debugger/debugwindow.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -350,6 +350,12 @@
}
}
@@ -164,10 +286,73 @@
void DebugWindow::stopAtNext()
{
m_breakAtNext = m_stopAct->isChecked();
+@@ -628,12 +634,14 @@
+
+ bool DebugWindow::exception(ExecState *exec, int sourceId, int lineNo, JSValue *exceptionObj)
+ {
++ InterpreterContext* ic = m_contexts[exec->dynamicInterpreter()];
++
+ // Don't report it if error reporting is not on
+ KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->dynamicInterpreter())->part();
+ KHTMLPart *khtmlpart = qobject_cast<KHTMLPart*>(part);
+
+ if (khtmlpart && !khtmlpart->settings()->isJavaScriptErrorReportingEnabled() || !m_catchExceptions)
+- return shouldContinue(m_contexts[exec->dynamicInterpreter()]);
++ return shouldContinue(ic);
+
+ QString exceptionMsg = exceptionToString(exec, exceptionObj);
+
+@@ -662,11 +670,16 @@
+ m_catchExceptionsAction->setChecked(false);
+ }
+
+- if (dlg.debugSelected())
+- // We want to stop at the current line, to see what's going on.
+- enterDebugSession(exec, doc.get(), lineNo);
++ if (dlg.debugSelected()) {
++ // We generally want to stop at the current line, to see what's going on... There is one exception, though:
++ // in case we've got a parse error, we can't actually stop, but we want to still display stuff.
++ if (ic->hasActiveDocument())
++ enterDebugSession(exec, doc.get(), lineNo);
++ else
++ displayScript(doc.get(), lineNo);
++ }
+
+- return shouldContinue(m_contexts[exec->dynamicInterpreter()]);
++ return shouldContinue(ic);
+ }
+
+
+@@ -900,6 +913,9 @@
+
+ void DebugWindow::displayScript(DebugDocument* document, int line)
+ {
++ if (!isVisible())
++ show();
++
+ if (m_tabWidget->isHidden())
+ m_tabWidget->show();
+
+Index: khtml/ecma/debugger/interpreter_ctx.cpp
+===================================================================
+--- khtml/ecma/debugger/interpreter_ctx.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/debugger/interpreter_ctx.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -54,6 +54,11 @@
+ return callStack.top().doc;
+ }
+
++bool InterpreterContext::hasActiveDocument() const
++{
++ return !callStack.isEmpty();
+ }
+
++}
++
+ // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
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)
+--- khtml/ecma/debugger/debugwindow.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/debugger/debugwindow.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -113,6 +113,9 @@
// Called by KJSProxy when we navigate away from a page
void clearInterpreter(KJS::Interpreter* interp);
@@ -178,10 +363,23 @@
public Q_SLOTS:
void stopAtNext();
void continueExecution();
+Index: khtml/ecma/debugger/interpreter_ctx.h
+===================================================================
+--- khtml/ecma/debugger/interpreter_ctx.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/debugger/interpreter_ctx.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -72,6 +72,8 @@
+ DebugDocument::Ptr activeDocument();
+ int activeLine();
+
++ bool hasActiveDocument() const;
++
+ InterpreterContext() : mode(Normal), depthAtSkip(0)
+ {}
+
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)
+--- khtml/ecma/kjs_range.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_range.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -61,7 +61,7 @@
*/
KJS_DEFINE_PROTOTYPE(DOMRangeProto)
@@ -193,8 +391,8 @@
: 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)
+--- khtml/ecma/kjs_audio.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_audio.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -64,7 +64,7 @@
KJS_DEFINE_PROTOTYPE(AudioProto)
@@ -206,8 +404,8 @@
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)
+--- khtml/ecma/kjs_binding.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_binding.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -35,6 +35,7 @@
#include <kjs/lookup.h>
#include <kjs/function.h>
@@ -227,8 +425,8 @@
}\
Index: khtml/ecma/kjs_dom.cpp
===================================================================
---- 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)
+--- khtml/ecma/kjs_dom.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_dom.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -101,7 +101,16 @@
@end
*/
@@ -339,8 +537,8 @@
: 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)
+--- khtml/ecma/xmlserializer.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/xmlserializer.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -39,7 +39,7 @@
namespace KJS {
KJS_DEFINE_PROTOTYPE(XMLSerializerProto)
@@ -352,8 +550,8 @@
: 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)
+--- khtml/ecma/kjs_css.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_css.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -135,7 +135,7 @@
*/
KJS_DEFINE_PROTOTYPE(DOMCSSStyleDeclarationProto)
@@ -392,8 +590,8 @@
: 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)
+--- khtml/ecma/kjs_views.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_views.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -40,7 +40,7 @@
KJS_DEFINE_PROTOTYPE(DOMAbstractViewProto)
@@ -405,8 +603,8 @@
: 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)
+--- khtml/ecma/xmlhttprequest.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/xmlhttprequest.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -68,7 +68,7 @@
KJS_DEFINE_PROTOTYPE(XMLHttpRequestProto)
@@ -418,8 +616,8 @@
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)
+--- khtml/ecma/kjs_traversal.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_traversal.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -61,7 +61,7 @@
*/
KJS_DEFINE_PROTOTYPE(DOMNodeIteratorProto)
@@ -438,10 +636,18 @@
DOMTreeWalker::DOMTreeWalker(ExecState *exec, DOM::TreeWalkerImpl* tw)
: m_impl(tw) {
+@@ -208,6 +208,7 @@
+
+ void DOMTreeWalker::mark()
+ {
++ JSObject::mark();
+ JSNodeFilter* filt = JSNodeFilter::fromDOMFilter(impl()->getFilter());
+ if (filt)
+ filt->mark();
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)
+--- khtml/ecma/kjs_html.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_html.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -73,9 +73,9 @@
namespace KJS {
@@ -599,8 +805,8 @@
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)
+--- khtml/ecma/kjs_events.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_events.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -255,7 +255,7 @@
*/
KJS_DEFINE_PROTOTYPE(DOMEventProto)
@@ -670,10 +876,36 @@
DOMMutationEvent::DOMMutationEvent(ExecState *exec, DOM::MutationEventImpl* me) :
DOMEvent(DOMMutationEventProto::self(exec), me) {}
+Index: khtml/ecma/kjs_window.cpp
+===================================================================
+--- khtml/ecma/kjs_window.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_window.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -266,7 +266,7 @@
+ # IE extension
+ navigate Window::Navigate DontDelete|Function 1
+ # Mozilla extension
+- sidebar Window::SideBar DontDelete|ReadOnly
++ sidebar Window::SideBar DontDelete|DontEnum
+ getComputedStyle Window::GetComputedStyle DontDelete|Function 2
+
+ # Warning, when adding a function to this object you need to add a case in Window::get
+@@ -725,12 +725,6 @@
+ case Status:
+ return jsString(UString(part->jsStatusBarText()));
+ case Document:
+- if (!part->xmlDocImpl()) {
+- kDebug(6070) << "Document.write: adding <HTML><BODY> to create document";
+- part->begin();
+- part->write("<HTML><BODY>");
+- part->end();
+- }
+ return getDOMNode(exec, part->xmlDocImpl());
+ case FrameElement:
+ if (m_frame->m_partContainerElement)
Index: khtml/ecma/kjs_context2d.cpp
===================================================================
---- khtml/ecma/kjs_context2d.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/ecma/kjs_context2d.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/ecma/kjs_context2d.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_context2d.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -74,7 +74,7 @@
KJS_DEFINE_PROTOTYPE(Context2DProto)
@@ -703,8 +935,8 @@
@begin CanvasPatternProtoTable 0
Index: khtml/ecma/kjs_dom.h
===================================================================
---- khtml/ecma/kjs_dom.h (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/ecma/kjs_dom.h (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/ecma/kjs_dom.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/kjs_dom.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -65,7 +65,7 @@
OnResize, OnScroll, OnSelect, OnSubmit, OnUnload,
OffsetLeft, OffsetTop, OffsetWidth, OffsetHeight, OffsetParent,
@@ -743,8 +975,8 @@
class DOMDOMImplementation : public DOMObject {
Index: khtml/ecma/domparser.cpp
===================================================================
---- khtml/ecma/domparser.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/ecma/domparser.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/ecma/domparser.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/ecma/domparser.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -44,7 +44,7 @@
KJS_DEFINE_PROTOTYPE(DOMParserProto)
@@ -754,10 +986,22 @@
DOMParserConstructorImp::DOMParserConstructorImp(ExecState* exec, DOM::DocumentImpl *d)
+Index: khtml/java/kjavaappletviewer.desktop
+===================================================================
+--- khtml/java/kjavaappletviewer.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/java/kjavaappletviewer.desktop (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -29,6 +29,7 @@
+ Name[gu]=જડિત જાવા એપ્લેટ દર્શક
+ Name[he]=מציג יישומוני Java משובץ
+ Name[hi]=अंतर्निर्मित जावा ऐप्लेट प्रदर्शक
++Name[hne]=भीतर मं बने जावा ऐप्लेट प्रदर्सक
+ Name[hr]=Ugrađeni preglednik Java appleta
+ Name[hsb]=Integrowany wuwjedowar za Java Applets
+ Name[hu]=Beágyazott megjelenítőprogram Java kisalkalmazásokhoz
Index: khtml/css/css_stylesheetimpl.h
===================================================================
---- khtml/css/css_stylesheetimpl.h (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/css/css_stylesheetimpl.h (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/css/css_stylesheetimpl.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/css/css_stylesheetimpl.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -27,6 +27,7 @@
#include "css/css_base.h"
#include "misc/loader_client.h"
@@ -791,8 +1035,8 @@
// ----------------------------------------------------------------------------
Index: khtml/css/css_stylesheetimpl.cpp
===================================================================
---- khtml/css/css_stylesheetimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/css/css_stylesheetimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/css/css_stylesheetimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/css/css_stylesheetimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -349,6 +349,12 @@
void StyleSheetListImpl::add( StyleSheetImpl* s )
@@ -837,8 +1081,8 @@
if (!sh->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl*>(sh)->implicit()) {
Index: khtml/xml/dom_docimpl.h
===================================================================
---- khtml/xml/dom_docimpl.h (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/xml/dom_docimpl.h (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/xml/dom_docimpl.h (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/xml/dom_docimpl.h (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -282,10 +282,16 @@
* in existing sheets, then set this argument to true for efficiency.
*/
@@ -858,10 +1102,52 @@
// Tries to restore the elements value from the doc state,
// if it seems like the same thing
+Index: khtml/xml/dom2_rangeimpl.cpp
+===================================================================
+--- khtml/xml/dom2_rangeimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/xml/dom2_rangeimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
+@@ -1181,16 +1181,21 @@
+ DocumentFragment RangeImpl::createContextualFragment ( const DOMString &html, int &exceptioncode )
+ {
+ if (m_detached) {
+- exceptioncode = DOMException::INVALID_STATE_ERR;
+- return DocumentFragment();
++ exceptioncode = DOMException::INVALID_STATE_ERR;
++ return DocumentFragment();
+ }
+
+- if (! m_startContainer->isHTMLElement()) {
++ DOM::NodeImpl* start = m_startContainer;
++
++ if (start->isDocumentNode())
++ start = static_cast<DocumentImpl*>(start)->documentElement();
++
++ if (!start || !start->isHTMLElement()) {
+ exceptioncode = DOMException::NOT_SUPPORTED_ERR;
+ return DocumentFragment();
+ }
+
+- HTMLElementImpl *e = static_cast<HTMLElementImpl *>(m_startContainer);
++ HTMLElementImpl *e = static_cast<HTMLElementImpl *>(start);
+ DocumentFragment fragment = e->createContextualFragment(html);
+ if (fragment.isNull()) {
+ exceptioncode = DOMException::NOT_SUPPORTED_ERR;
+@@ -1685,10 +1690,4 @@
+ return false;
+ }
+
+-
+-
+-
+-
+-
+-
+-
++// kate: indent-width 4; replace-tabs off; tab-width 8; space-indent off;
Index: khtml/xml/dom_docimpl.cpp
===================================================================
---- khtml/xml/dom_docimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 923963)
-+++ khtml/xml/dom_docimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 923963)
+--- khtml/xml/dom_docimpl.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 929211)
++++ khtml/xml/dom_docimpl.cpp (.../branches/KDE/4.2/kdelibs) (wersja 929211)
@@ -422,12 +422,13 @@
m_defaultView = new AbstractViewImpl(this);
m_defaultView->ref();
@@ -902,7 +1188,7 @@
recalcStyle(Force);
#if 0
<<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.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list