[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
gramps
gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:16:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit eea8bd440175aa313002be16d96c316a7cadca5f
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 18 07:49:20 2002 +0000
Reviewed by Joyce Chow.
* khtml/misc/arena.cpp:
* khtml/misc/arena.h:
* khtml/rendering/render_arena.cpp:
* khtml/rendering/render_arena.h:
* khtml/rendering/render_layer.cpp:
* khtml/rendering/render_layer.h:
Changed copyright and licensing.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3118 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e5da5f9..366ac4c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-12-17 Don Melton <gramps at apple.com>
+
+ Reviewed by Joyce Chow.
+
+ * khtml/misc/arena.cpp:
+ * khtml/misc/arena.h:
+ * khtml/rendering/render_arena.cpp:
+ * khtml/rendering/render_arena.h:
+ * khtml/rendering/render_layer.cpp:
+ * khtml/rendering/render_layer.h:
+
+ Changed copyright and licensing.
+
2002-12-17 David Hyatt <hyatt at apple.com>
NOWRAP was completely broken. This fixes the problem
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e5da5f9..366ac4c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-12-17 Don Melton <gramps at apple.com>
+
+ Reviewed by Joyce Chow.
+
+ * khtml/misc/arena.cpp:
+ * khtml/misc/arena.h:
+ * khtml/rendering/render_arena.cpp:
+ * khtml/rendering/render_arena.h:
+ * khtml/rendering/render_layer.cpp:
+ * khtml/rendering/render_layer.h:
+
+ Changed copyright and licensing.
+
2002-12-17 David Hyatt <hyatt at apple.com>
NOWRAP was completely broken. This fixes the problem
diff --git a/WebCore/khtml/misc/arena.cpp b/WebCore/khtml/misc/arena.cpp
index 013624f..cc820b8 100644
--- a/WebCore/khtml/misc/arena.cpp
+++ b/WebCore/khtml/misc/arena.cpp
@@ -1,7 +1,46 @@
-/* This is a direct port of Gecko's PLArena code. It is based on lifetime-based fast allocation, inspired by much prior art, including
- "Fast Allocation and Deallocation of Memory Based on Object Lifetimes"
- David R. Hanson, Software -- Practice and Experience, Vol. 20(1).
-*/
+/*
+ * Copyright (C) 1998-2000 Netscape Communications Corporation.
+ *
+ * Other contributors:
+ * Nick Blievers <nickb at adacel.com.au>
+ * Jeff Hostetler <jeff at nerdone.com>
+ * Tom Rini <trini at kernel.crashing.org>
+ * Raffaele Sena <raff at netwinder.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of either the Mozilla Public License Version 1.1, found at
+ * http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
+ * License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
+ * (the "GPL"), in which case the provisions of the MPL or the GPL are
+ * applicable instead of those above. If you wish to allow use of your
+ * version of this file only under the terms of one of those two
+ * licenses (the MPL or the GPL) and not to allow others to use your
+ * version of this file under the LGPL, indicate your decision by
+ * deletingthe provisions above and replace them with the notice and
+ * other provisions required by the MPL or the GPL, as the case may be.
+ * If you do not delete the provisions above, a recipient may use your
+ * version of this file under any of the LGPL, the MPL or the GPL.
+ */
+
+/*
+ * Lifetime-based fast allocation, inspired by much prior art, including
+ * "Fast Allocation and Deallocation of Memory Based on Object Lifetimes"
+ * David R. Hanson, Software -- Practice and Experience, Vol. 20(1).
+ */
#include <stdlib.h>
#include <string.h>
diff --git a/WebCore/khtml/misc/arena.h b/WebCore/khtml/misc/arena.h
index 6bbcc73..90eadcb 100644
--- a/WebCore/khtml/misc/arena.h
+++ b/WebCore/khtml/misc/arena.h
@@ -1,10 +1,44 @@
+/*
+ * Copyright (C) 1998-2000 Netscape Communications Corporation.
+ *
+ * Other contributors:
+ * Nick Blievers <nickb at adacel.com.au>
+ * Jeff Hostetler <jeff at nerdone.com>
+ * Tom Rini <trini at kernel.crashing.org>
+ * Raffaele Sena <raff at netwinder.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of either the Mozilla Public License Version 1.1, found at
+ * http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
+ * License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
+ * (the "GPL"), in which case the provisions of the MPL or the GPL are
+ * applicable instead of those above. If you wish to allow use of your
+ * version of this file only under the terms of one of those two
+ * licenses (the MPL or the GPL) and not to allow others to use your
+ * version of this file under the LGPL, indicate your decision by
+ * deletingthe provisions above and replace them with the notice and
+ * other provisions required by the MPL or the GPL, as the case may be.
+ * If you do not delete the provisions above, a recipient may use your
+ * version of this file under any of the LGPL, the MPL or the GPL.
+ */
+
#ifndef ARENA_H
#define ARENA_H
-// This code is a more-or-less direct port of the PLArena code found in the NSPR (the runtime
-// used by Gecko). This version is not thread safe. It sacrifices thread safety for speed
-// (no lock overhead when allocing out of the arena). -dwh
-
#define ARENA_ALIGN_MASK 3
typedef unsigned long uword;
diff --git a/WebCore/khtml/rendering/render_arena.cpp b/WebCore/khtml/rendering/render_arena.cpp
index 5ecb173..5059918 100644
--- a/WebCore/khtml/rendering/render_arena.cpp
+++ b/WebCore/khtml/rendering/render_arena.cpp
@@ -1,27 +1,37 @@
/*
- * This file contains the implementation of an arena allocation system for use by
- * render objects and temporaries allocated during layout and style resolution
- * of render objects. It is a direct port of Gecko's
- * FrameArena code (frame = render_object in Gecko).
- *
* Copyright (C) 2002 Apple Computer, Inc.
*
+ * Portions are Copyright (C) 1998 Netscape Communications Corporation.
+ *
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * Alternatively, the contents of this file may be used under the terms
+ * of either the Mozilla Public License Version 1.1, found at
+ * http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
+ * License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
+ * (the "GPL"), in which case the provisions of the MPL or the GPL are
+ * applicable instead of those above. If you wish to allow use of your
+ * version of this file only under the terms of one of those two
+ * licenses (the MPL or the GPL) and not to allow others to use your
+ * version of this file under the LGPL, indicate your decision by
+ * deletingthe provisions above and replace them with the notice and
+ * other provisions required by the MPL or the GPL, as the case may be.
+ * If you do not delete the provisions above, a recipient may use your
+ * version of this file under any of the LGPL, the MPL or the GPL.
*/
+
#include "render_arena.h"
RenderArena::RenderArena(unsigned int arenaSize)
diff --git a/WebCore/khtml/rendering/render_arena.h b/WebCore/khtml/rendering/render_arena.h
index 81cbccc..b753adf 100644
--- a/WebCore/khtml/rendering/render_arena.h
+++ b/WebCore/khtml/rendering/render_arena.h
@@ -1,30 +1,40 @@
-#ifndef RENDERARENA_H
-#define RENDERARENA_H
-
/*
- * This file contains the implementation of an arena allocation system for use by
- * render objects and temporaries allocated during layout and style resolution
- * of render objects. It is a direct port of Gecko's
- * FrameArena code (frame = render_object in Gecko).
- *
* Copyright (C) 2002 Apple Computer, Inc.
*
+ * Portions are Copyright (C) 1998 Netscape Communications Corporation.
+ *
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * Alternatively, the contents of this file may be used under the terms
+ * of either the Mozilla Public License Version 1.1, found at
+ * http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
+ * License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
+ * (the "GPL"), in which case the provisions of the MPL or the GPL are
+ * applicable instead of those above. If you wish to allow use of your
+ * version of this file only under the terms of one of those two
+ * licenses (the MPL or the GPL) and not to allow others to use your
+ * version of this file under the LGPL, indicate your decision by
+ * deletingthe provisions above and replace them with the notice and
+ * other provisions required by the MPL or the GPL, as the case may be.
+ * If you do not delete the provisions above, a recipient may use your
+ * version of this file under any of the LGPL, the MPL or the GPL.
*/
+
+#ifndef RENDERARENA_H
+#define RENDERARENA_H
+
#include "arena.h"
static const size_t gMaxRecycledSize = 400;
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 1ec1b1e..b9faf75 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -1,23 +1,44 @@
-/**
- * This file is part of the html renderer for KDE.
- *
+/*
* Copyright (C) 2002 Apple Computer, Inc.
*
+ * Portions are Copyright (C) 1998 Netscape Communications Corporation.
+ *
+ * Other contributors:
+ * Robert O'Callahan <roc+ at cs.cmu.edu>
+ * David Baron <dbaron at fas.harvard.edu>
+ * Christian Biesinger <cbiesinger at web.de>
+ * Randall Jesup <rjesup at wgate.com>
+ * Roland Mainz <roland.mainz at informatik.med.uni-giessen.de>
+ * Josh Soref <timeless at mac.com>
+ * Boris Zbarsky <bzbarsky at mit.edu>
+ *
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * Alternatively, the contents of this file may be used under the terms
+ * of either the Mozilla Public License Version 1.1, found at
+ * http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
+ * License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
+ * (the "GPL"), in which case the provisions of the MPL or the GPL are
+ * applicable instead of those above. If you wish to allow use of your
+ * version of this file only under the terms of one of those two
+ * licenses (the MPL or the GPL) and not to allow others to use your
+ * version of this file under the LGPL, indicate your decision by
+ * deletingthe provisions above and replace them with the notice and
+ * other provisions required by the MPL or the GPL, as the case may be.
+ * If you do not delete the provisions above, a recipient may use your
+ * version of this file under any of the LGPL, the MPL or the GPL.
*/
#include "render_layer.h"
diff --git a/WebCore/khtml/rendering/render_layer.h b/WebCore/khtml/rendering/render_layer.h
index fbefc17..416b035 100644
--- a/WebCore/khtml/rendering/render_layer.h
+++ b/WebCore/khtml/rendering/render_layer.h
@@ -1,26 +1,46 @@
/*
- * This file contains the implementation of the layering system for the compositing
- * of stacked layers (and for proper event handling with stacked layers).
- *
* Copyright (C) 2002 Apple Computer, Inc.
*
+ * Portions are Copyright (C) 1998 Netscape Communications Corporation.
+ *
+ * Other contributors:
+ * Robert O'Callahan <roc+ at cs.cmu.edu>
+ * David Baron <dbaron at fas.harvard.edu>
+ * Christian Biesinger <cbiesinger at web.de>
+ * Randall Jesup <rjesup at wgate.com>
+ * Roland Mainz <roland.mainz at informatik.med.uni-giessen.de>
+ * Josh Soref <timeless at mac.com>
+ * Boris Zbarsky <bzbarsky at mit.edu>
+ *
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * Alternatively, the contents of this file may be used under the terms
+ * of either the Mozilla Public License Version 1.1, found at
+ * http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
+ * License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
+ * (the "GPL"), in which case the provisions of the MPL or the GPL are
+ * applicable instead of those above. If you wish to allow use of your
+ * version of this file only under the terms of one of those two
+ * licenses (the MPL or the GPL) and not to allow others to use your
+ * version of this file under the LGPL, indicate your decision by
+ * deletingthe provisions above and replace them with the notice and
+ * other provisions required by the MPL or the GPL, as the case may be.
+ * If you do not delete the provisions above, a recipient may use your
+ * version of this file under any of the LGPL, the MPL or the GPL.
*/
-
+
#ifndef render_layer_h
#define render_layer_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list