[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:22:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ae9fb1cce4daf1f4ee8ffaad7b7c325579070aa8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 1 16:19:00 2002 +0000
top level:
* Tools/CommitLogEditor/.cvsignore: Added.
WebCore:
* khtml/css/cssparser.cpp:
* khtml/misc/htmlhashes.cpp:
Remove workaround for a PFE bug that no longer affects us.
* khtml/xml/dom_nodeimpl.h:
* khtml/xml/dom_nodeimpl.cpp:
Remove some unneeded APPLE_CHANGES.
* WebCore.exp: One less symbol to export.
WebKit:
* Plugins.subproj/IFPlugin.m:
(-[IFPlugin _getPluginInfoForResourceFile:]): Fix off-by one error
that would cause a memory trasher if we had a 255-character string.
* WebView.subproj/IFHTMLView.mm:
* WebView.subproj/IFRenderNode.mm:
Touch these files so we don't have to do a full build of WebKit
for my WebCore changes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1481 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6b47db0..90a61d1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-01 Darin Adler <darin at apple.com>
+
+ * khtml/css/cssparser.cpp:
+ * khtml/misc/htmlhashes.cpp:
+ Remove workaround for a PFE bug that no longer affects us.
+
+ * khtml/xml/dom_nodeimpl.h:
+ * khtml/xml/dom_nodeimpl.cpp:
+ Remove some unneeded APPLE_CHANGES.
+
+ * WebCore.exp: One less symbol to export.
+
2002-06-29 Maciej Stachowiak <mjs at apple.com>
WebCore part of fix for:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6b47db0..90a61d1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-07-01 Darin Adler <darin at apple.com>
+
+ * khtml/css/cssparser.cpp:
+ * khtml/misc/htmlhashes.cpp:
+ Remove workaround for a PFE bug that no longer affects us.
+
+ * khtml/xml/dom_nodeimpl.h:
+ * khtml/xml/dom_nodeimpl.cpp:
+ Remove some unneeded APPLE_CHANGES.
+
+ * WebCore.exp: One less symbol to export.
+
2002-06-29 Maciej Stachowiak <mjs at apple.com>
WebCore part of fix for:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6b47db0..90a61d1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-07-01 Darin Adler <darin at apple.com>
+
+ * khtml/css/cssparser.cpp:
+ * khtml/misc/htmlhashes.cpp:
+ Remove workaround for a PFE bug that no longer affects us.
+
+ * khtml/xml/dom_nodeimpl.h:
+ * khtml/xml/dom_nodeimpl.cpp:
+ Remove some unneeded APPLE_CHANGES.
+
+ * WebCore.exp: One less symbol to export.
+
2002-06-29 Maciej Stachowiak <mjs at apple.com>
WebCore part of fix for:
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index bcaa8b9..321afb3 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -21,7 +21,6 @@ __ZN8QPainterD1Ev
__ZN9KHTMLView6layoutEv
__ZN9QKeyEventC1EN6QEvent4TypeEiiiRK7QStringbt
__ZNK3DOM8NodeImpl16recursive_toHTMLEb
-__ZNK3DOM8NodeImpl8rendererEv
__ZNK3DOM9DOMString6stringEv
__ZNK7QWidget7getViewEv
__ZNK9KHTMLPart10xmlDocImplEv
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 955f9b9..a7a61e6 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -59,11 +59,6 @@ using namespace DOM;
//
// with 'props->id' a CSS property in the range from CSS_PROP_MIN to
// (and including) CSS_PROP_TOTAL-1
-#ifdef APPLE_CHANGES
-// work around Radar 2905890
-#undef __inline
-#define __inline
-#endif
#include "cssproperties.c"
#include "cssvalues.c"
diff --git a/WebCore/khtml/misc/htmlhashes.cpp b/WebCore/khtml/misc/htmlhashes.cpp
index dfc05f7..b815ca0 100644
--- a/WebCore/khtml/misc/htmlhashes.cpp
+++ b/WebCore/khtml/misc/htmlhashes.cpp
@@ -20,11 +20,6 @@
*/
#include "htmlhashes.h"
-#ifdef APPLE_CHANGES
-// work around Radar 2905890
-#undef __inline
-#define __inline
-#endif
#include "htmltags.c"
#include "htmlattrs.c"
diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index 54b9e93..fedc984 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -218,13 +218,6 @@ NodeImpl *NodeImpl::addChild(NodeImpl *)
return 0;
}
-#ifdef APPLE_CHANGES
-khtml::RenderObject *NodeImpl::renderer() const
-{
- return m_render;
-}
-
-#endif /* APPLE_CHANGES */
QString NodeImpl::toHTML() const
{
NodeImpl* fc = firstChild();
@@ -480,10 +473,10 @@ bool NodeImpl::dispatchEvent(EventImpl *evt, int &exceptioncode, bool tempEvent)
#ifdef APPLE_CHANGES
if (tempEvent && view && view->part() && view->part()->jScript())
view->part()->jScript()->finishedWithEvent(evt);
-#else /* not APPLE_CHANGES */
+#else
if (tempEvent && view && view->part()->jScript())
view->part()->jScript()->finishedWithEvent(evt);
-#endif /* not APPLE_CHANGES */
+#endif
return ret;
}
diff --git a/WebCore/khtml/xml/dom_nodeimpl.h b/WebCore/khtml/xml/dom_nodeimpl.h
index f8149e8..b68fb48 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.h
+++ b/WebCore/khtml/xml/dom_nodeimpl.h
@@ -260,11 +260,7 @@ public:
DocumentPtr *docPtr() const { return document; }
-#ifdef APPLE_CHANGES
- khtml::RenderObject *renderer() const;
-#else /* APPLE_CHANGES not defined */
khtml::RenderObject *renderer() const { return m_render; }
-#endif /* APPLE_CHANGES not defined */
khtml::RenderObject *nextRenderer();
void checkSetPrefix(const DOMString &_prefix, int &exceptioncode);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 295e3ac..9525e5d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-01 Darin Adler <darin at apple.com>
+
+ * Plugins.subproj/IFPlugin.m:
+ (-[IFPlugin _getPluginInfoForResourceFile:]): Fix off-by one error
+ that would cause a memory trasher if we had a 255-character string.
+
+ * WebView.subproj/IFHTMLView.mm:
+ * WebView.subproj/IFRenderNode.mm:
+ Touch these files so we don't have to do a full build of WebKit
+ for my WebCore changes.
+
2002-07-01 Maciej Stachowiak <mjs at apple.com>
Build fixes (don't know why a plain build didn't catch these):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 295e3ac..9525e5d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-01 Darin Adler <darin at apple.com>
+
+ * Plugins.subproj/IFPlugin.m:
+ (-[IFPlugin _getPluginInfoForResourceFile:]): Fix off-by one error
+ that would cause a memory trasher if we had a 255-character string.
+
+ * WebView.subproj/IFHTMLView.mm:
+ * WebView.subproj/IFRenderNode.mm:
+ Touch these files so we don't have to do a full build of WebKit
+ for my WebCore changes.
+
2002-07-01 Maciej Stachowiak <mjs at apple.com>
Build fixes (don't know why a plain build didn't catch these):
diff --git a/WebKit/Plugins.subproj/IFPlugin.m b/WebKit/Plugins.subproj/IFPlugin.m
index ad9e7cb..bab37ae 100644
--- a/WebKit/Plugins.subproj/IFPlugin.m
+++ b/WebKit/Plugins.subproj/IFPlugin.m
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -36,7 +36,7 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
- (void)_getPluginInfoForResourceFile:(SInt16)resRef
{
Str255 theString;
- char temp[255], description[255];
+ char temp[256], description[256];
NSMutableArray *mime; // mime is an array containing the mime type, extension(s) and descriptions for that mime type.
NSString *tempString;
uint n, i;
@@ -45,8 +45,9 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
UseResFile(resRef);
for(n=1, i=0; 1; n+=2, i++){
GetIndString(theString, 128, n);
+ if (theString[0] == 0)
+ break;
CopyPascalStringToC(theString, temp);
- if(!strcmp(temp, "")) break;
mime = [NSMutableArray arrayWithCapacity:3];
[mimeTypes insertObject:mime atIndex:i];
@@ -105,7 +106,7 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
}
resRef = FSOpenResFile(&fref, fsRdPerm);
- if(resRef <= noErr){
+ if(resRef == -1) {
WEBKITDEBUG("IFPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
return nil;
}
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index ad9e7cb..bab37ae 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -36,7 +36,7 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
- (void)_getPluginInfoForResourceFile:(SInt16)resRef
{
Str255 theString;
- char temp[255], description[255];
+ char temp[256], description[256];
NSMutableArray *mime; // mime is an array containing the mime type, extension(s) and descriptions for that mime type.
NSString *tempString;
uint n, i;
@@ -45,8 +45,9 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
UseResFile(resRef);
for(n=1, i=0; 1; n+=2, i++){
GetIndString(theString, 128, n);
+ if (theString[0] == 0)
+ break;
CopyPascalStringToC(theString, temp);
- if(!strcmp(temp, "")) break;
mime = [NSMutableArray arrayWithCapacity:3];
[mimeTypes insertObject:mime atIndex:i];
@@ -105,7 +106,7 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
}
resRef = FSOpenResFile(&fref, fsRdPerm);
- if(resRef <= noErr){
+ if(resRef == -1) {
WEBKITDEBUG("IFPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
return nil;
}
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index 25488dc..e6842cb 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -158,7 +158,7 @@
KHTMLView *widget = _private->widget;
if (widget && widget->part()->xmlDocImpl() &&
- widget->part()->xmlDocImpl()->renderer()){
+ widget->part()->xmlDocImpl()->renderer()) {
if (_private->needsToApplyStyles){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
@@ -186,7 +186,7 @@
[[self window] _setShouldPostEventNotifications: YES];
if (widget && widget->part()->xmlDocImpl() &&
- widget->part()->xmlDocImpl()->renderer()){
+ widget->part()->xmlDocImpl()->renderer()) {
if (_private->needsLayout){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
diff --git a/WebKit/WebView.subproj/IFRenderNode.mm b/WebKit/WebView.subproj/IFRenderNode.mm
index 0edde02..9477caf 100644
--- a/WebKit/WebView.subproj/IFRenderNode.mm
+++ b/WebKit/WebView.subproj/IFRenderNode.mm
@@ -62,7 +62,6 @@
{
[name release];
[children release];
-
[super dealloc];
}
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 25488dc..e6842cb 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -158,7 +158,7 @@
KHTMLView *widget = _private->widget;
if (widget && widget->part()->xmlDocImpl() &&
- widget->part()->xmlDocImpl()->renderer()){
+ widget->part()->xmlDocImpl()->renderer()) {
if (_private->needsToApplyStyles){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
@@ -186,7 +186,7 @@
[[self window] _setShouldPostEventNotifications: YES];
if (widget && widget->part()->xmlDocImpl() &&
- widget->part()->xmlDocImpl()->renderer()){
+ widget->part()->xmlDocImpl()->renderer()) {
if (_private->needsLayout){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
diff --git a/WebKit/WebView.subproj/WebRenderNode.m b/WebKit/WebView.subproj/WebRenderNode.m
index 0edde02..9477caf 100644
--- a/WebKit/WebView.subproj/WebRenderNode.m
+++ b/WebKit/WebView.subproj/WebRenderNode.m
@@ -62,7 +62,6 @@
{
[name release];
[children release];
-
[super dealloc];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list