[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_window.cpp
kjs_window.h
David
harrison at opensource.apple.com
Fri Aug 19 15:29:54 PDT 2005
harrison 05/08/19 15:29:54
Modified: . ChangeLog
khtml/ecma kjs_window.cpp kjs_window.h
Log:
Reviewed by Darin.
Landed by David Harrison
- Fixes <http://bugzilla.opendarwin.org/show_bug.cgi?id=4523>
REGRESSION assertion failure in Window::getValueProperty accessing window.konqueror
Test cases added: N/A for this code removal
Remove all traces of the konqueror property
* khtml/ecma/kjs_window.cpp:
(KJS::Window::getValueProperty):
* khtml/ecma/kjs_window.h:
(KJS::Window::):
Revision Changes Path
1.4605 +17 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4604
retrieving revision 1.4605
diff -u -r1.4604 -r1.4605
--- ChangeLog 19 Aug 2005 22:07:38 -0000 1.4604
+++ ChangeLog 19 Aug 2005 22:29:49 -0000 1.4605
@@ -1,3 +1,20 @@
+2005-08-19 Mitz Pettel <opendarwin.org at mitzpettel.com>
+
+ Reviewed by Darin.
+ Landed by David Harrison
+
+ - Fixes <http://bugzilla.opendarwin.org/show_bug.cgi?id=4523>
+ REGRESSION assertion failure in Window::getValueProperty accessing window.konqueror
+
+ Test cases added: N/A for this code removal
+
+ Remove all traces of the konqueror property
+
+ * khtml/ecma/kjs_window.cpp:
+ (KJS::Window::getValueProperty):
+ * khtml/ecma/kjs_window.h:
+ (KJS::Window::):
+
2005-08-19 Antti Koivisto <koivisto at iki.fi>
Reviewed by Darin
1.173 +0 -83 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kjs_window.cpp 16 Aug 2005 04:42:44 -0000 1.172
+++ kjs_window.cpp 19 Aug 2005 22:29:53 -0000 1.173
@@ -132,19 +132,6 @@
QGuardedPtr<KHTMLPart> part;
};
-#ifdef Q_WS_QWS
- class KonquerorFunc : public DOMFunction {
- public:
- KonquerorFunc(const Konqueror* k, const char* name)
- : DOMFunction(), konqueror(k), m_name(name) { }
- virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
-
- private:
- const Konqueror* konqueror;
- QCString m_name;
- };
-#endif
-
}
#include "kjs_window.lut.h"
@@ -245,7 +232,6 @@
name Window::Name DontDelete
navigator Window::_Navigator DontDelete|ReadOnly
clientInformation Window::ClientInformation DontDelete|ReadOnly
- konqueror Window::_Konqueror DontDelete|ReadOnly
menubar Window::Menubar DontDelete|ReadOnly
offscreenBuffering Window::OffscreenBuffering DontDelete|ReadOnly
opener Window::Opener DontDelete|ReadOnly
@@ -757,10 +743,6 @@
const_cast<Window *>(this)->putDirect("clientInformation", n, DontDelete|ReadOnly);
return n;
}
-#ifdef Q_WS_QWS
- case _Konqueror:
- return new Konqueror(m_part);
-#endif
case Locationbar:
return locationbar(exec);
case Menubar:
@@ -2815,71 +2797,6 @@
/////////////////////////////////////////////////////////////////////////////
-#ifdef Q_WS_QWS
-
-const ClassInfo Konqueror::info = { "Konqueror", 0, 0, 0 };
-
-bool Konqueror::hasOwnProperty(ExecState *exec, const Identifier &p) const
-{
- if ( p.qstring().startsWith( "goHistory" ) ) return false;
-
- return true;
-}
-
-ValueImp *Konqueror::get(ExecState *exec, const Identifier &p) const
-{
- if ( p == "goHistory" || part->url().protocol() != "http" || part->url().host() != "localhost" )
- return Undefined();
-
- KParts::BrowserExtension *ext = part->browserExtension();
- if ( ext ) {
- KParts::BrowserInterface *iface = ext->browserInterface();
- if ( iface ) {
- QVariant prop = iface->property( p.qstring().latin1() );
-
- if ( prop.isValid() ) {
- switch( prop.type() ) {
- case QVariant::Int:
- return Number( prop.toInt() );
- case QVariant::String:
- return String( prop->toString() );
- default:
- break;
- }
- }
- }
- }
-
- return /*Function*/( new KonquerorFunc(this, p.qstring().latin1() ) );
-}
-
-ValueImp *KonquerorFunc::callAsFunction(ExecState *exec, ObjectImp *, const List &args)
-{
- KParts::BrowserExtension *ext = konqueror->part->browserExtension();
-
- if(!ext)
- return Undefined();
-
- KParts::BrowserInterface *iface = ext->browserInterface();
-
- if ( !iface )
- return Undefined();
-
- QCString n = m_name.data();
- n += "()";
- iface->callMethod( n.data(), QVariant() );
-
- return Undefined();
-}
-
-UString Konqueror::toString(ExecState *) const
-{
- return UString("[object Konqueror]");
-}
-
-#endif
-/////////////////////////////////////////////////////////////////////////////
-
} // namespace KJS
#include "kjs_window.moc"
1.51 +1 -15 WebCore/khtml/ecma/kjs_window.h
Index: kjs_window.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kjs_window.h 8 Aug 2005 04:07:42 -0000 1.50
+++ kjs_window.h 19 Aug 2005 22:29:54 -0000 1.51
@@ -139,7 +139,7 @@
static const ClassInfo info;
enum { Closed, Crypto, DefaultStatus, Status, Document, Node, EventCtor, Range,
NodeFilter, DOMException, CSSRule, Frames, _History, Event, InnerHeight,
- InnerWidth, Length, _Location, Locationbar, Name, _Navigator, _Konqueror, ClientInformation,
+ InnerWidth, Length, _Location, Locationbar, Name, _Navigator, ClientInformation,
Menubar, OffscreenBuffering, Opener, OuterHeight, OuterWidth, PageXOffset, PageYOffset,
Parent, Personalbar, ScreenX, ScreenY, Scrollbars, Scroll, ScrollBy,
ScreenTop, ScreenLeft,
@@ -276,20 +276,6 @@
Type m_type;
};
-#ifdef Q_WS_QWS
- class Konqueror : public ObjectImp {
- friend class KonquerorFunc;
- public:
- Konqueror(KHTMLPart *p) : part(p) { }
- virtual bool getOwnPropertySlot(ExecState *exec, const Identifier&, PropertySlot& slot) const;
- virtual UString toString(ExecState *exec) const;
- virtual const ClassInfo* classInfo() const { return &info; }
- static const ClassInfo info;
- private:
- KHTMLPart *part;
- };
-#endif
-
} // namespace
#endif
More information about the webkit-changes
mailing list