<!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>[203334] trunk/Source/WebCore</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/203334">203334</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-07-17 12:12:49 -0700 (Sun, 17 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Exceptions logged to the JS console should use toString().
https://bugs.webkit.org/show_bug.cgi?id=159855
Reviewed by Darin Adler.
No new tests (No change in behavior).
* bindings/js/JSDOMBinding.cpp:
(WebCore::reportException):
* dom/DOMCoreException.h:
(WebCore::DOMCoreException::DOMCoreException):
* dom/ExceptionBase.cpp:
(WebCore::ExceptionBase::ExceptionBase):
(WebCore::ExceptionBase::toString):
(WebCore::ExceptionBase::consoleErrorMessage): Deleted.
* dom/ExceptionBase.h:
(WebCore::ExceptionBase::description): Deleted.
* svg/SVGException.h:
* xml/XPathException.h:
(WebCore::XPathException::XPathException):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDOMCoreExceptionh">trunk/Source/WebCore/dom/DOMCoreException.h</a></li>
<li><a href="#trunkSourceWebCoredomExceptionBasecpp">trunk/Source/WebCore/dom/ExceptionBase.cpp</a></li>
<li><a href="#trunkSourceWebCoredomExceptionBaseh">trunk/Source/WebCore/dom/ExceptionBase.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGExceptionh">trunk/Source/WebCore/svg/SVGException.h</a></li>
<li><a href="#trunkSourceWebCorexmlXPathExceptionh">trunk/Source/WebCore/xml/XPathException.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203333 => 203334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-17 16:47:55 UTC (rev 203333)
+++ trunk/Source/WebCore/ChangeLog 2016-07-17 19:12:49 UTC (rev 203334)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-07-17 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Exceptions logged to the JS console should use toString().
+ https://bugs.webkit.org/show_bug.cgi?id=159855
+
+ Reviewed by Darin Adler.
+
+ No new tests (No change in behavior).
+
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::reportException):
+
+ * dom/DOMCoreException.h:
+ (WebCore::DOMCoreException::DOMCoreException):
+
+ * dom/ExceptionBase.cpp:
+ (WebCore::ExceptionBase::ExceptionBase):
+ (WebCore::ExceptionBase::toString):
+ (WebCore::ExceptionBase::consoleErrorMessage): Deleted.
+ * dom/ExceptionBase.h:
+ (WebCore::ExceptionBase::description): Deleted.
+
+ * svg/SVGException.h:
+
+ * xml/XPathException.h:
+ (WebCore::XPathException::XPathException):
+
+2016-07-17 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Update DOMCoreException to use the description in toString().
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159857
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (203333 => 203334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-07-17 16:47:55 UTC (rev 203333)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-07-17 19:12:49 UTC (rev 203334)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> String errorMessage;
</span><span class="cx"> JSValue exceptionValue = exception->value();
</span><span class="cx"> if (ExceptionBase* exceptionBase = toExceptionBase(exceptionValue))
</span><del>- errorMessage = exceptionBase->consoleErrorMessage();
</del><ins>+ errorMessage = exceptionBase->toString();
</ins><span class="cx"> else {
</span><span class="cx"> // FIXME: <http://webkit.org/b/115087> Web Inspector: WebCore::reportException should not evaluate JavaScript handling exceptions
</span><span class="cx"> // If this is a custom exception object, call toString on it to try and get a nice string representation for the exception.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMCoreExceptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMCoreException.h (203333 => 203334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMCoreException.h 2016-07-17 16:47:55 UTC (rev 203333)
+++ trunk/Source/WebCore/dom/DOMCoreException.h 2016-07-17 19:12:49 UTC (rev 203334)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit DOMCoreException(const ExceptionCodeDescription& description)
</span><del>- : ExceptionBase(description, ExceptionBase::MessageSource::UseDescription)
</del><ins>+ : ExceptionBase(description)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomExceptionBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ExceptionBase.cpp (203333 => 203334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExceptionBase.cpp 2016-07-17 16:47:55 UTC (rev 203333)
+++ trunk/Source/WebCore/dom/ExceptionBase.cpp 2016-07-17 19:12:49 UTC (rev 203334)
</span><span class="lines">@@ -33,45 +33,29 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ExceptionBase::ExceptionBase(const ExceptionCodeDescription& description, MessageSource messageSource)
</del><ins>+ExceptionBase::ExceptionBase(const ExceptionCodeDescription& description)
</ins><span class="cx"> : m_code(description.code)
</span><span class="cx"> , m_name(description.name)
</span><del>- , m_description(description.description)
</del><ins>+ , m_message(description.description)
</ins><span class="cx"> , m_typeName(description.typeName)
</span><del>- , m_messageSource(messageSource)
</del><span class="cx"> {
</span><del>- if (messageSource == MessageSource::UseDescription) {
- m_message = m_description;
- return;
- }
-
- if (description.name)
- m_message = m_name + ": " + description.typeName + " Exception " + String::number(description.code);
- else
- m_message = makeString(description.typeName, " Exception ", String::number(description.code));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-String ExceptionBase::consoleErrorMessage() const
-{
- if (m_messageSource == MessageSource::UseDescription)
- return toString();
-
- return makeString(m_message, ": ", m_description);
-}
-
</del><span class="cx"> String ExceptionBase::toString() const
</span><span class="cx"> {
</span><del>- if (m_messageSource != MessageSource::UseDescription)
- return makeString("Error: ", m_message);
</del><ins>+ if (!m_toString.isEmpty())
+ return m_toString;
</ins><span class="cx">
</span><span class="cx"> String lastComponent;
</span><del>- if (!m_description.isEmpty())
- lastComponent = makeString(": ", m_description);
</del><ins>+ if (!m_message.isEmpty())
+ lastComponent = makeString(": ", m_message);
</ins><span class="cx">
</span><span class="cx"> if (m_name.isEmpty())
</span><del>- return makeString(m_typeName, " Exception", m_code ? makeString(" ", String::number(m_code)) : "", lastComponent);
</del><ins>+ m_toString = makeString(m_typeName, " Exception", m_code ? makeString(" ", String::number(m_code)) : "", lastComponent);
+ else
+ m_toString = makeString(m_name, " (", m_typeName, " Exception", m_code ? makeString(" ", String::number(m_code)) : "", ")", lastComponent);
</ins><span class="cx">
</span><del>- return makeString(m_name, " (", m_typeName, " Exception", m_code ? makeString(" ", String::number(m_code)) : "", ")", lastComponent);
</del><ins>+ return m_toString;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomExceptionBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ExceptionBase.h (203333 => 203334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExceptionBase.h 2016-07-17 16:47:55 UTC (rev 203333)
+++ trunk/Source/WebCore/dom/ExceptionBase.h 2016-07-17 19:12:49 UTC (rev 203334)
</span><span class="lines">@@ -42,28 +42,18 @@
</span><span class="cx"> unsigned short code() const { return m_code; }
</span><span class="cx"> String name() const { return m_name; }
</span><span class="cx"> String message() const { return m_message; }
</span><del>- String description() const { return m_description; }
</del><span class="cx">
</span><span class="cx"> String toString() const;
</span><span class="cx">
</span><del>- // FIXME: consoleErrorMessage is needed temporarily while bug 159822 is in progress.
- // Once 159822 is complete, consoleErrorMessage can be dropped and its callers will use toString instead.
- String consoleErrorMessage() const;
-
</del><span class="cx"> protected:
</span><del>- enum class MessageSource {
- ConstructMessage,
- UseDescription,
- };
- explicit ExceptionBase(const ExceptionCodeDescription&, MessageSource = MessageSource::ConstructMessage);
</del><ins>+ explicit ExceptionBase(const ExceptionCodeDescription&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> unsigned short m_code;
</span><span class="cx"> String m_name;
</span><span class="cx"> String m_message;
</span><del>- String m_description;
</del><span class="cx"> String m_typeName;
</span><del>- MessageSource m_messageSource;
</del><ins>+ mutable String m_toString;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGExceptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGException.h (203333 => 203334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGException.h 2016-07-17 16:47:55 UTC (rev 203333)
+++ trunk/Source/WebCore/svg/SVGException.h 2016-07-17 19:12:49 UTC (rev 203334)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SVGException(const ExceptionCodeDescription& description)
</span><del>- : ExceptionBase(description, ExceptionBase::MessageSource::UseDescription)
</del><ins>+ : ExceptionBase(description)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathExceptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathException.h (203333 => 203334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathException.h 2016-07-17 16:47:55 UTC (rev 203333)
+++ trunk/Source/WebCore/xml/XPathException.h 2016-07-17 19:12:49 UTC (rev 203334)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit XPathException(const ExceptionCodeDescription& description)
</span><del>- : ExceptionBase(description, ExceptionBase::MessageSource::UseDescription)
</del><ins>+ : ExceptionBase(description)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>