Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (194302 => 194303)
--- trunk/Source/_javascript_Core/ChangeLog 2015-12-18 23:56:23 UTC (rev 194302)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-12-19 00:16:15 UTC (rev 194303)
@@ -1,3 +1,15 @@
+2015-12-18 Michael Catanzaro <[email protected]>
+
+ Avoid triggering clang's -Wundefined-bool-conversion
+ https://bugs.webkit.org/show_bug.cgi?id=152408
+
+ Reviewed by Mark Lam.
+
+ Add ASSERT_THIS_GC_OBJECT_LOOKS_VALID and ASSERT_THIS_GC_OBJECT_INHERITS to avoid use of
+ ASSERT(this) by ASSERT_GC_OBJECT_LOOKS_VALID and ASSERT_GC_OBJECT_INHERITS.
+
+ * heap/GCAssertions.h:
+
2015-12-18 Mark Lam <[email protected]>
Replace SpecialFastCase profiles with ResultProfiles.
Modified: trunk/Source/_javascript_Core/heap/GCAssertions.h (194302 => 194303)
--- trunk/Source/_javascript_Core/heap/GCAssertions.h 2015-12-18 23:56:23 UTC (rev 194302)
+++ trunk/Source/_javascript_Core/heap/GCAssertions.h 2015-12-19 00:16:15 UTC (rev 194303)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2015 Igalia S.L.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -40,9 +41,21 @@
RELEASE_ASSERT(object->inherits(classInfo)); \
} while (0)
+// Used to avoid triggering -Wundefined-bool-conversion.
+#define ASSERT_THIS_GC_OBJECT_LOOKS_VALID() do { \
+ RELEASE_ASSERT(this->structure()->structure() == this->structure()->structure()->structure()); \
+} while (0)
+
+#define ASSERT_THIS_GC_OBJECT_INHERITS(classInfo) do {\
+ ASSERT_THIS_GC_OBJECT_LOOKS_VALID(); \
+ RELEASE_ASSERT(this->inherits(classInfo)); \
+} while (0)
+
#else
#define ASSERT_GC_OBJECT_LOOKS_VALID(cell) do { (void)cell; } while (0)
#define ASSERT_GC_OBJECT_INHERITS(object, classInfo) do { (void)object; (void)classInfo; } while (0)
+#define ASSERT_THIS_GC_OBJECT_LOOKS_VALID()
+#define ASSERT_THIS_GC_OBJECT_INHERITS(classInfo) do { (void)classInfo; } while (0)
#endif
#define STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(klass) static_assert(std::is_trivially_destructible<klass>::value, #klass " must have a trivial destructor")
Modified: trunk/Source/WebCore/ChangeLog (194302 => 194303)
--- trunk/Source/WebCore/ChangeLog 2015-12-18 23:56:23 UTC (rev 194302)
+++ trunk/Source/WebCore/ChangeLog 2015-12-19 00:16:15 UTC (rev 194303)
@@ -1,3 +1,17 @@
+2015-12-18 Michael Catanzaro <[email protected]>
+
+ Avoid triggering clang's -Wundefined-bool-conversion
+ https://bugs.webkit.org/show_bug.cgi?id=152408
+
+ Reviewed by Mark Lam.
+
+ Remove use of ASSERT(this).
+
+ * dom/TreeScope.cpp:
+ (WebCore::TreeScope::adoptIfNeeded):
+ * page/Frame.cpp:
+ (WebCore::Frame::createView):
+
2015-12-18 Simon Fraser <[email protected]>
Remove the 'ignoreViewportScalingConstraints' Setting, which was unused
Modified: trunk/Source/WebCore/dom/TreeScope.cpp (194302 => 194303)
--- trunk/Source/WebCore/dom/TreeScope.cpp 2015-12-18 23:56:23 UTC (rev 194302)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2015-12-19 00:16:15 UTC (rev 194303)
@@ -284,7 +284,6 @@
void TreeScope::adoptIfNeeded(Node* node)
{
- ASSERT(this);
ASSERT(node);
ASSERT(!node->isDocumentNode());
ASSERT(!node->m_deletionHasBegun);
Modified: trunk/Source/WebCore/page/Frame.cpp (194302 => 194303)
--- trunk/Source/WebCore/page/Frame.cpp 2015-12-18 23:56:23 UTC (rev 194302)
+++ trunk/Source/WebCore/page/Frame.cpp 2015-12-19 00:16:15 UTC (rev 194303)
@@ -870,7 +870,6 @@
bool useFixedLayout, ScrollbarMode horizontalScrollbarMode, bool horizontalLock,
ScrollbarMode verticalScrollbarMode, bool verticalLock)
{
- ASSERT(this);
ASSERT(m_page);
bool isMainFrame = this->isMainFrame();
Modified: trunk/Source/WebKit2/ChangeLog (194302 => 194303)
--- trunk/Source/WebKit2/ChangeLog 2015-12-18 23:56:23 UTC (rev 194302)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-19 00:16:15 UTC (rev 194303)
@@ -1,3 +1,18 @@
+2015-12-18 Michael Catanzaro <[email protected]>
+
+ Avoid triggering clang's -Wundefined-bool-conversion
+ https://bugs.webkit.org/show_bug.cgi?id=152408
+
+ Reviewed by Mark Lam.
+
+ Use ASSERT_THIS_GC_OBJECT_INHERITS where needed.
+
+ * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+ (WebKit::JSNPObject::callMethod):
+ (WebKit::JSNPObject::callObject):
+ (WebKit::JSNPObject::callConstructor):
+ (WebKit::JSNPObject::deleteProperty):
+
2015-12-15 Anders Carlsson <[email protected]>
Get rid of WebDatabaseManager, it's been replaced by WebsiteDataStore
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (194302 => 194303)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2015-12-18 23:56:23 UTC (rev 194302)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2015-12-19 00:16:15 UTC (rev 194303)
@@ -107,7 +107,7 @@
JSValue JSNPObject::callMethod(ExecState* exec, NPIdentifier methodName)
{
- ASSERT_GC_OBJECT_INHERITS(this, info());
+ ASSERT_THIS_GC_OBJECT_INHERITS(info());
if (!m_npObject)
return throwInvalidAccessError(exec);
@@ -151,7 +151,7 @@
JSC::JSValue JSNPObject::callObject(JSC::ExecState* exec)
{
- ASSERT_GC_OBJECT_INHERITS(this, info());
+ ASSERT_THIS_GC_OBJECT_INHERITS(info());
if (!m_npObject)
return throwInvalidAccessError(exec);
@@ -191,7 +191,7 @@
JSValue JSNPObject::callConstructor(ExecState* exec)
{
- ASSERT_GC_OBJECT_INHERITS(this, info());
+ ASSERT_THIS_GC_OBJECT_INHERITS(info());
if (!m_npObject)
return throwInvalidAccessError(exec);
@@ -351,7 +351,7 @@
bool JSNPObject::deleteProperty(ExecState* exec, NPIdentifier propertyName)
{
- ASSERT_GC_OBJECT_INHERITS(this, info());
+ ASSERT_THIS_GC_OBJECT_INHERITS(info());
// If the propertyName is symbol.
if (!propertyName)
