[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:40:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 44159fdc580dbb2c388650fb6727e8e0e898d87e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 19 01:16:40 2004 +0000
WebKit:
Finished implementation of windowScriptObject.
Reviewed by Maciej.
* WebView.subproj/WebView.m:
(-[WebView windowScriptObject]):
WebCore:
Finished implementing support for windowScriptObject.
Reviewed by Maciej.
* khtml/khtml_part.cpp:
(KHTMLPart::begin):
* kwq/KWQKHTMLPart.h:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::KWQKHTMLPart):
(KWQKHTMLPart::~KWQKHTMLPart):
(KWQKHTMLPart::windowScriptObject):
* kwq/WebCoreBridge.mm:
(updateRenderingForBindings):
JavaScriptCore:
Finsished implementing support for windowScriptObject.
Had to make WebScriptObjectPrivate.h accessible from
WebCore.
Reviewed by Maciej.
* JavaScriptCore.pbproj/project.pbxproj:
* bindings/objc/WebScriptObjectPrivate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 10ff84b..79ec588 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,16 @@
2004-05-18 Richard Williamson <rjw at apple.com>
+ Finsished implementing support for windowScriptObject.
+ Had to make WebScriptObjectPrivate.h accessible from
+ WebCore.
+
+ Reviewed by Maciej.
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+ * bindings/objc/WebScriptObjectPrivate.h:
+
+2004-05-18 Richard Williamson <rjw at apple.com>
+
Use KVC to set/get values instead of directly accessing
ivars.
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 5189873..59035c8 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -1448,6 +1448,9 @@
fileRef = 700DA117065984CE00747C0B;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Private,
+ );
};
};
704FD35305697E6D003DBED9 = {
diff --git a/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h b/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h
index bf062ac..480aecc 100644
--- a/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h
+++ b/JavaScriptCore/bindings/objc/WebScriptObjectPrivate.h
@@ -4,7 +4,7 @@
#ifndef _WEB_SCRIPT_OBJECT_PRIVATE_H_
#define _WEB_SCRIPT_OBJECT_PRIVATE_H_
-#import <WebScriptObject.h>
+#import <JavaScriptCore/WebScriptObject.h>
#include <JavaScriptCore/internal.h>
#include <JavaScriptCore/list.h>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3c1df70..f2f0e45 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,21 @@
2004-05-18 Richard Williamson <rjw at apple.com>
+ Finished implementing support for windowScriptObject.
+
+ Reviewed by Maciej.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::begin):
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::KWQKHTMLPart):
+ (KWQKHTMLPart::~KWQKHTMLPart):
+ (KWQKHTMLPart::windowScriptObject):
+ * kwq/WebCoreBridge.mm:
+ (updateRenderingForBindings):
+
+2004-05-18 Richard Williamson <rjw at apple.com>
+
Added stubs to get the WebScriptObject for the window
JS object.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 5098d83..2abddd6 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1420,7 +1420,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
clear();
-#if APPLE_CHANGE
+#if APPLE_CHANGES
KWQ(this)->partClearedInBegin();
#endif
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 10db20b..51ee916 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -342,6 +342,7 @@ private:
friend class KHTMLPart;
QPtrList<KJS::Bindings::RootObject> rootObjects;
+ WebScriptObject *_windowScriptObject;
};
inline KWQKHTMLPart *KWQ(KHTMLPart *part) { return static_cast<KWQKHTMLPart *>(part); }
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 8a6b1bd..defd9ca 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -62,7 +62,7 @@
#import <JavaScriptCore/property_map.h>
#import <JavaScriptCore/runtime.h>
#import <JavaScriptCore/runtime_root.h>
-#import <JavaScriptCore/WebScriptObject.h>
+#import <JavaScriptCore/WebScriptObjectPrivate.h>
#undef _KWQ_TIMING
@@ -176,6 +176,7 @@ KWQKHTMLPart::KWQKHTMLPart()
, _windowWidget(NULL)
, _usesInactiveTextBackgroundColor(false)
, _showsFirstResponder(true)
+ , _windowScriptObject(0)
{
// Must init the cache before connecting to any signals
Cache::init();
@@ -200,6 +201,9 @@ KWQKHTMLPart::~KWQKHTMLPart()
// exceptions.
[_formValuesAboutToBeSubmitted release];
[_formAboutToBeSubmitted release];
+
+ [_windowScriptObject release];
+
delete _windowWidget;
}
@@ -1133,8 +1137,16 @@ bool KWQKHTMLPart::tabsToAllControls() const
WebScriptObject *KWQKHTMLPart::windowScriptObject()
{
- // FIXME: Create a WindowScriptObject wrapper.
- return 0;
+ if (!_windowScriptObject) {
+ KJS::Bindings::RootObject *root = new KJS::Bindings::RootObject(0); // The root gets deleted by JavaScriptCore.
+ KJS::ObjectImp *win = static_cast<KJS::ObjectImp *>(KJS::Window::retrieveWindow(this));
+ root->setRootObjectImp (win);
+ root->setInterpreter (KJSProxy::proxy(this)->interpreter());
+ addPluginRootObject (root);
+ _windowScriptObject = [[WebScriptObject alloc] _initWithObjectImp:win root:root];
+ }
+
+ return _windowScriptObject;
}
void KWQKHTMLPart::bindObject(void *object, QString name)
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index f9f84a0..b2b4f6b 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -164,7 +164,8 @@ static void updateRenderingForBindings (KJS::ExecState *exec, KJS::ObjectImp *ro
return;
DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(window->part()->document().handle());
- doc->updateRendering();
+ if (doc)
+ doc->updateRendering();
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index da03e3d..c796d8f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
2004-05-18 Richard Williamson <rjw at apple.com>
+ Finished implementation of windowScriptObject.
+
+ Reviewed by Maciej.
+
+ * WebView.subproj/WebView.m:
+ (-[WebView windowScriptObject]):
+
+2004-05-18 Richard Williamson <rjw at apple.com>
+
Added WebKit portion of webView:windowScriptObjectAvailable:
implementation. Still need to implement creating the WebScriptObject
wrapper on the WebCore side.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 60e42be..c14f79f 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -1620,8 +1620,7 @@ NS_ENDHANDLER
- (WebScriptObject *)windowScriptObject
{
- NSLog (@"%s:%d: not yet implemented", __PRETTY_FUNCTION__, __LINE__);
- return nil;
+ return [[[self mainFrame] _bridge] windowScriptObject];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list