[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:21:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit feb0a60e0f2f00e0243a27f2fa4409170902c8c7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 25 17:38:59 2002 +0000
* WebCoreSupport.subproj/IFResourceURLHandleClient.m:
(-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
(-[IFResourceURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
(-[IFResourceURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
Don't remove the URL handle from the data source until we've finished the
loading process in KDE code. This may fix 2968527.
* WebCoreSupport.subproj/IFTextRenderer.m: Keep around commented printfs so
I can do the "dump all strings as they are rendered" again.
* WebKit.pbproj/project.pbxproj: Re-add -Wmissing-format-attribute.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1430 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a2b076c..ad0ccce 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
2002-06-25 Darin Adler <darin at apple.com>
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFResourceURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Don't remove the URL handle from the data source until we've finished the
+ loading process in KDE code. This may fix 2968527.
+
+ * WebCoreSupport.subproj/IFTextRenderer.m: Keep around commented printfs so
+ I can do the "dump all strings as they are rendered" again.
+
+ * WebKit.pbproj/project.pbxproj: Re-add -Wmissing-format-attribute.
+
+2002-06-25 Darin Adler <darin at apple.com>
+
* WebCoreSupport.subproj/IFImageRenderer.m:
(-[IFImageRenderer tileInRect:fromPoint:]): Remove stray NSLog.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a2b076c..ad0ccce 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
2002-06-25 Darin Adler <darin at apple.com>
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFResourceURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Don't remove the URL handle from the data source until we've finished the
+ loading process in KDE code. This may fix 2968527.
+
+ * WebCoreSupport.subproj/IFTextRenderer.m: Keep around commented printfs so
+ I can do the "dump all strings as they are rendered" again.
+
+ * WebKit.pbproj/project.pbxproj: Re-add -Wmissing-format-attribute.
+
+2002-06-25 Darin Adler <darin at apple.com>
+
* WebCoreSupport.subproj/IFImageRenderer.m:
(-[IFImageRenderer tileInRect:fromPoint:]): Remove stray NSLog.
diff --git a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
index 57446e6..9c9a955 100644
--- a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
+++ b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
@@ -74,7 +74,8 @@
IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
inDomain:IFErrorCodeDomainWebFoundation
- failingURL:URL isTerminal:YES];
+ failingURL:URL
+ isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
partialProgress:nil fromDataSource:source];
@@ -122,10 +123,10 @@
WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
#endif
- [dataSource _removeURLHandle:handle];
-
[loader cancel];
+ [dataSource _removeURLHandle:handle];
+
[[dataSource controller] _receivedProgress:[IFLoadProgress progress]
forResourceHandle:handle fromDataSource:dataSource complete: YES];
@@ -138,10 +139,10 @@
WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
- [dataSource _removeURLHandle:handle];
-
[loader finish];
+ [dataSource _removeURLHandle:handle];
+
IFError *nonTerminalError = [handle error];
if (nonTerminalError) {
[[dataSource controller] _receivedError:nonTerminalError forResourceHandle:handle
@@ -163,10 +164,10 @@
WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
#endif
- [dataSource _removeURLHandle:handle];
-
[loader cancel];
+ [dataSource _removeURLHandle:handle];
+
[[dataSource controller] _receivedError:error forResourceHandle:handle
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index 9f283d0..55a2348 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -189,31 +189,19 @@ static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsigned int length)
{
- unsigned int clusterLength = 1, k;
- UniChar nextC;
+ unsigned int k;
- if (length == 0)
- return 0;
-
- if (length == 1)
- return 1;
+ if (length <= 1)
+ return length;
if (IsNonBaseChar(characters[0]))
return 1;
- nextC = characters[1];
- if (IsNonBaseChar(nextC)){
- // Find all the non base characters after the current character.
- for (k = 2; k < length; k++){
- if (!IsNonBaseChar(characters[k]))
- break;
- }
- clusterLength = k;
- }
- else
- clusterLength = 1;
-
- return clusterLength;
+ // Find all the non base characters after the current character.
+ for (k = 1; k < length; k++)
+ if (!IsNonBaseChar(characters[k]))
+ break;
+ return k;
}
@@ -591,6 +579,8 @@ cleanup:
- (void)drawCharacters:(const UniChar *)characters length: (unsigned int)length atPoint:(NSPoint)point withColor:(NSColor *)color
{
+ //printf("draw: font %s, size %.1f, text \"%s\"\n", [[font fontName] cString], [font pointSize], [[NSString stringWithCharacters:characters length:length] UTF8String]);
+
NSFont *substituteFont;
_IFFailedDrawReason reason = [self _drawCharacters: characters length: length atPoint: point withColor: color];
@@ -684,7 +674,8 @@ cleanup:
NSFont *substituteFont;
ATSGlyphRef glyphID;
-
+ //printf("width: font %s, size %.1f, text \"%s\"\n", [[font fontName] cString], [font pointSize], [[NSString stringWithCharacters:characters length:length] UTF8String]);
+
for (i = 0; i < length; i++) {
UniChar c = characters[i];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 57446e6..9c9a955 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -74,7 +74,8 @@
IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
inDomain:IFErrorCodeDomainWebFoundation
- failingURL:URL isTerminal:YES];
+ failingURL:URL
+ isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
partialProgress:nil fromDataSource:source];
@@ -122,10 +123,10 @@
WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
#endif
- [dataSource _removeURLHandle:handle];
-
[loader cancel];
+ [dataSource _removeURLHandle:handle];
+
[[dataSource controller] _receivedProgress:[IFLoadProgress progress]
forResourceHandle:handle fromDataSource:dataSource complete: YES];
@@ -138,10 +139,10 @@
WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
- [dataSource _removeURLHandle:handle];
-
[loader finish];
+ [dataSource _removeURLHandle:handle];
+
IFError *nonTerminalError = [handle error];
if (nonTerminalError) {
[[dataSource controller] _receivedError:nonTerminalError forResourceHandle:handle
@@ -163,10 +164,10 @@
WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
#endif
- [dataSource _removeURLHandle:handle];
-
[loader cancel];
+ [dataSource _removeURLHandle:handle];
+
[[dataSource controller] _receivedError:error forResourceHandle:handle
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 57446e6..9c9a955 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -74,7 +74,8 @@
IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
inDomain:IFErrorCodeDomainWebFoundation
- failingURL:URL isTerminal:YES];
+ failingURL:URL
+ isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
partialProgress:nil fromDataSource:source];
@@ -122,10 +123,10 @@
WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
#endif
- [dataSource _removeURLHandle:handle];
-
[loader cancel];
+ [dataSource _removeURLHandle:handle];
+
[[dataSource controller] _receivedProgress:[IFLoadProgress progress]
forResourceHandle:handle fromDataSource:dataSource complete: YES];
@@ -138,10 +139,10 @@
WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
- [dataSource _removeURLHandle:handle];
-
[loader finish];
+ [dataSource _removeURLHandle:handle];
+
IFError *nonTerminalError = [handle error];
if (nonTerminalError) {
[[dataSource controller] _receivedError:nonTerminalError forResourceHandle:handle
@@ -163,10 +164,10 @@
WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
#endif
- [dataSource _removeURLHandle:handle];
-
[loader cancel];
+ [dataSource _removeURLHandle:handle];
+
[[dataSource controller] _receivedError:error forResourceHandle:handle
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 9f283d0..55a2348 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -189,31 +189,19 @@ static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsigned int length)
{
- unsigned int clusterLength = 1, k;
- UniChar nextC;
+ unsigned int k;
- if (length == 0)
- return 0;
-
- if (length == 1)
- return 1;
+ if (length <= 1)
+ return length;
if (IsNonBaseChar(characters[0]))
return 1;
- nextC = characters[1];
- if (IsNonBaseChar(nextC)){
- // Find all the non base characters after the current character.
- for (k = 2; k < length; k++){
- if (!IsNonBaseChar(characters[k]))
- break;
- }
- clusterLength = k;
- }
- else
- clusterLength = 1;
-
- return clusterLength;
+ // Find all the non base characters after the current character.
+ for (k = 1; k < length; k++)
+ if (!IsNonBaseChar(characters[k]))
+ break;
+ return k;
}
@@ -591,6 +579,8 @@ cleanup:
- (void)drawCharacters:(const UniChar *)characters length: (unsigned int)length atPoint:(NSPoint)point withColor:(NSColor *)color
{
+ //printf("draw: font %s, size %.1f, text \"%s\"\n", [[font fontName] cString], [font pointSize], [[NSString stringWithCharacters:characters length:length] UTF8String]);
+
NSFont *substituteFont;
_IFFailedDrawReason reason = [self _drawCharacters: characters length: length atPoint: point withColor: color];
@@ -684,7 +674,8 @@ cleanup:
NSFont *substituteFont;
ATSGlyphRef glyphID;
-
+ //printf("width: font %s, size %.1f, text \"%s\"\n", [[font fontName] cString], [font pointSize], [[NSString stringWithCharacters:characters length:length] UTF8String]);
+
for (i = 0; i < length; i++) {
UniChar c = characters[i];
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index f051845..6e8c66d 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -146,7 +146,7 @@
SECTORDER_FLAGS = "";
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "$(WARNING_COMMONFLAGS)";
- WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+ WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
WRAPPER_EXTENSION = framework;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list