<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[194303] trunk/Source</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194303">194303</a></dd>

<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>

<dt>Date</dt> <dd>2015-12-18 16:16:15 -0800 (Fri, 18 Dec 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Avoid triggering clang's -Wundefined-bool-conversion

https://bugs.webkit.org/show_bug.cgi?id=152408

Reviewed by Mark Lam.

Source/JavaScriptCore:

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:

Source/WebCore:

Remove use of ASSERT(this).

* dom/TreeScope.cpp:

(WebCore::TreeScope::adoptIfNeeded):

* page/Frame.cpp:

(WebCore::Frame::createView):

Source/WebKit2:

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):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreheapGCAssertionsh">trunk/Source/JavaScriptCore/heap/GCAssertions.h</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoredomTreeScopecpp">trunk/Source/WebCore/dom/TreeScope.cpp</a></li>

<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeJSNPObjectcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194302 => 194303)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-12-18 23:56:23 UTC (rev 194302)

+++ trunk/Source/JavaScriptCore/ChangeLog        2015-12-19 00:16:15 UTC (rev 194303)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2015-12-18  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;

+

+        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:

+

</ins><span class="cx"> 2015-12-18  Mark Lam  &lt;mark.lam@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Replace SpecialFastCase profiles with ResultProfiles.

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreheapGCAssertionsh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCAssertions.h (194302 => 194303)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/heap/GCAssertions.h        2015-12-18 23:56:23 UTC (rev 194302)

+++ trunk/Source/JavaScriptCore/heap/GCAssertions.h        2015-12-19 00:16:15 UTC (rev 194303)

</span><span class="lines">@@ -1,5 +1,6 @@

</span><span class="cx"> /*

</span><ins>+ * Copyright (C) 2015 Igalia S.L.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -40,9 +41,21 @@

</span><span class="cx">     RELEASE_ASSERT(object-&gt;inherits(classInfo)); \

</span><span class="cx"> } while (0)

</span><span class="cx"> 

</span><ins>+// Used to avoid triggering -Wundefined-bool-conversion.

+#define ASSERT_THIS_GC_OBJECT_LOOKS_VALID() do { \

+    RELEASE_ASSERT(this-&gt;structure()-&gt;structure() == this-&gt;structure()-&gt;structure()-&gt;structure()); \

+} while (0)

+

+#define ASSERT_THIS_GC_OBJECT_INHERITS(classInfo) do {\

+    ASSERT_THIS_GC_OBJECT_LOOKS_VALID(); \

+    RELEASE_ASSERT(this-&gt;inherits(classInfo)); \

+} while (0)

+

</ins><span class="cx"> #else

</span><span class="cx"> #define ASSERT_GC_OBJECT_LOOKS_VALID(cell) do { (void)cell; } while (0)

</span><span class="cx"> #define ASSERT_GC_OBJECT_INHERITS(object, classInfo) do { (void)object; (void)classInfo; } while (0)

</span><ins>+#define ASSERT_THIS_GC_OBJECT_LOOKS_VALID()

+#define ASSERT_THIS_GC_OBJECT_INHERITS(classInfo) do { (void)classInfo; } while (0)

</ins><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx"> #define STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(klass) static_assert(std::is_trivially_destructible&lt;klass&gt;::value, #klass &quot; must have a trivial destructor&quot;)

</span></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194302 => 194303)</h4>

<pre class="diff"><span>

<span class="info">--- 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)

</span><span class="lines">@@ -1,3 +1,17 @@

</span><ins>+2015-12-18  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;

+

+        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):

+

</ins><span class="cx"> 2015-12-18  Simon Fraser  &lt;simon.fraser@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Remove the 'ignoreViewportScalingConstraints' Setting, which was unused

</span></span></pre></div>

<a id="trunkSourceWebCoredomTreeScopecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeScope.cpp (194302 => 194303)</h4>

<pre class="diff"><span>

<span class="info">--- 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)

</span><span class="lines">@@ -284,7 +284,6 @@

</span><span class="cx"> 

</span><span class="cx"> void TreeScope::adoptIfNeeded(Node* node)

</span><span class="cx"> {

</span><del>-    ASSERT(this);

</del><span class="cx">     ASSERT(node);

</span><span class="cx">     ASSERT(!node-&gt;isDocumentNode());

</span><span class="cx">     ASSERT(!node-&gt;m_deletionHasBegun);

</span></span></pre></div>

<a id="trunkSourceWebCorepageFramecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (194302 => 194303)</h4>

<pre class="diff"><span>

<span class="info">--- 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)

</span><span class="lines">@@ -870,7 +870,6 @@

</span><span class="cx">     bool useFixedLayout, ScrollbarMode horizontalScrollbarMode, bool horizontalLock,

</span><span class="cx">     ScrollbarMode verticalScrollbarMode, bool verticalLock)

</span><span class="cx"> {

</span><del>-    ASSERT(this);

</del><span class="cx">     ASSERT(m_page);

</span><span class="cx"> 

</span><span class="cx">     bool isMainFrame = this-&gt;isMainFrame();

</span></span></pre></div>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194302 => 194303)</h4>

<pre class="diff"><span>

<span class="info">--- 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)

</span><span class="lines">@@ -1,3 +1,18 @@

</span><ins>+2015-12-18  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;

+

+        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):

+

</ins><span class="cx"> 2015-12-15  Anders Carlsson  &lt;andersca@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Get rid of WebDatabaseManager, it's been replaced by WebsiteDataStore

</span></span></pre></div>

<a id="trunkSourceWebKit2WebProcessPluginsNetscapeJSNPObjectcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (194302 => 194303)</h4>

<pre class="diff"><span>

<span class="info">--- 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)

</span><span class="lines">@@ -107,7 +107,7 @@

</span><span class="cx"> 

</span><span class="cx"> JSValue JSNPObject::callMethod(ExecState* exec, NPIdentifier methodName)

</span><span class="cx"> {

</span><del>-    ASSERT_GC_OBJECT_INHERITS(this, info());

</del><ins>+    ASSERT_THIS_GC_OBJECT_INHERITS(info());

</ins><span class="cx">     if (!m_npObject)

</span><span class="cx">         return throwInvalidAccessError(exec);

</span><span class="cx"> 

</span><span class="lines">@@ -151,7 +151,7 @@

</span><span class="cx"> 

</span><span class="cx"> JSC::JSValue JSNPObject::callObject(JSC::ExecState* exec)

</span><span class="cx"> {

</span><del>-    ASSERT_GC_OBJECT_INHERITS(this, info());

</del><ins>+    ASSERT_THIS_GC_OBJECT_INHERITS(info());

</ins><span class="cx">     if (!m_npObject)

</span><span class="cx">         return throwInvalidAccessError(exec);

</span><span class="cx"> 

</span><span class="lines">@@ -191,7 +191,7 @@

</span><span class="cx"> 

</span><span class="cx"> JSValue JSNPObject::callConstructor(ExecState* exec)

</span><span class="cx"> {

</span><del>-    ASSERT_GC_OBJECT_INHERITS(this, info());

</del><ins>+    ASSERT_THIS_GC_OBJECT_INHERITS(info());

</ins><span class="cx">     if (!m_npObject)

</span><span class="cx">         return throwInvalidAccessError(exec);

</span><span class="cx"> 

</span><span class="lines">@@ -351,7 +351,7 @@

</span><span class="cx"> 

</span><span class="cx"> bool JSNPObject::deleteProperty(ExecState* exec, NPIdentifier propertyName)

</span><span class="cx"> {

</span><del>-    ASSERT_GC_OBJECT_INHERITS(this, info());

</del><ins>+    ASSERT_THIS_GC_OBJECT_INHERITS(info());

</ins><span class="cx"> 

</span><span class="cx">     // If the propertyName is symbol.

</span><span class="cx">     if (!propertyName)

</span></span></pre>

</div>

</div>

</body>

</html>