[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 07:25:36 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 31c62db6ef6f2cab70fd6270e6af005ada8505e7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 21 23:14:32 2003 +0000
Reviewed by Maciej.
- Made it possible to run the layout tests in a Deployment version
* kwq/KWQRenderTreeDebug.cpp: (externalRepresentation): Remove #ifndef NDEBUG.
* kwq/KWQRenderTreeDebug.h: Remove #ifndef NDEBUG.
* kwq/WebCoreBridge.mm: (-[WebCoreBridge renderTreeAsExternalRepresentation]):
Remove #ifndef NDEBUG.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3686 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index dadff4a..f214c00 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
2003-02-21 Darin Adler <darin at apple.com>
+ Reviewed by Maciej.
+
+ - Made it possible to run the layout tests in a Deployment version
+
+ * kwq/KWQRenderTreeDebug.cpp: (externalRepresentation): Remove #ifndef NDEBUG.
+ * kwq/KWQRenderTreeDebug.h: Remove #ifndef NDEBUG.
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge renderTreeAsExternalRepresentation]):
+ Remove #ifndef NDEBUG.
+
+2003-02-21 Darin Adler <darin at apple.com>
+
* kwq/KWQRenderTreeDebug.cpp: (write): Add missing spaces in render
tree dump format.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index dadff4a..f214c00 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
2003-02-21 Darin Adler <darin at apple.com>
+ Reviewed by Maciej.
+
+ - Made it possible to run the layout tests in a Deployment version
+
+ * kwq/KWQRenderTreeDebug.cpp: (externalRepresentation): Remove #ifndef NDEBUG.
+ * kwq/KWQRenderTreeDebug.h: Remove #ifndef NDEBUG.
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge renderTreeAsExternalRepresentation]):
+ Remove #ifndef NDEBUG.
+
+2003-02-21 Darin Adler <darin at apple.com>
+
* kwq/KWQRenderTreeDebug.cpp: (write): Add missing spaces in render
tree dump format.
diff --git a/WebCore/kwq/KWQRenderTreeDebug.cpp b/WebCore/kwq/KWQRenderTreeDebug.cpp
index 1000ab0..372070a 100644
--- a/WebCore/kwq/KWQRenderTreeDebug.cpp
+++ b/WebCore/kwq/KWQRenderTreeDebug.cpp
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef NDEBUG
-
#include "KWQRenderTreeDebug.h"
#include "htmltags.h"
@@ -199,5 +197,3 @@ QString externalRepresentation(const RenderObject *o)
}
return s;
}
-
-#endif // NDEBUG
diff --git a/WebCore/kwq/KWQRenderTreeDebug.h b/WebCore/kwq/KWQRenderTreeDebug.h
index 037afd1..f0e9317 100644
--- a/WebCore/kwq/KWQRenderTreeDebug.h
+++ b/WebCore/kwq/KWQRenderTreeDebug.h
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef NDEBUG
-
#include "KWQString.h"
namespace khtml {
@@ -32,5 +30,3 @@ namespace khtml {
}
QString externalRepresentation(const khtml::RenderObject *);
-
-#endif
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index d5f20b5..b5a0412 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -764,11 +764,7 @@ static HTMLInputElementImpl *inputElementFromDOMElement(id <WebDOMElement>elemen
- (NSString *)renderTreeAsExternalRepresentation
{
-#ifdef NDEBUG
- return nil;
-#else
return externalRepresentation(_part->renderer()).getNSString();
-#endif
}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list