JavaScriptCore:

        Reviewed by John.

        * kjs/lexer.cpp:
        (Lexer::setCode):
            - fixed <rdar://problem/3682398>: (error console line numbers are offset by 1)
        * kjs/lexer.h:
        (KJS::Lexer::lineNo):
            - fixed <rdar://problem/3682398>: (error console line numbers are offset by 1)

WebKit:

        Reviewed by John.

        * WebView.subproj/WebResource.m:
        (-[WebResource description]):
            -added per request of cblu
        (-[WebResource _response]):
            -added this method to the header
        (-[WebResource _stringValue]):
            - gives the string value of the NSData representation
        * WebView.subproj/WebResourcePrivate.h:

WebBrowser:

        Reviewed by John.

        * BrowserDocumentController.h:
        * BrowserDocumentController.m:
          -added support to open an HTMLSourceDocument powered by a WebResource
        (-[BrowserDocumentController openHTMLSourceDocumentWithResource:]):
        * Debug/DebugUtilities.m:
        (-[BrowserDocument showJavaScriptConsole:]):
        * Debug/ErrorCell.m:
            - doesn't display "Line:" if a line number is not present
            - magic numbers are now #define'd
        (-[ErrorCell drawInteriorWithFrame:inView:]):
        * Debug/ErrorConsoleController.h:
        * Debug/ErrorConsoleController.m:
        (-[ErrorConsoleController init]):
        (-[ErrorConsoleController awakeFromNib]):
            - properly set the model's table view here, instead of init
        (-[ErrorConsoleController clear:]):
            - removes errors from the model
        (-[ErrorConsoleController findResourceInWebFrame:forURL:]):
            - fixes <rdar://problem/3682337>: (safari error console does not open the correct source document when an error is double-clicked)
        (-[ErrorConsoleController findResourceInDocument:forURL:]):
            - fixes <rdar://problem/3682337>: (safari error console does not open the correct source document when an error is double-clicked)
        (-[ErrorConsoleController findResourceInURL:]):
            - fixes <rdar://problem/3682337>: (safari error console does not open the correct source document when an error is double-clicked)
        (-[ErrorConsoleController showPageSourceWindow:]):
            - fixes <rdar://problem/3682337>: (safari error console does not open the correct source document when an error is double-clicked)
        * Debug/ErrorConsoleModel.h:
        * Debug/ErrorConsoleModel.m:
        (-[ErrorConsoleModel setTable:]):
        (-[ErrorConsoleModel selectedURL]):
        (-[ErrorConsoleModel selectedLineNumber]):
        * HTMLSourceController.h:
        * HTMLSourceController.m:
        (-[HTMLSourceController selectLineAtIndex:]):
        (-[HTMLSourceController textView]):
        (-[HTMLSourceController rangeForLine:]):
            - fixes rdr://problem/3682360 (error console should highlight/select offending code when viewing error source)
        * HTMLSourceDocument.h:
        * HTMLSourceDocument.m:
        (-[HTMLSourceDocument initWithResource:]):
        (-[HTMLSourceDocument makeWindowControllers]):
        (-[HTMLSourceDocument displayName]):
            - now WebResource aware
        (-[HTMLSourceDocument resource]):
        (-[HTMLSourceDocument setResource:]):
        * WebBrowser.pbproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6810 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 58253d42d4dbb9c7fc57ec38e2e98b71cab7cc01..6557d59f7bf23c5f8871a6927a42dcc2f3aeaea5 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-10  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by John.
+
+        * kjs/lexer.cpp: 
+        (Lexer::setCode):
+            - fixed <rdar://problem/3682398>: (error console line numbers are offset by 1)
+        * kjs/lexer.h:
+        (KJS::Lexer::lineNo):
+            - fixed <rdar://problem/3682398>: (error console line numbers are offset by 1)
+
 === JavaScriptCore-143.2 ===
 
 2004-06-07  Darin Adler  <darin@apple.com>

diff --git a/JavaScriptCore/kjs/lexer.cpp b/JavaScriptCore/kjs/lexer.cpp
index a1661553e83762af15aabb78d7a84c5fbfdda620..9fbcbf53eef5d02cb67e4c8210a92816fb476422 100644 (file)
--- a/JavaScriptCore/kjs/lexer.cpp
+++ b/JavaScriptCore/kjs/lexer.cpp
@@ -103,7 +103,7 @@ void Lexer::globalClear()
 
 void Lexer::setCode(const UString &sourceURL, int startingLineNumber, const UChar *c, unsigned int len)
 {
-  yylineno = 1;
+  yylineno = 1 + startingLineNumber;
   m_sourceURL = sourceURL;
   restrKeyword = false;
   delimited = false;

diff --git a/JavaScriptCore/kjs/lexer.h b/JavaScriptCore/kjs/lexer.h
index 350d5fdcc0d37f95b7d4335447e53e4d81723d9e..e6c9f4876ec23bd86c0f18bc5556a6f63ff0cad3 100644 (file)
--- a/JavaScriptCore/kjs/lexer.h
+++ b/JavaScriptCore/kjs/lexer.h
@@ -41,7 +41,7 @@ namespace KJS {
     void setCode(const UString &sourceURL, int startingLineNumber, const UChar *c, unsigned int len);
     int lex();
 
-    int lineNo() const { return yylineno + 1; }
+    int lineNo() const { return yylineno; }
     UString sourceURL() const { return m_sourceURL; }
 
     bool prevTerminator() const { return terminator; }

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2dac2e46a33f5618cbb4584c925097b9a24aa46d..37e2f07f5d5c144885ed51ad4f8192f500127862 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-10  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by John.
+
+        * WebView.subproj/WebResource.m:
+        (-[WebResource description]):
+            -added per request of cblu
+        (-[WebResource _response]):
+            -added this method to the header
+        (-[WebResource _stringValue]):
+            - gives the string value of the NSData representation
+        * WebView.subproj/WebResourcePrivate.h:
+
 2004-06-10  Darin Adler  <darin@apple.com>
 
         Reviewed by Ken.

diff --git a/WebKit/WebView.subproj/WebResource.m b/WebKit/WebView.subproj/WebResource.m
index eeb287918460a1db55505e6b7d3236b39cbd7ec1..f2b1d181a5f13e07cc6a96396109e444a8ebd590 100644 (file)
--- a/WebKit/WebView.subproj/WebResource.m
+++ b/WebKit/WebView.subproj/WebResource.m
@@ -2,7 +2,7 @@
     WebResource.m
     Copyright (C) 2004 Apple Computer, Inc. All rights reserved.    
 */
-
+#import <WebKit/WebBridge.h>
 #import <WebKit/WebResourcePrivate.h>
 #import <WebKit/WebNSURLExtras.h>
 
@@ -140,6 +140,11 @@ NSString *WebResourceTextEncodingNameKey =  @"WebResourceTextEncodingName";
     return _private->frameName;
 }
 
+- (id)description
+{
+    return [NSString stringWithFormat:@"<%@ %@>", [self className], [self URL]];
+}
+
 @end
 
 @implementation WebResource (WebResourcePrivate)
@@ -228,5 +233,16 @@ NSString *WebResourceTextEncodingNameKey =  @"WebResourceTextEncodingName";
                               textEncodingName:_private->textEncodingName] autorelease];
 }
 
+- (NSString *)_stringValue
+{
+    NSString *textEncodingName = [self textEncodingName];
+    
+    if(textEncodingName){
+        return [WebBridge stringWithData:_private->data textEncodingName:textEncodingName];
+    }else{
+        return [WebBridge stringWithData:_private->data textEncoding:kCFStringEncodingISOLatin1];
+    }
+}
+
 @end
 

diff --git a/WebKit/WebView.subproj/WebResourcePrivate.h b/WebKit/WebView.subproj/WebResourcePrivate.h
index 5ec1927b54e7b7f23da451967c926c90265bd975..ca02b149adda70aaef0f7fcd987959b645a59a08 100644 (file)
--- a/WebKit/WebView.subproj/WebResourcePrivate.h
+++ b/WebKit/WebView.subproj/WebResourcePrivate.h
@@ -18,5 +18,6 @@
 - (NSFileWrapper *)_fileWrapperRepresentation;
 - (id)_propertyListRepresentation;
 - (NSURLResponse *)_response;
+- (NSString *)_stringValue;
 
 @end
\ No newline at end of file