[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 06:47:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 37c889cd09df8a1d6a3ca470f80c58d436366a88
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 8 23:07:51 2002 +0000
Add accessor for DOM document.
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebHTMLRepresentation.h:
* WebView.subproj/WebHTMLRepresentation.m:
(-[WebHTMLRepresentation DOMDocument]):
Added bridge method to get the DOM document.
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge DOMDocument]):
* kwq/WebCoreDOM.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2281 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8bdbc39..9a35dc7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Added bridge method to get the DOM document.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge DOMDocument]):
+ * kwq/WebCoreDOM.h:
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
More DOM implementation.
* khtml/dom/dom_text.h:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8bdbc39..9a35dc7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Added bridge method to get the DOM document.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge DOMDocument]):
+ * kwq/WebCoreDOM.h:
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
More DOM implementation.
* khtml/dom/dom_text.h:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8bdbc39..9a35dc7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Added bridge method to get the DOM document.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge DOMDocument]):
+ * kwq/WebCoreDOM.h:
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
More DOM implementation.
* khtml/dom/dom_text.h:
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index afa867a..2034b3d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -52,6 +52,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
@protocol WebCoreRenderTreeCopier;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
+ at protocol WebDOMDocument;
#define WebCoreElementLinkURL @"WebCoreElementLinkURL"
#define WebCoreElementLinkTarget @"WebCoreElementLinkTarget"
@@ -134,6 +135,8 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (void)executeJavaScriptFromString:(NSString *)string;
+- (id<WebDOMDocument>)DOMDocument;
+
@end
// The WebCoreBridge protocol contains methods for use by the WebCore side of the bridge.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index b59e819..3978fa1 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -43,8 +43,9 @@
#import <WebCoreTextRendererFactory.h>
#import <KWQCharsets.h>
+#import <WebCoreDOMPrivate.h>
+
using DOM::DocumentImpl;
-using DOM::NodeImpl;
using khtml::parseURL;
using khtml::RenderImage;
@@ -540,4 +541,11 @@ using khtml::RenderPart;
}
}
+- (id<WebDOMDocument>)DOMDocument
+{
+ DocumentImpl *doc = part->impl->document();
+ return [WebCoreDOMDocument documentWithImpl:doc];
+}
+
+
@end
diff --git a/WebCore/kwq/WebCoreDOM.h b/WebCore/kwq/WebCoreDOM.h
index a77dcdc..99c5f85 100644
--- a/WebCore/kwq/WebCoreDOM.h
+++ b/WebCore/kwq/WebCoreDOM.h
@@ -4,8 +4,6 @@
*/
#import <Foundation/Foundation.h>
-#ifdef __cplusplus
-
namespace DOM {
class DOMImplementationImpl;
class NodeImpl;
@@ -13,20 +11,6 @@ namespace DOM {
class NamedNodeMapImpl;
}
-typedef DOM::DOMImplementationImpl DOMImplementationImpl;
-typedef DOM::NodeImpl NodeImpl;
-typedef DOM::NodeListImpl NodeListImpl;
-typedef DOM::NamedNodeMapImpl NamedNodeMapImpl;
-
-#else
-
- at class DOMImplementationImpl;
- at class NodeImpl;
- at class NodeListImpl;
- at class NamedNodeMapImpl;
-
-#endif
-
@protocol WebDOMAttr;
@protocol WebDOMCharacterData;
@protocol WebDOMComment;
@@ -45,25 +29,25 @@ typedef DOM::NamedNodeMapImpl NamedNodeMapImpl;
@interface WebCoreDOMNode : NSObject <WebDOMNode>
{
- NodeImpl *impl;
+ DOM::NodeImpl *impl;
}
@end
@interface WebCoreDOMNamedNodeMap : NSObject <WebDOMNamedNodeMap>
{
- NamedNodeMapImpl *impl;
+ DOM::NamedNodeMapImpl *impl;
}
@end
@interface WebCoreDOMNodeList : NSObject <WebDOMNodeList>
{
- NodeListImpl *impl;
+ DOM::NodeListImpl *impl;
}
@end
@interface WebCoreDOMImplementation : NSObject <WebDOMImplementation>
{
- DOMImplementationImpl *impl;
+ DOM::DOMImplementationImpl *impl;
}
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 95fe289..61e61ec 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Add accessor for DOM document.
+
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebHTMLRepresentation.h:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation DOMDocument]):
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
Made getAttributeNodeNamed match spec, changed
to getAttributeNode.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 95fe289..61e61ec 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Add accessor for DOM document.
+
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebHTMLRepresentation.h:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation DOMDocument]):
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
Made getAttributeNodeNamed match spec, changed
to getAttributeNode.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 8f831ab..78eb7f7 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -2183,6 +2183,9 @@
fileRef = F57D194B034E734901A80180;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Public,
+ );
};
};
F57D1954034E734901A80180 = {
@@ -2195,6 +2198,9 @@
fileRef = F57D194D034E734901A80180;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Public,
+ );
};
};
F57D1956034E734901A80180 = {
@@ -2207,6 +2213,9 @@
fileRef = F57D1951034E734901A80180;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Public,
+ );
};
};
F57D195A034E734901A80180 = {
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.h b/WebKit/WebView.subproj/WebHTMLRepresentation.h
index fcb40e0..cec2b0d 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.h
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.h
@@ -7,9 +7,11 @@
#import <Foundation/Foundation.h>
- at protocol WebDocumentRepresentation;
@class WebHTMLRepresentationPrivate;
+ at protocol WebDocumentRepresentation;
+ at protocol WebDOMDocument;
+
/*!
@class WebHTMLRepresentation
*/
@@ -25,6 +27,12 @@
- (NSString *)documentSource;
/*!
+ @method DOMDocument
+ @abstract return the DOM document for this data source.
+*/
+- (id<WebDOMDocument>)DOMDocument;
+
+/*!
@method documentSource
@abstract Get the current HTML reconstructed from the current state of the DOM.
*/
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 9af70f4..fd3e084 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -74,6 +74,11 @@
}
+- (id<WebDOMDocument>)DOMDocument
+{
+ return [_private->bridge DOMDocument];
+}
+
- (NSString *)reconstructedDocumentSource
{
// FIXME implement
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list