[webkit-changes] cvs commit: WebKit/WebView.subproj
WebDefaultScriptDebugDelegate.h
WebDefaultScriptDebugDelegate.m WebScriptDebugDelegate.h
WebScriptDebugDelegate.m WebScriptDebugDelegatePrivate.h
WebFrame.m WebFramePrivate.h WebView.h WebView.m
WebViewInternal.h WebViewPrivate.h
Geoffrey
ggaren at opensource.apple.com
Tue Aug 2 15:50:30 PDT 2005
ggaren 05/08/02 15:50:30
Modified: . Tag: Safari-2-0-branch ChangeLog
WebCore-combined.exp WebCore.exp
WebCore.xcodeproj Tag: Safari-2-0-branch project.pbxproj
. Tag: Safari-2-0-branch ChangeLog
WebCoreSupport.subproj Tag: Safari-2-0-branch WebBridge.m
WebSubresourceLoader.m
WebKit.xcodeproj Tag: Safari-2-0-branch project.pbxproj
WebView.subproj Tag: Safari-2-0-branch WebFrame.m
WebFramePrivate.h WebView.h WebView.m
WebViewInternal.h WebViewPrivate.h
Added: kwq Tag: Safari-2-0-branch WebCoreScriptDebugger.h
WebCoreScriptDebugger.mm
WebView.subproj Tag: Safari-2-0-branch
WebDefaultScriptDebugDelegate.h
WebDefaultScriptDebugDelegate.m
WebScriptDebugDelegate.h WebScriptDebugDelegate.m
WebScriptDebugDelegatePrivate.h
Log:
WebCore:
Merged fix from TOT to Safari-2-0-branch
mjs 05/07/29 20:00:34
Changes by Michael Kahl, reviewed by me.
Test cases added: No tests, this code only affects debugging.
- fixed <rdar://problem/4164112> MASTER: JavaScript debugging support
* WebCore-combined.exp:
* WebCore.exp:
* WebCore.xcodeproj/project.pbxproj:
* kwq/WebCoreScriptDebugger.h: Added.
* kwq/WebCoreScriptDebugger.mm: Added.
(toNSString):
(WebCoreScriptDebuggerImp::WebCoreScriptDebuggerImp):
(WebCoreScriptDebuggerImp::sourceParsed):
(WebCoreScriptDebuggerImp::callEvent):
(WebCoreScriptDebuggerImp::atStatement):
(WebCoreScriptDebuggerImp::returnEvent):
(-[WebCoreScriptDebugger initWithDelegate:]):
(-[WebCoreScriptDebugger dealloc]):
(-[WebCoreScriptDebugger delegate]):
(-[WebCoreScriptCallFrame _initWithGlobalObject:caller:state:]):
(-[WebCoreScriptCallFrame _setWrapper:]):
(-[WebCoreScriptCallFrame _convertValueToObjcValue:]):
(-[WebCoreScriptCallFrame dealloc]):
(-[WebCoreScriptCallFrame wrapper]):
(-[WebCoreScriptCallFrame caller]):
(-[WebCoreScriptCallFrame scopeChain]):
(-[WebCoreScriptCallFrame functionName]):
(-[WebCoreScriptCallFrame exception]):
(-[WebCoreScriptCallFrame evaluateWebScript:]):
WebKit:
Merged fix from TOT to Safari-2-0-branch
mjs 05/07/29 20:00:34
Changes by Michael Kahl, reviewed by me.
Test cases added: No tests, this code only affects debugging.
- fixed <rdar://problem/4164112> MASTER: JavaScript debugging support
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge windowObjectCleared]):
* WebCoreSupport.subproj/WebSubresourceLoader.m:
* WebKit.xcodeproj/project.pbxproj:
* WebView.subproj/WebDefaultScriptDebugDelegate.h: Added.
* WebView.subproj/WebDefaultScriptDebugDelegate.m: Added.
(+[WebDefaultScriptDebugDelegate sharedScriptDebugDelegate]):
(-[WebDefaultScriptDebugDelegate webView:didParseSource:fromURL:sourceId:forWebFrame:]):
(-[WebDefaultScriptDebugDelegate webView:didEnterCallFrame:sourceId:line:forWebFrame:]):
(-[WebDefaultScriptDebugDelegate webView:willExecuteStatement:sourceId:line:forWebFrame:]):
(-[WebDefaultScriptDebugDelegate webView:willLeaveCallFrame:sourceId:line:forWebFrame:]):
* WebView.subproj/WebFrame.m:
(-[WebFramePrivate dealloc]):
(-[WebFrame _attachScriptDebugger]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebScriptDebugDelegate.h: Added.
* WebView.subproj/WebScriptDebugDelegate.m: Added.
(-[WebScriptDebugger initWithWebFrame:]):
(-[WebScriptDebugger dealloc]):
(-[WebScriptDebugger globalObject]):
(-[WebScriptDebugger newWrapperForFrame:]):
(-[WebScriptDebugger parsedSource:fromURL:sourceId:]):
(-[WebScriptDebugger enteredFrame:sourceId:line:]):
(-[WebScriptDebugger hitStatement:sourceId:line:]):
(-[WebScriptDebugger leavingFrame:sourceId:line:]):
(-[WebScriptCallFrame _initWithFrame:]):
(-[WebScriptCallFrame dealloc]):
(-[WebScriptCallFrame setUserInfo:]):
(-[WebScriptCallFrame userInfo]):
(-[WebScriptCallFrame caller]):
(-[WebScriptCallFrame scopeChain]):
(-[WebScriptCallFrame functionName]):
(-[WebScriptCallFrame exception]):
(-[WebScriptCallFrame evaluateWebScript:]):
* WebView.subproj/WebScriptDebugDelegatePrivate.h: Added.
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
(-[WebViewPrivate dealloc]):
(-[WebView _scriptDebugDelegateForwarder]):
(-[WebView setScriptDebugDelegate:]):
(-[WebView scriptDebugDelegate]):
* WebView.subproj/WebViewInternal.h:
* WebView.subproj/WebViewPrivate.h:
Revision Changes Path
No revision
No revision
1.4104.2.85 +37 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4104.2.84
retrieving revision 1.4104.2.85
diff -u -r1.4104.2.84 -r1.4104.2.85
--- ChangeLog 2 Aug 2005 22:23:14 -0000 1.4104.2.84
+++ ChangeLog 2 Aug 2005 22:50:12 -0000 1.4104.2.85
@@ -1,3 +1,40 @@
+2005-08-02 Geoffrey Garen <ggaren at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
+ mjs 05/07/29 20:00:34
+
+ Changes by Michael Kahl, reviewed by me.
+
+ Test cases added: No tests, this code only affects debugging.
+
+ - fixed <rdar://problem/4164112> MASTER: JavaScript debugging support
+
+ * WebCore-combined.exp:
+ * WebCore.exp:
+ * WebCore.xcodeproj/project.pbxproj:
+ * kwq/WebCoreScriptDebugger.h: Added.
+ * kwq/WebCoreScriptDebugger.mm: Added.
+ (toNSString):
+ (WebCoreScriptDebuggerImp::WebCoreScriptDebuggerImp):
+ (WebCoreScriptDebuggerImp::sourceParsed):
+ (WebCoreScriptDebuggerImp::callEvent):
+ (WebCoreScriptDebuggerImp::atStatement):
+ (WebCoreScriptDebuggerImp::returnEvent):
+ (-[WebCoreScriptDebugger initWithDelegate:]):
+ (-[WebCoreScriptDebugger dealloc]):
+ (-[WebCoreScriptDebugger delegate]):
+ (-[WebCoreScriptCallFrame _initWithGlobalObject:caller:state:]):
+ (-[WebCoreScriptCallFrame _setWrapper:]):
+ (-[WebCoreScriptCallFrame _convertValueToObjcValue:]):
+ (-[WebCoreScriptCallFrame dealloc]):
+ (-[WebCoreScriptCallFrame wrapper]):
+ (-[WebCoreScriptCallFrame caller]):
+ (-[WebCoreScriptCallFrame scopeChain]):
+ (-[WebCoreScriptCallFrame functionName]):
+ (-[WebCoreScriptCallFrame exception]):
+ (-[WebCoreScriptCallFrame evaluateWebScript:]):
+
2005-08-02 Adele Peterson <adele at apple.com>
small change to fix build bustage.
1.39.10.2 +1 -0 WebCore/Attic/WebCore-combined.exp
Index: WebCore-combined.exp
===================================================================
RCS file: /cvs/root/WebCore/Attic/WebCore-combined.exp,v
retrieving revision 1.39.10.1
retrieving revision 1.39.10.2
diff -u -r1.39.10.1 -r1.39.10.2
--- WebCore-combined.exp 22 Jul 2005 01:18:20 -0000 1.39.10.1
+++ WebCore-combined.exp 2 Aug 2005 22:50:16 -0000 1.39.10.2
@@ -83,6 +83,7 @@
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
.objc_class_name_WebCoreKeyGenerator
+.objc_class_name_WebCoreScriptDebugger
.objc_class_name_WebCoreScrollView
.objc_class_name_WebCoreSettings
.objc_class_name_WebCoreTextRendererFactory
1.40.10.1 +1 -0 WebCore/WebCore.exp
Index: WebCore.exp
===================================================================
RCS file: /cvs/root/WebCore/WebCore.exp,v
retrieving revision 1.40
retrieving revision 1.40.10.1
diff -u -r1.40 -r1.40.10.1
--- WebCore.exp 28 Sep 2004 20:57:45 -0000 1.40
+++ WebCore.exp 2 Aug 2005 22:50:16 -0000 1.40.10.1
@@ -83,6 +83,7 @@
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
.objc_class_name_WebCoreKeyGenerator
+.objc_class_name_WebCoreScriptDebugger
.objc_class_name_WebCoreScrollView
.objc_class_name_WebCoreSettings
.objc_class_name_WebCoreTextRendererFactory
No revision
No revision
1.3.2.3 +8 -0 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- project.pbxproj 29 Jul 2005 23:29:42 -0000 1.3.2.2
+++ project.pbxproj 2 Aug 2005 22:50:20 -0000 1.3.2.3
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
+ 144F1D0708A02BDC00F5165B /* WebCoreScriptDebugger.h in Headers */ = {isa = PBXBuildFile; fileRef = 144F1D0508A02BDC00F5165B /* WebCoreScriptDebugger.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 144F1D0808A02BDC00F5165B /* WebCoreScriptDebugger.mm in Sources */ = {isa = PBXBuildFile; fileRef = 144F1D0608A02BDC00F5165B /* WebCoreScriptDebugger.mm */; };
2D90660D0665D937006B6F1A /* KWQClipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D90660B0665D937006B6F1A /* KWQClipboard.h */; };
2D90660E0665D937006B6F1A /* KWQClipboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* KWQClipboard.mm */; };
354F248B02EE28590ACA2ACA /* KWQDOMNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 354F248902EE28590ACA2ACA /* KWQDOMNode.h */; };
@@ -686,6 +688,8 @@
/* Begin PBXFileReference section */
034768E0FF38A50411DB9C8B /* WebCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 144F1D0508A02BDC00F5165B /* WebCoreScriptDebugger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreScriptDebugger.h; sourceTree = "<group>"; };
+ 144F1D0608A02BDC00F5165B /* WebCoreScriptDebugger.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreScriptDebugger.mm; sourceTree = "<group>"; };
2D90660B0665D937006B6F1A /* KWQClipboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQClipboard.h; sourceTree = "<group>"; };
2D90660C0665D937006B6F1A /* KWQClipboard.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQClipboard.mm; sourceTree = "<group>"; };
354F248902EE28590ACA2ACA /* KWQDOMNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQDOMNode.h; sourceTree = "<group>"; };
@@ -2039,6 +2043,8 @@
84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */,
84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */,
F587855002DE375901EA4122 /* WebCoreResourceLoader.h */,
+ 144F1D0508A02BDC00F5165B /* WebCoreScriptDebugger.h */,
+ 144F1D0608A02BDC00F5165B /* WebCoreScriptDebugger.mm */,
9325AAB7041D0E9A00A9CAC5 /* WebCoreScrollView.h */,
9325AAB8041D0E9A00A9CAC5 /* WebCoreScrollView.m */,
F565AE8502ECA583018635CA /* WebCoreSettings.h */,
@@ -2657,6 +2663,7 @@
65FD9D2E081D727F00636F54 /* main_thread_malloc.h in Headers */,
B55772C70883262B00DCA277 /* domparser.h in Headers */,
B55772DF08833B6300DCA277 /* domparser.lut.h in Headers */,
+ 144F1D0708A02BDC00F5165B /* WebCoreScriptDebugger.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2982,6 +2989,7 @@
51111AC107BD812C00B7162C /* DOMUtility.mm in Sources */,
65FD9D2D081D727F00636F54 /* main_thread_malloc.cpp in Sources */,
B55772C60883262B00DCA277 /* domparser.cpp in Sources */,
+ 144F1D0808A02BDC00F5165B /* WebCoreScriptDebugger.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
No revision
No revision
1.1.2.2 +95 -0 WebCore/kwq/WebCoreScriptDebugger.h
1.1.2.2 +353 -0 WebCore/kwq/WebCoreScriptDebugger.mm
No revision
No revision
1.3118.4.30 +55 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3118.4.29
retrieving revision 1.3118.4.30
diff -u -r1.3118.4.29 -r1.3118.4.30
--- ChangeLog 2 Aug 2005 16:57:53 -0000 1.3118.4.29
+++ ChangeLog 2 Aug 2005 22:50:22 -0000 1.3118.4.30
@@ -1,3 +1,58 @@
+2005-08-02 Geoffrey Garen <ggaren at apple.com>
+ Merged fix from TOT to Safari-2-0-branch
+
+ mjs 05/07/29 20:00:34
+
+ Changes by Michael Kahl, reviewed by me.
+
+ Test cases added: No tests, this code only affects debugging.
+
+ - fixed <rdar://problem/4164112> MASTER: JavaScript debugging support
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge windowObjectCleared]):
+ * WebCoreSupport.subproj/WebSubresourceLoader.m:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebView.subproj/WebDefaultScriptDebugDelegate.h: Added.
+ * WebView.subproj/WebDefaultScriptDebugDelegate.m: Added.
+ (+[WebDefaultScriptDebugDelegate sharedScriptDebugDelegate]):
+ (-[WebDefaultScriptDebugDelegate webView:didParseSource:fromURL:sourceId:forWebFrame:]):
+ (-[WebDefaultScriptDebugDelegate webView:didEnterCallFrame:sourceId:line:forWebFrame:]):
+ (-[WebDefaultScriptDebugDelegate webView:willExecuteStatement:sourceId:line:forWebFrame:]):
+ (-[WebDefaultScriptDebugDelegate webView:willLeaveCallFrame:sourceId:line:forWebFrame:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFramePrivate dealloc]):
+ (-[WebFrame _attachScriptDebugger]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebScriptDebugDelegate.h: Added.
+ * WebView.subproj/WebScriptDebugDelegate.m: Added.
+ (-[WebScriptDebugger initWithWebFrame:]):
+ (-[WebScriptDebugger dealloc]):
+ (-[WebScriptDebugger globalObject]):
+ (-[WebScriptDebugger newWrapperForFrame:]):
+ (-[WebScriptDebugger parsedSource:fromURL:sourceId:]):
+ (-[WebScriptDebugger enteredFrame:sourceId:line:]):
+ (-[WebScriptDebugger hitStatement:sourceId:line:]):
+ (-[WebScriptDebugger leavingFrame:sourceId:line:]):
+ (-[WebScriptCallFrame _initWithFrame:]):
+ (-[WebScriptCallFrame dealloc]):
+ (-[WebScriptCallFrame setUserInfo:]):
+ (-[WebScriptCallFrame userInfo]):
+ (-[WebScriptCallFrame caller]):
+ (-[WebScriptCallFrame scopeChain]):
+ (-[WebScriptCallFrame functionName]):
+ (-[WebScriptCallFrame exception]):
+ (-[WebScriptCallFrame evaluateWebScript:]):
+ * WebView.subproj/WebScriptDebugDelegatePrivate.h: Added.
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ (-[WebViewPrivate dealloc]):
+ (-[WebView _scriptDebugDelegateForwarder]):
+ (-[WebView setScriptDebugDelegate:]):
+ (-[WebView scriptDebugDelegate]):
+ * WebView.subproj/WebViewInternal.h:
+ * WebView.subproj/WebViewPrivate.h:
+
2005-08-02 Adele Peterson <adele at apple.com>
Merged fix from TOT to Safari-2-0-branch
No revision
No revision
1.340.8.7 +3 -0 WebKit/WebCoreSupport.subproj/WebBridge.m
Index: WebBridge.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebBridge.m,v
retrieving revision 1.340.8.6
retrieving revision 1.340.8.7
diff -u -r1.340.8.6 -r1.340.8.7
--- WebBridge.m 2 Aug 2005 16:57:59 -0000 1.340.8.6
+++ WebBridge.m 2 Aug 2005 22:50:26 -0000 1.340.8.7
@@ -1453,6 +1453,9 @@
{
WebView *wv = [_frame webView];
[[wv _frameLoadDelegateForwarder] webView:wv windowScriptObjectAvailable:[self windowScriptObject]];
+ if ([wv scriptDebugDelegate]) {
+ [_frame _attachScriptDebugger];
+ }
}
- (int)spellCheckerDocumentTag
1.108.8.1 +1 -1 WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
Index: WebSubresourceLoader.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m,v
retrieving revision 1.108
retrieving revision 1.108.8.1
diff -u -r1.108 -r1.108.8.1
--- WebSubresourceLoader.m 6 Mar 2005 03:36:59 -0000 1.108
+++ WebSubresourceLoader.m 2 Aug 2005 22:50:26 -0000 1.108.8.1
@@ -117,7 +117,7 @@
NSURL *oldURL = [request URL];
NSURLRequest *clientRequest = [super willSendRequest:newRequest redirectResponse:redirectResponse];
- if (clientRequest != nil && ![oldURL isEqual:[clientRequest URL]]) {
+ if (clientRequest != nil && oldURL != [clientRequest URL] && ![oldURL isEqual:[clientRequest URL]]) {
[loader redirectedToURL:[clientRequest URL]];
}
No revision
No revision
1.2.2.3 +20 -0 WebKit/WebKit.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebKit/WebKit.xcodeproj/project.pbxproj,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- project.pbxproj 29 Jul 2005 23:31:52 -0000 1.2.2.2
+++ project.pbxproj 2 Aug 2005 22:50:27 -0000 1.2.2.3
@@ -7,6 +7,11 @@
objects = {
/* Begin PBXBuildFile section */
+ 144F1C6408A0228500F5165B /* WebDefaultScriptDebugDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 144F1C5F08A0228500F5165B /* WebDefaultScriptDebugDelegate.h */; };
+ 144F1C6508A0228500F5165B /* WebDefaultScriptDebugDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 144F1C6008A0228500F5165B /* WebDefaultScriptDebugDelegate.m */; };
+ 144F1C6608A0228500F5165B /* WebScriptDebugDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 144F1C6108A0228500F5165B /* WebScriptDebugDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 144F1C6708A0228500F5165B /* WebScriptDebugDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 144F1C6208A0228500F5165B /* WebScriptDebugDelegate.m */; };
+ 144F1C6808A0228500F5165B /* WebScriptDebugDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 144F1C6308A0228500F5165B /* WebScriptDebugDelegatePrivate.h */; };
2568C72D0174912D0ECA149E /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
2D36FD5F03F78F9E00A80166 /* WebFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */; };
2D81DAB403EB0B2D00A80166 /* WebFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D81DAB203EB0B2D00A80166 /* WebFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -349,6 +354,11 @@
/* Begin PBXFileReference section */
034768E0FF38A50411DB9C8B /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 144F1C5F08A0228500F5165B /* WebDefaultScriptDebugDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDefaultScriptDebugDelegate.h; sourceTree = "<group>"; };
+ 144F1C6008A0228500F5165B /* WebDefaultScriptDebugDelegate.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDefaultScriptDebugDelegate.m; sourceTree = "<group>"; };
+ 144F1C6108A0228500F5165B /* WebScriptDebugDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugDelegate.h; sourceTree = "<group>"; };
+ 144F1C6208A0228500F5165B /* WebScriptDebugDelegate.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebScriptDebugDelegate.m; sourceTree = "<group>"; };
+ 144F1C6308A0228500F5165B /* WebScriptDebugDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugDelegatePrivate.h; sourceTree = "<group>"; };
2568C72C0174912D0ECA149E /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFormDelegatePrivate.h; sourceTree = "<group>"; };
2D81DAB203EB0B2D00A80166 /* WebFormDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormDelegate.h; sourceTree = "<group>"; };
@@ -1002,6 +1012,8 @@
5152FAE0033FC50400CA2ACD /* WebDefaultPolicyDelegate.m */,
700BC50B04144DA100A80182 /* WebDefaultResourceLoadDelegate.h */,
700BC50C04144DA100A80182 /* WebDefaultResourceLoadDelegate.m */,
+ 144F1C5F08A0228500F5165B /* WebDefaultScriptDebugDelegate.h */,
+ 144F1C6008A0228500F5165B /* WebDefaultScriptDebugDelegate.m */,
515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */,
515E27D00458CA4B00CA2D3A /* WebDefaultUIDelegate.m */,
35081DAE02B6D4F50ACA2ACA /* WebDocument.h */,
@@ -1037,6 +1049,9 @@
84311A1305EAAAF00088EDA4 /* WebResource.m */,
84311AF105EAB12B0088EDA4 /* WebResourcePrivate.h */,
513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */,
+ 144F1C6108A0228500F5165B /* WebScriptDebugDelegate.h */,
+ 144F1C6208A0228500F5165B /* WebScriptDebugDelegate.m */,
+ 144F1C6308A0228500F5165B /* WebScriptDebugDelegatePrivate.h */,
515E27CC0458C86500CA2D3A /* WebUIDelegate.h */,
65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */,
51A8B579042834F700CA2D3A /* WebView.h */,
@@ -1419,6 +1434,9 @@
93C6F14607920B93002449CD /* WebFrameViewPrivate.h in Headers */,
65836F5F07EE425900682F95 /* WebPluginContainerPrivate.h in Headers */,
65E1150507EFFEBF009B8BF7 /* WebPluginContainerCheck.h in Headers */,
+ 144F1C6408A0228500F5165B /* WebDefaultScriptDebugDelegate.h in Headers */,
+ 144F1C6608A0228500F5165B /* WebScriptDebugDelegate.h in Headers */,
+ 144F1C6808A0228500F5165B /* WebScriptDebugDelegatePrivate.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1631,6 +1649,8 @@
514C4C2F075E7DE500B89CAD /* WebImageDecodeItem.m in Sources */,
514C4C31075E7DE500B89CAD /* WebImageDecoder.m in Sources */,
65E1150607EFFEBF009B8BF7 /* WebPluginContainerCheck.m in Sources */,
+ 144F1C6508A0228500F5165B /* WebDefaultScriptDebugDelegate.m in Sources */,
+ 144F1C6708A0228500F5165B /* WebScriptDebugDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
No revision
No revision
1.223.8.7 +10 -0 WebKit/WebView.subproj/WebFrame.m
Index: WebFrame.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
retrieving revision 1.223.8.6
retrieving revision 1.223.8.7
diff -u -r1.223.8.6 -r1.223.8.7
--- WebFrame.m 2 Aug 2005 16:58:00 -0000 1.223.8.6
+++ WebFrame.m 2 Aug 2005 22:50:27 -0000 1.223.8.7
@@ -41,6 +41,7 @@
#import <Foundation/NSDictionary_NSURLExtras.h>
#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLRequestPrivate.h>
+#import <WebKit/WebScriptDebugDelegatePrivate.h>
#import <objc/objc-runtime.h>
@@ -192,6 +193,8 @@
[provisionalItem release];
[previousItem release];
+ [scriptDebugger release];
+
ASSERT(listener == nil);
ASSERT(policyRequest == nil);
ASSERT(policyFrameName == nil);
@@ -2532,6 +2535,13 @@
return _private->children;
}
+- (void)_attachScriptDebugger
+{
+ if (!_private->scriptDebugger) {
+ _private->scriptDebugger = [[WebScriptDebugger alloc] initWithWebFrame:self];
+ }
+}
+
@end
@implementation WebFrame (WebInternal)
1.154.8.1 +4 -0 WebKit/WebView.subproj/WebFramePrivate.h
Index: WebFramePrivate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFramePrivate.h,v
retrieving revision 1.154
retrieving revision 1.154.8.1
diff -u -r1.154 -r1.154.8.1
--- WebFramePrivate.h 10 Mar 2005 01:00:28 -0000 1.154
+++ WebFramePrivate.h 2 Aug 2005 22:50:27 -0000 1.154.8.1
@@ -25,6 +25,7 @@
@class WebFrameView;
@class WebHistoryItem;
@class WebPolicyDecisionListener;
+ at class WebScriptDebugger;
@class WebView;
typedef enum {
@@ -95,6 +96,7 @@
BOOL delegateIsHandlingUnimplementablePolicy;
id internalLoadDelegate;
+ WebScriptDebugger *scriptDebugger;
}
- (void)setName:(NSString *)name;
@@ -214,4 +216,6 @@
- (BOOL)_isDescendantOfFrame:(WebFrame *)frame;
- (BOOL)_isFrameSet;
+- (void)_attachScriptDebugger;
+
@end
1.158.12.1 +14 -0 WebKit/WebView.subproj/WebView.h
Index: WebView.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.h,v
retrieving revision 1.158
retrieving revision 1.158.12.1
diff -u -r1.158 -r1.158.12.1
--- WebView.h 21 Jul 2004 17:47:52 -0000 1.158
+++ WebView.h 2 Aug 2005 22:50:28 -0000 1.158.12.1
@@ -228,6 +228,20 @@
- (id)policyDelegate;
/*!
+ @method setScriptDebugDelegate:
+ @abstract Set the WebView's WebScriptDebugDelegate delegate.
+ @param delegate The WebScriptDebugDelegate to set as the delegate.
+*/
+- (void)setScriptDebugDelegate:(id)delegate;
+
+/*!
+ @method scriptDebugDelegate
+ @abstract Return the WebView's WebScriptDebugDelegate.
+ @result The WebView's WebScriptDebugDelegate.
+*/
+- (id)scriptDebugDelegate;
+
+/*!
@method mainFrame
@abstract Return the top level frame.
@discussion Note that even document that are not framesets will have a
1.274.8.4 +22 -0 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.274.8.3
retrieving revision 1.274.8.4
diff -u -r1.274.8.3 -r1.274.8.4
--- WebView.m 26 Jul 2005 00:40:19 -0000 1.274.8.3
+++ WebView.m 2 Aug 2005 22:50:28 -0000 1.274.8.4
@@ -19,6 +19,7 @@
#import <WebKit/WebDefaultFrameLoadDelegate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
+#import <WebKit/WebDefaultScriptDebugDelegate.h>
#import <WebKit/WebDefaultUIDelegate.h>
#import <WebKit/WebDOMOperationsPrivate.h>
#import <WebKit/WebDocument.h>
@@ -47,6 +48,7 @@
#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
+#import <WebKit/WebScriptDebugDelegatePrivate.h>
#import <WebKit/WebTextView.h>
#import <WebKit/WebTextRepresentation.h>
#import <WebKit/WebTextRenderer.h>
@@ -275,6 +277,7 @@
[UIDelegateForwarder release];
[frameLoadDelegateForwarder release];
[editingDelegateForwarder release];
+ [scriptDebugDelegateForwarder release];
[progressItems release];
@@ -817,6 +820,13 @@
return _private->editingDelegateForwarder;
}
+- _scriptDebugDelegateForwarder
+{
+ if (!_private->scriptDebugDelegateForwarder)
+ _private->scriptDebugDelegateForwarder = [[_WebSafeForwarder alloc] initWithTarget: [self scriptDebugDelegate] defaultTarget: [WebDefaultScriptDebugDelegate sharedScriptDebugDelegate] templateClass: [WebDefaultScriptDebugDelegate class]];
+ return _private->scriptDebugDelegateForwarder;
+}
+
- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource fromFrame: (WebFrame *)frame
{
NSArray *frames;
@@ -1754,6 +1764,18 @@
{
return _private->frameLoadDelegate;
}
+- (void)setScriptDebugDelegate:delegate
+{
+ _private->scriptDebugDelegate = delegate;
+ [_private->scriptDebugDelegateForwarder release];
+ _private->scriptDebugDelegateForwarder = nil;
+}
+
+- scriptDebugDelegate
+{
+ return _private->scriptDebugDelegate;
+}
+
- (WebFrame *)mainFrame
{
1.16.8.1 +2 -0 WebKit/WebView.subproj/WebViewInternal.h
Index: WebViewInternal.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebViewInternal.h,v
retrieving revision 1.16
retrieving revision 1.16.8.1
diff -u -r1.16 -r1.16.8.1
--- WebViewInternal.h 18 Feb 2005 00:09:39 -0000 1.16
+++ WebViewInternal.h 2 Aug 2005 22:50:28 -0000 1.16.8.1
@@ -24,6 +24,8 @@
id <WebFormDelegate> formDelegate;
id editingDelegate;
id editingDelegateForwarder;
+ id scriptDebugDelegate;
+ id scriptDebugDelegateForwarder;
WebBackForwardList *backForwardList;
BOOL useBackForwardList;
1.138.8.1 +1 -0 WebKit/WebView.subproj/WebViewPrivate.h
Index: WebViewPrivate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebViewPrivate.h,v
retrieving revision 1.138
retrieving revision 1.138.8.1
diff -u -r1.138 -r1.138.8.1
--- WebViewPrivate.h 23 Feb 2005 03:34:31 -0000 1.138
+++ WebViewPrivate.h 2 Aug 2005 22:50:28 -0000 1.138.8.1
@@ -156,6 +156,7 @@
- (id)_policyDelegateForwarder;
- (id)_UIDelegateForwarder;
- (id)_editingDelegateForwarder;
+- (id)_scriptDebugDelegateForwarder;
- (void)_closeWindow;
No revision
No revision
1.1.2.2 +34 -0 WebKit/WebView.subproj/WebDefaultScriptDebugDelegate.h
1.1.2.2 +73 -0 WebKit/WebView.subproj/WebDefaultScriptDebugDelegate.m
1.1.2.2 +102 -0 WebKit/WebView.subproj/WebScriptDebugDelegate.h
1.2.2.2 +157 -0 WebKit/WebView.subproj/WebScriptDebugDelegate.m
1.1.2.2 +46 -0 WebKit/WebView.subproj/WebScriptDebugDelegatePrivate.h
More information about the webkit-changes
mailing list