Changeset 56579 in webkit

Timestamp:

Mar 25, 2010 4:48:30 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-25 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Add an ASSERT macro to the Chromium WebKit API
​https://bugs.webkit.org/show_bug.cgi?id=36545

• WebKit.gyp: Add WebCommon.cpp
• public/WebCommon.h: Add the Macro.
• public/WebPrivatePtr.h: (WebKit::WebPrivatePtr::~WebPrivatePtr): Verify the pointer is now 0.
• src/WebCommon.cpp: Added. (WebKit::failedAssertion): Calls the WTF assert function and then crashes.

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• public/WebCommon.h (modified) (2 diffs)
• public/WebPrivatePtr.h (modified) (1 diff)
• src/WebCommon.cpp (added)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-25  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add an ASSERT macro to the Chromium WebKit API
+        https://bugs.webkit.org/show_bug.cgi?id=36545
+
+        * WebKit.gyp:  Add WebCommon.cpp
+        * public/WebCommon.h:  Add the Macro.
+        * public/WebPrivatePtr.h:
+        (WebKit::WebPrivatePtr::~WebPrivatePtr):  Verify the pointer is now 0.
+        * src/WebCommon.cpp: Added.
+        (WebKit::failedAssertion): Calls the WTF assert function and then crashes.
+
 2010-03-25  Jochen Eisinger  <jochen@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -288 +288 @@
                 'src/WebCache.cpp',
                 'src/WebColor.cpp',
+                'src/WebCommon.cpp',
                 'src/WebCrossOriginPreflightResultCache.cpp',
                 'src/WebCString.cpp',

trunk/WebKit/chromium/public/WebCommon.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -90 +90 @@
 #endif
 
+// -----------------------------------------------------------------------------
+// Assertions
+
+WEBKIT_API void failedAssertion(const char* file, int line, const char* function, const char* assertion);
+
 } // namespace WebKit
 
+// Ideally, only use inside the public directory but outside of WEBKIT_IMPLEMENTATION blocks.  (Otherwise use WTF's ASSERT.)
+#if defined(NDEBUG)
+#define WEBKIT_ASSERT(assertion) ((void)0)
+#else
+#define WEBKIT_ASSERT(assertion) do { \
+    if (!(assertion)) \
+        failedAssertion(__FILE__, __LINE__, __FUNCTION__, #assertion); \
+} while (0)
 #endif
+
+#endif

trunk/WebKit/chromium/public/WebPrivatePtr.h

@@ -45 +45 @@
 public:
     WebPrivatePtr() : m_ptr(0) { }
+    ~WebPrivatePtr() { WEBKIT_ASSERT(!m_ptr); }
 
     bool isNull() const { return !m_ptr; }