<!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>[199334] 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/199334">199334</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-04-11 21:15:16 -0700 (Mon, 11 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove UsePointersEvenForNonNullableObjectArguments from HTMLSelectElement
https://bugs.webkit.org/show_bug.cgi?id=156458
Reviewed by Chris Dumez.
Source/WebCore:
* bindings/js/JSHTMLOptionsCollectionCustom.cpp:
(WebCore::JSHTMLOptionsCollection::remove): Updated to call remove with a reference
rather than a pointer.
* bindings/js/JSHTMLSelectElementCustom.cpp:
(WebCore::JSHTMLSelectElement::remove): Updated to call remove with a reference
rather than a pointer.
(WebCore::selectIndexSetter): Updated to call setOption with a reference rather
than a pointer.
* bindings/scripts/CodeGeneratorGObject.pm:
(GenerateFunction): Added basic support for passing wrappers by reference.
GObject bindings already check arguments for null, so didn't add any new checks.
* bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
Updated.
* editing/FrameSelection.cpp: Updated includes.
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::setSelected): Pass reference when calling
HTMLSelectElement::optionSelectionStateChanged.
(WebCore::HTMLOptionElement::insertedInto): Ditto.
* html/HTMLOptionsCollection.cpp:
(WebCore::HTMLOptionsCollection::add): Moved null checking behavior here.
Preserves existing "silently do nothing if null".
(WebCore::HTMLOptionsCollection::remove): Changed function to take a reference
instead of a pointer.
* html/HTMLOptionsCollection.h: Updated include. Changed remove to take a
reference instead of a pointer.
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::add): Changed to take a reference instead of
a pointer. Also removed unneeded protect code, since insertBefore already
protects itself, and unneeded call to updateValidity, since the
HTMLSelectElement::childrenChanged function already calls updateValidity.
(WebCore::HTMLSelectElement::remove): Changed to take a reference instead
of a pointer.
(WebCore::HTMLSelectElement::setOption): Changed to take a reference
instead of a pointer.
(WebCore::HTMLSelectElement::setLength): Renamed "newLen" to "newLength".
Use Ref instead of RefPtr for result of createElement, which makes the
argument passed to add be a reference rather than a pointer.
(WebCore::HTMLSelectElement::willRespondToMouseClickEvents): Put the #if
for this here instead of in the header.
(WebCore::HTMLSelectElement::optionSelectionStateChanged): Changed to take
a reference instead of a pointer for the option element.
* html/HTMLSelectElement.h: Removed unneeded includes. Derive privately
from TypeAheadDataSource instead of publicly. Make all overrides final
except for the one that is actually overridden by a derived class.
Changed the arguments of the add, remove, setOption, and
optionSelectionStateChanged functions to be references instead of pointers.
Tweaked formatting a bit and used nullptr instead of 0. Override
willRespondToMouseClickEvents on all platforms, not just iOS.
* html/HTMLSelectElement.idl: Removed UsePointersEvenForNonNullableObjectArguments.
Removed a comment that is no longer needed. Made some types nullable to match
the specification, in places that currently have no effect on code generation.
Added a FIXME comment about the argument to setCustomValidity incorrectly being
marked as nullable.
Source/WebKit/win:
* DOMCoreClasses.cpp: Added now-needed include.
Source/WebKit2:
* WebProcess/Plugins/PDF/PDFPluginAnnotation.mm: Updated includes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLOptionsCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLSelectElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackFunctioncpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementcpp">trunk/Source/WebCore/html/HTMLOptionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectioncpp">trunk/Source/WebCore/html/HTMLOptionsCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionh">trunk/Source/WebCore/html/HTMLOptionsCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementh">trunk/Source/WebCore/html/HTMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementidl">trunk/Source/WebCore/html/HTMLSelectElement.idl</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinDOMCoreClassescpp">trunk/Source/WebKit/win/DOMCoreClasses.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginAnnotationmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/ChangeLog 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -1,3 +1,78 @@
</span><ins>+2016-04-11 Darin Adler <darin@apple.com>
+
+ Remove UsePointersEvenForNonNullableObjectArguments from HTMLSelectElement
+ https://bugs.webkit.org/show_bug.cgi?id=156458
+
+ Reviewed by Chris Dumez.
+
+ * bindings/js/JSHTMLOptionsCollectionCustom.cpp:
+ (WebCore::JSHTMLOptionsCollection::remove): Updated to call remove with a reference
+ rather than a pointer.
+
+ * bindings/js/JSHTMLSelectElementCustom.cpp:
+ (WebCore::JSHTMLSelectElement::remove): Updated to call remove with a reference
+ rather than a pointer.
+ (WebCore::selectIndexSetter): Updated to call setOption with a reference rather
+ than a pointer.
+
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GenerateFunction): Added basic support for passing wrappers by reference.
+ GObject bindings already check arguments for null, so didn't add any new checks.
+
+ * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ Updated.
+
+ * editing/FrameSelection.cpp: Updated includes.
+
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::setSelected): Pass reference when calling
+ HTMLSelectElement::optionSelectionStateChanged.
+ (WebCore::HTMLOptionElement::insertedInto): Ditto.
+
+ * html/HTMLOptionsCollection.cpp:
+ (WebCore::HTMLOptionsCollection::add): Moved null checking behavior here.
+ Preserves existing "silently do nothing if null".
+ (WebCore::HTMLOptionsCollection::remove): Changed function to take a reference
+ instead of a pointer.
+
+ * html/HTMLOptionsCollection.h: Updated include. Changed remove to take a
+ reference instead of a pointer.
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::add): Changed to take a reference instead of
+ a pointer. Also removed unneeded protect code, since insertBefore already
+ protects itself, and unneeded call to updateValidity, since the
+ HTMLSelectElement::childrenChanged function already calls updateValidity.
+ (WebCore::HTMLSelectElement::remove): Changed to take a reference instead
+ of a pointer.
+ (WebCore::HTMLSelectElement::setOption): Changed to take a reference
+ instead of a pointer.
+ (WebCore::HTMLSelectElement::setLength): Renamed "newLen" to "newLength".
+ Use Ref instead of RefPtr for result of createElement, which makes the
+ argument passed to add be a reference rather than a pointer.
+ (WebCore::HTMLSelectElement::willRespondToMouseClickEvents): Put the #if
+ for this here instead of in the header.
+ (WebCore::HTMLSelectElement::optionSelectionStateChanged): Changed to take
+ a reference instead of a pointer for the option element.
+
+ * html/HTMLSelectElement.h: Removed unneeded includes. Derive privately
+ from TypeAheadDataSource instead of publicly. Make all overrides final
+ except for the one that is actually overridden by a derived class.
+ Changed the arguments of the add, remove, setOption, and
+ optionSelectionStateChanged functions to be references instead of pointers.
+ Tweaked formatting a bit and used nullptr instead of 0. Override
+ willRespondToMouseClickEvents on all platforms, not just iOS.
+
+ * html/HTMLSelectElement.idl: Removed UsePointersEvenForNonNullableObjectArguments.
+ Removed a comment that is no longer needed. Made some types nullable to match
+ the specification, in places that currently have no effect on code generation.
+ Added a FIXME comment about the argument to setCustomValidity incorrectly being
+ marked as nullable.
+
</ins><span class="cx"> 2016-04-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Use WeakPtrs to avoid using deallocated Widgets and ScrollableAreas
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLOptionsCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> // The argument can be an HTMLOptionElement or an index.
</span><span class="cx"> JSValue argument = state.argument(0);
</span><span class="cx"> if (HTMLOptionElement* option = JSHTMLOptionElement::toWrapped(argument))
</span><del>- wrapped().remove(option);
</del><ins>+ wrapped().remove(*option);
</ins><span class="cx"> else
</span><span class="cx"> wrapped().remove(argument.toInt32(&state));
</span><span class="cx"> return jsUndefined();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLSelectElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> // The HTMLSelectElement::remove() function can take either an option object or the index of an option.
</span><span class="cx"> if (HTMLOptionElement* option = JSHTMLOptionElement::toWrapped(state.argument(0)))
</span><del>- select.remove(option);
</del><ins>+ select.remove(*option);
</ins><span class="cx"> else
</span><span class="cx"> select.removeByIndex(state.argument(0).toInt32(&state));
</span><span class="cx"> }
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> if (!option)
</span><span class="cx"> ec = TYPE_MISMATCH_ERR;
</span><span class="cx"> else
</span><del>- select->setOption(index, option, ec);
</del><ins>+ select->setOption(index, *option, ec);
</ins><span class="cx"> setDOMException(exec, ec);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -1109,6 +1109,9 @@
</span><span class="cx"> }
</span><span class="cx"> if ($paramIsGDOMType || ($paramIDLType eq "DOMString")) {
</span><span class="cx"> $paramName = "converted" . $codeGenerator->WK_ucfirst($paramName);
</span><ins>+ if ($prefix ne "set_" && $codeGenerator->ShouldPassWrapperByReference($param, $parentNode)) {
+ $paramName = "*$paramName";
+ }
</ins><span class="cx"> }
</span><span class="cx"> if ($paramIDLType eq "NodeFilter" || $paramIDLType eq "XPathNSResolver") {
</span><span class="cx"> $paramName = "WTF::getPtr(" . $paramName . ")";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_NODE(nextChild));
</span><span class="cx"> WebCore::TestActiveDOMObject* item = WebKit::core(self);
</span><span class="cx"> WebCore::Node* convertedNextChild = WebKit::core(nextChild);
</span><del>- item->excitingFunction(convertedNextChild);
</del><ins>+ item->excitingFunction(*convertedNextChild);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkit_dom_test_active_dom_object_post_message(WebKitDOMTestActiveDOMObject* self, const gchar* message)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_FLOAT32ARRAY(arrayParam), FALSE);
</span><span class="cx"> WebCore::TestCallback* item = WebKit::core(self);
</span><span class="cx"> WebCore::Float32Array* convertedArrayParam = WebKit::core(arrayParam);
</span><del>- gboolean result = item->callbackWithArrayParam(convertedArrayParam);
</del><ins>+ gboolean result = item->callbackWithArrayParam(*convertedArrayParam);
</ins><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_DOM_STRING_LIST(listParam), FALSE);
</span><span class="cx"> WebCore::TestCallback* item = WebKit::core(self);
</span><span class="cx"> WebCore::DOMStringList* convertedListParam = WebKit::core(listParam);
</span><del>- gboolean result = item->callbackWithStringList(convertedListParam);
</del><ins>+ gboolean result = item->callbackWithStringList(*convertedListParam);
</ins><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_NODE(testNodeParam), FALSE);
</span><span class="cx"> WebCore::TestCallback* item = WebKit::core(self);
</span><span class="cx"> WebCore::TestNode* convertedTestNodeParam = WebKit::core(testNodeParam);
</span><del>- gboolean result = item->callbackRequiresThisToPass(longParam, convertedTestNodeParam);
</del><ins>+ gboolean result = item->callbackRequiresThisToPass(longParam, *convertedTestNodeParam);
</ins><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_FLOAT32ARRAY(arrayParam), FALSE);
</span><span class="cx"> WebCore::TestCallbackFunction* item = WebKit::core(self);
</span><span class="cx"> WebCore::Float32Array* convertedArrayParam = WebKit::core(arrayParam);
</span><del>- gboolean result = item->callbackWithArrayParam(convertedArrayParam);
</del><ins>+ gboolean result = item->callbackWithArrayParam(*convertedArrayParam);
</ins><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_DOM_STRING_LIST(listParam), FALSE);
</span><span class="cx"> WebCore::TestCallbackFunction* item = WebKit::core(self);
</span><span class="cx"> WebCore::DOMStringList* convertedListParam = WebKit::core(listParam);
</span><del>- gboolean result = item->callbackWithStringList(convertedListParam);
</del><ins>+ gboolean result = item->callbackWithStringList(*convertedListParam);
</ins><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_NODE(testNodeParam), FALSE);
</span><span class="cx"> WebCore::TestCallbackFunction* item = WebKit::core(self);
</span><span class="cx"> WebCore::TestNode* convertedTestNodeParam = WebKit::core(testNodeParam);
</span><del>- gboolean result = item->callbackRequiresThisToPass(longParam, convertedTestNodeParam);
</del><ins>+ gboolean result = item->callbackRequiresThisToPass(longParam, *convertedTestNodeParam);
</ins><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->implementsMethod2(convertedStrArg, convertedObjArg, ec));
</del><ins>+ RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->implementsMethod2(convertedStrArg, *convertedObjArg, ec));
</ins><span class="cx"> if (ec) {
</span><span class="cx"> WebCore::ExceptionCodeDescription ecdesc(ec);
</span><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(*item, convertedStrArg, convertedObjArg, ec));
</del><ins>+ RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(*item, convertedStrArg, *convertedObjArg, ec));
</ins><span class="cx"> if (ec) {
</span><span class="cx"> WebCore::ExceptionCodeDescription ecdesc(ec);
</span><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -1216,7 +1216,7 @@
</span><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><del>- item->voidMethodWithArgs(longArg, convertedStrArg, convertedObjArg);
</del><ins>+ item->voidMethodWithArgs(longArg, convertedStrArg, *convertedObjArg);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gint8 webkit_dom_test_obj_byte_method(WebKitDOMTestObj* self)
</span><span class="lines">@@ -1237,7 +1237,7 @@
</span><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><del>- gint8 result = item->byteMethodWithArgs(byteArg, convertedStrArg, convertedObjArg);
</del><ins>+ gint8 result = item->byteMethodWithArgs(byteArg, convertedStrArg, *convertedObjArg);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><del>- guint8 result = item->octetMethodWithArgs(octetArg, convertedStrArg, convertedObjArg);
</del><ins>+ guint8 result = item->octetMethodWithArgs(octetArg, convertedStrArg, *convertedObjArg);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1281,7 +1281,7 @@
</span><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><del>- glong result = item->longMethodWithArgs(longArg, convertedStrArg, convertedObjArg);
</del><ins>+ glong result = item->longMethodWithArgs(longArg, convertedStrArg, *convertedObjArg);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1303,7 +1303,7 @@
</span><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><del>- RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->objMethodWithArgs(longArg, convertedStrArg, convertedObjArg));
</del><ins>+ RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->objMethodWithArgs(longArg, convertedStrArg, *convertedObjArg));
</ins><span class="cx"> return WebKit::kit(gobjectResult.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1375,7 +1375,7 @@
</span><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(convertedStrArg, convertedObjArg, ec));
</del><ins>+ RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(convertedStrArg, *convertedObjArg, ec));
</ins><span class="cx"> if (ec) {
</span><span class="cx"> WebCore::ExceptionCodeDescription ecdesc(ec);
</span><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="lines">@@ -1646,7 +1646,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_TEST_NODE(value));
</span><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><span class="cx"> WebCore::TestNode* convertedValue = WebKit::core(value);
</span><del>- item->convert1(convertedValue);
</del><ins>+ item->convert1(*convertedValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkit_dom_test_obj_convert2(WebKitDOMTestObj* self, WebKitDOMTestNode* value)
</span><span class="lines">@@ -1733,7 +1733,7 @@
</span><span class="cx"> WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
</span><span class="cx"> WebCore::long[]* convertedArray = WebKit::core(array);
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- RefPtr<WebCore::bool> gobjectResult = WTF::getPtr(item->strictFunctionWithArray(convertedObjArg, array, ec));
</del><ins>+ RefPtr<WebCore::bool> gobjectResult = WTF::getPtr(item->strictFunctionWithArray(*convertedObjArg, array, ec));
</ins><span class="cx"> if (ec) {
</span><span class="cx"> WebCore::ExceptionCodeDescription ecdesc(ec);
</span><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="lines">@@ -1770,7 +1770,7 @@
</span><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><span class="cx"> WebCore::Node* convertedHead = WebKit::core(head);
</span><span class="cx"> WebCore::Node* convertedTail = WebKit::core(tail);
</span><del>- item->variadicNodeMethod(convertedHead, convertedTail);
</del><ins>+ item->variadicNodeMethod(*convertedHead, convertedTail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkit_dom_test_obj_any(WebKitDOMTestObj* self, gfloat a, glong b)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "EditorClient.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><ins>+#include "Event.h"
</ins><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="lines">@@ -46,8 +47,8 @@
</span><span class="cx"> #include "HTMLFormElement.h"
</span><span class="cx"> #include "HTMLFrameElementBase.h"
</span><span class="cx"> #include "HTMLInputElement.h"
</span><ins>+#include "HTMLNames.h"
</ins><span class="cx"> #include "HTMLSelectElement.h"
</span><del>-#include "HTMLNames.h"
</del><span class="cx"> #include "HitTestRequest.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "InlineTextBox.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> setSelectedState(selected);
</span><span class="cx">
</span><span class="cx"> if (HTMLSelectElement* select = ownerSelectElement())
</span><del>- select->optionSelectionStateChanged(this, selected);
</del><ins>+ select->optionSelectionStateChanged(*this, selected);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLOptionElement::setSelectedState(bool selected)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> // FIXME: Might be better to call this unconditionally, always passing m_isSelected,
</span><span class="cx"> // rather than only calling it if we are selected.
</span><span class="cx"> if (m_isSelected)
</span><del>- select->optionSelectionStateChanged(this, true);
</del><ins>+ select->optionSelectionStateChanged(*this, true);
</ins><span class="cx"> select->scrollToSelection();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -38,7 +38,9 @@
</span><span class="cx">
</span><span class="cx"> void HTMLOptionsCollection::add(HTMLElement* element, HTMLElement* beforeElement, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- selectElement().add(element, beforeElement, ec);
</del><ins>+ if (!element)
+ return;
+ selectElement().add(*element, beforeElement, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLOptionsCollection::add(HTMLElement* element, int beforeIndex, ExceptionCode& ec)
</span><span class="lines">@@ -51,7 +53,7 @@
</span><span class="cx"> selectElement().removeByIndex(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLOptionsCollection::remove(HTMLOptionElement* option)
</del><ins>+void HTMLOptionsCollection::remove(HTMLOptionElement& option)
</ins><span class="cx"> {
</span><span class="cx"> selectElement().remove(option);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.h (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.h 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #define HTMLOptionsCollection_h
</span><span class="cx">
</span><span class="cx"> #include "CachedHTMLCollection.h"
</span><ins>+#include "HTMLOptionElement.h"
</ins><span class="cx"> #include "HTMLSelectElement.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx"> void add(HTMLElement*, HTMLElement* beforeElement, ExceptionCode&);
</span><span class="cx"> void add(HTMLElement*, int beforeIndex, ExceptionCode&);
</span><span class="cx"> void remove(int index);
</span><del>- void remove(HTMLOptionElement*);
</del><ins>+ void remove(HTMLOptionElement&);
</ins><span class="cx">
</span><span class="cx"> int selectedIndex() const;
</span><span class="cx"> void setSelectedIndex(int);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -220,19 +220,14 @@
</span><span class="cx"> return lastSelectedListIndex();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::add(HTMLElement* element, HTMLElement* beforeElement, ExceptionCode& ec)
</del><ins>+void HTMLSelectElement::add(HTMLElement& element, HTMLElement* beforeElement, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!element || !(is<HTMLOptionElement>(*element) || element->hasTagName(hrTag) || is<HTMLOptGroupElement>(*element)))
</del><ins>+ if (!(is<HTMLOptionElement>(element) || is<HTMLHRElement>(element) || is<HTMLOptGroupElement>(element)))
</ins><span class="cx"> return;
</span><del>-
- // Make sure the element is ref'd and deref'd so we don't leak it.
- Ref<HTMLElement> protectNewChild(*element);
-
- insertBefore(*element, beforeElement, ec);
- updateValidity();
</del><ins>+ insertBefore(element, beforeElement, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::add(HTMLElement* element, int beforeIndex, ExceptionCode& ec)
</del><ins>+void HTMLSelectElement::add(HTMLElement& element, int beforeIndex, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> add(element, item(beforeIndex), ec);
</span><span class="cx"> }
</span><span class="lines">@@ -246,12 +241,12 @@
</span><span class="cx"> listItems()[listIndex]->remove(IGNORE_EXCEPTION);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::remove(HTMLOptionElement* option)
</del><ins>+void HTMLSelectElement::remove(HTMLOptionElement& option)
</ins><span class="cx"> {
</span><del>- if (option->ownerSelectElement() != this)
</del><ins>+ if (option.ownerSelectElement() != this)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- option->remove(IGNORE_EXCEPTION);
</del><ins>+ option.remove(IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String HTMLSelectElement::value() const
</span><span class="lines">@@ -435,7 +430,7 @@
</span><span class="cx"> return options()->item(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::setOption(unsigned index, HTMLOptionElement* option, ExceptionCode& ec)
</del><ins>+void HTMLSelectElement::setOption(unsigned index, HTMLOptionElement& option, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> ec = 0;
</span><span class="cx"> if (index > maxSelectItems - 1)
</span><span class="lines">@@ -453,22 +448,21 @@
</span><span class="cx"> // Finally add the new element.
</span><span class="cx"> if (!ec) {
</span><span class="cx"> add(option, before.get(), ec);
</span><del>- if (diff >= 0 && option->selected())
</del><ins>+ if (diff >= 0 && option.selected())
</ins><span class="cx"> optionSelectionStateChanged(option, true);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::setLength(unsigned newLen, ExceptionCode& ec)
</del><ins>+void HTMLSelectElement::setLength(unsigned newLength, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> ec = 0;
</span><del>- if (newLen > maxSelectItems)
- newLen = maxSelectItems;
- int diff = length() - newLen;
</del><ins>+ if (newLength > maxSelectItems)
+ newLength = maxSelectItems;
+ int diff = length() - newLength;
</ins><span class="cx">
</span><span class="cx"> if (diff < 0) { // Add dummy elements.
</span><span class="cx"> do {
</span><del>- RefPtr<Element> option = document().createElement(optionTag, false);
- ASSERT(option);
</del><ins>+ auto option = document().createElement(optionTag, false);
</ins><span class="cx"> add(downcast<HTMLElement>(option.get()), nullptr, ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> break;
</span><span class="lines">@@ -481,7 +475,7 @@
</span><span class="cx"> Vector<Ref<Element>> itemsToRemove;
</span><span class="cx"> size_t optionIndex = 0;
</span><span class="cx"> for (auto& item : items) {
</span><del>- if (is<HTMLOptionElement>(*item) && optionIndex++ >= newLen) {
</del><ins>+ if (is<HTMLOptionElement>(*item) && optionIndex++ >= newLength) {
</ins><span class="cx"> ASSERT(item->parentNode());
</span><span class="cx"> itemsToRemove.append(*item);
</span><span class="cx"> }
</span><span class="lines">@@ -500,12 +494,14 @@
</span><span class="cx"> return isRequired();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> bool HTMLSelectElement::willRespondToMouseClickEvents()
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> return !isDisabledFormControl();
</span><del>-}
</del><ins>+#else
+ return HTMLFormControlElementWithState::willRespondToMouseClickEvents();
</ins><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> // Returns the 1st valid item |skip| items from |listIndex| in direction |direction| if there is one.
</span><span class="cx"> // Otherwise, it returns the valid item closest to that boundary which is past |listIndex| if there is one.
</span><span class="lines">@@ -845,11 +841,11 @@
</span><span class="cx"> selectOption(index, DeselectOtherOptions);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::optionSelectionStateChanged(HTMLOptionElement* option, bool optionIsSelected)
</del><ins>+void HTMLSelectElement::optionSelectionStateChanged(HTMLOptionElement& option, bool optionIsSelected)
</ins><span class="cx"> {
</span><del>- ASSERT(option->ownerSelectElement() == this);
</del><ins>+ ASSERT(option.ownerSelectElement() == this);
</ins><span class="cx"> if (optionIsSelected)
</span><del>- selectOption(option->index());
</del><ins>+ selectOption(option.index());
</ins><span class="cx"> else if (!usesMenuList())
</span><span class="cx"> selectOption(-1);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.h 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -26,17 +26,14 @@
</span><span class="cx"> #ifndef HTMLSelectElement_h
</span><span class="cx"> #define HTMLSelectElement_h
</span><span class="cx">
</span><del>-#include "Event.h"
</del><span class="cx"> #include "HTMLFormControlElementWithState.h"
</span><del>-#include "HTMLOptionElement.h"
</del><span class="cx"> #include "TypeAhead.h"
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class HTMLOptionsCollection;
</span><span class="cx">
</span><del>-class HTMLSelectElement : public HTMLFormControlElementWithState, public TypeAheadDataSource {
</del><ins>+class HTMLSelectElement : public HTMLFormControlElementWithState, private TypeAheadDataSource {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLSelectElement> create(const QualifiedName&, Document&, HTMLFormElement*);
</span><span class="cx">
</span><span class="lines">@@ -45,9 +42,8 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void optionSelectedByUser(int index, bool dispatchChangeEvent, bool allowMultipleSelection = false);
</span><span class="cx">
</span><del>- // For ValidityState
- String validationMessage() const override;
- bool valueMissing() const override;
</del><ins>+ String validationMessage() const final;
+ bool valueMissing() const final;
</ins><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><span class="cx">
</span><span class="lines">@@ -56,13 +52,12 @@
</span><span class="cx">
</span><span class="cx"> bool usesMenuList() const;
</span><span class="cx">
</span><del>- void add(HTMLElement*, HTMLElement* beforeElement, ExceptionCode&);
- void add(HTMLElement*, int beforeIndex, ExceptionCode&);
</del><ins>+ void add(HTMLElement&, HTMLElement* beforeElement, ExceptionCode&);
+ void add(HTMLElement&, int beforeIndex, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> using Node::remove;
</span><del>- // Should be remove(int) but it conflicts with Node::remove(ExceptionCode&).
- void removeByIndex(int);
- void remove(HTMLOptionElement*);
</del><ins>+ void remove(HTMLOptionElement&);
+ void removeByIndex(int); // Should be remove(int) but that conflicts with Node::remove(ExceptionCode&).
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String value() const;
</span><span class="cx"> void setValue(const String&);
</span><span class="lines">@@ -78,14 +73,14 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT const Vector<HTMLElement*>& listItems() const;
</span><span class="cx">
</span><del>- void accessKeyAction(bool sendMouseEvents) override;
</del><ins>+ void accessKeyAction(bool sendMouseEvents) final;
</ins><span class="cx"> void accessKeySetSelectedIndex(int);
</span><span class="cx">
</span><span class="cx"> void setMultiple(bool);
</span><span class="cx">
</span><span class="cx"> void setSize(unsigned);
</span><span class="cx">
</span><del>- void setOption(unsigned index, HTMLOptionElement*, ExceptionCode&);
</del><ins>+ void setOption(unsigned index, HTMLOptionElement&, ExceptionCode&);
</ins><span class="cx"> void setLength(unsigned, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> HTMLOptionElement* namedItem(const AtomicString& name);
</span><span class="lines">@@ -95,10 +90,6 @@
</span><span class="cx">
</span><span class="cx"> void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- bool willRespondToMouseClickEvents() override;
-#endif
-
</del><span class="cx"> bool canSelectAll() const;
</span><span class="cx"> void selectAll();
</span><span class="cx"> int listToOptionIndex(int listIndex) const;
</span><span class="lines">@@ -109,43 +100,44 @@
</span><span class="cx"> void setActiveSelectionAnchorIndex(int);
</span><span class="cx"> void setActiveSelectionEndIndex(int);
</span><span class="cx"> void updateListBoxSelection(bool deselectOtherOptions);
</span><del>-
</del><ins>+
</ins><span class="cx"> // For use in the implementation of HTMLOptionElement.
</span><del>- void optionSelectionStateChanged(HTMLOptionElement*, bool optionIsSelected);
</del><ins>+ void optionSelectionStateChanged(HTMLOptionElement&, bool optionIsSelected);
</ins><span class="cx"> bool allowsNonContiguousSelection() const { return m_allowsNonContiguousSelection; };
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> HTMLSelectElement(const QualifiedName&, Document&, HTMLFormElement*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- const AtomicString& formControlType() const override;
</del><ins>+ const AtomicString& formControlType() const final;
</ins><span class="cx">
</span><del>- bool isKeyboardFocusable(KeyboardEvent*) const override;
- bool isMouseFocusable() const override;
</del><ins>+ bool isKeyboardFocusable(KeyboardEvent*) const final;
+ bool isMouseFocusable() const final;
</ins><span class="cx">
</span><span class="cx"> void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection) final;
</span><span class="cx"> void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) final;
</span><span class="cx">
</span><del>- bool canStartSelection() const override { return false; }
</del><ins>+ bool canStartSelection() const final { return false; }
</ins><span class="cx">
</span><span class="cx"> bool canHaveUserAgentShadowRoot() const final { return true; }
</span><span class="cx">
</span><del>- bool isEnumeratable() const override { return true; }
- bool supportLabels() const override { return true; }
</del><ins>+ bool isEnumeratable() const final { return true; }
+ bool supportLabels() const final { return true; }
</ins><span class="cx">
</span><del>- FormControlState saveFormControlState() const override;
- void restoreFormControlState(const FormControlState&) override;
</del><ins>+ FormControlState saveFormControlState() const final;
+ void restoreFormControlState(const FormControlState&) final;
</ins><span class="cx">
</span><del>- void parseAttribute(const QualifiedName&, const AtomicString&) override;
- bool isPresentationAttribute(const QualifiedName&) const override;
</del><ins>+ void parseAttribute(const QualifiedName&, const AtomicString&) final;
+ bool isPresentationAttribute(const QualifiedName&) const final;
</ins><span class="cx">
</span><del>- bool childShouldCreateRenderer(const Node&) const override;
- RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
- bool appendFormData(FormDataList&, bool) override;
</del><ins>+ bool childShouldCreateRenderer(const Node&) const final;
+ RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) final;
+ bool appendFormData(FormDataList&, bool) final;
</ins><span class="cx">
</span><del>- void reset() override;
</del><ins>+ void reset() final;
</ins><span class="cx">
</span><del>- void defaultEventHandler(Event*) override;
</del><ins>+ void defaultEventHandler(Event*) final;
+ bool willRespondToMouseClickEvents() final;
</ins><span class="cx">
</span><span class="cx"> void dispatchChangeEventForMenuList();
</span><span class="cx">
</span><span class="lines">@@ -153,14 +145,14 @@
</span><span class="cx">
</span><span class="cx"> void recalcListItems(bool updateSelectedStates = true) const;
</span><span class="cx">
</span><del>- void deselectItems(HTMLOptionElement* excludeElement = 0);
</del><ins>+ void deselectItems(HTMLOptionElement* excludeElement = nullptr);
</ins><span class="cx"> void typeAheadFind(KeyboardEvent&);
</span><span class="cx"> void saveLastSelection();
</span><span class="cx">
</span><del>- InsertionNotificationRequest insertedInto(ContainerNode&) override;
</del><ins>+ InsertionNotificationRequest insertedInto(ContainerNode&) final;
</ins><span class="cx">
</span><del>- bool isOptionalFormControl() const override { return !isRequiredFormControl(); }
- bool isRequiredFormControl() const override;
</del><ins>+ bool isOptionalFormControl() const final { return !isRequiredFormControl(); }
+ bool isRequiredFormControl() const final;
</ins><span class="cx">
</span><span class="cx"> bool hasPlaceholderLabelOption() const;
</span><span class="cx">
</span><span class="lines">@@ -171,7 +163,7 @@
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned SelectOptionFlags;
</span><span class="cx"> void selectOption(int optionIndex, SelectOptionFlags = 0);
</span><del>- void deselectItemsWithoutValidation(HTMLElement* elementToExclude = 0);
</del><ins>+ void deselectItemsWithoutValidation(HTMLElement* elementToExclude = nullptr);
</ins><span class="cx"> void parseMultipleAttribute(const AtomicString&);
</span><span class="cx"> int lastSelectedListIndex() const;
</span><span class="cx"> void updateSelectedState(int listIndex, bool multi, bool shift);
</span><span class="lines">@@ -181,10 +173,7 @@
</span><span class="cx"> void setOptionsChangedOnRenderer();
</span><span class="cx"> size_t searchOptionsForValue(const String&, size_t listIndexStart, size_t listIndexEnd) const;
</span><span class="cx">
</span><del>- enum SkipDirection {
- SkipBackwards = -1,
- SkipForwards = 1
- };
</del><ins>+ enum SkipDirection { SkipBackwards = -1, SkipForwards = 1 };
</ins><span class="cx"> int nextValidIndex(int listIndex, SkipDirection, int skip) const;
</span><span class="cx"> int nextSelectableListIndex(int startIndex) const;
</span><span class="cx"> int previousSelectableListIndex(int startIndex) const;
</span><span class="lines">@@ -192,13 +181,14 @@
</span><span class="cx"> int lastSelectableListIndex() const;
</span><span class="cx"> int nextSelectableListIndexPageAway(int startIndex, SkipDirection) const;
</span><span class="cx">
</span><del>- void childrenChanged(const ChildChange&) override;
</del><ins>+ void childrenChanged(const ChildChange&) final;
</ins><span class="cx">
</span><span class="cx"> // TypeAheadDataSource functions.
</span><del>- int indexOfSelectedOption() const override;
- int optionCount() const override;
- String optionAtIndex(int index) const override;
</del><ins>+ int indexOfSelectedOption() const final;
+ int optionCount() const final;
+ String optionAtIndex(int index) const final;
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> // m_listItems contains HTMLOptionElement, HTMLOptGroupElement, and HTMLHRElement objects.
</span><span class="cx"> mutable Vector<HTMLElement*> m_listItems;
</span><span class="cx"> Vector<bool> m_lastOnChangeSelection;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.idl (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.idl 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebCore/html/HTMLSelectElement.idl 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -20,11 +20,10 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> CustomIndexedSetter,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><span class="cx"> ] interface HTMLSelectElement : HTMLElement {
</span><span class="cx"> [Reflect] attribute boolean autofocus;
</span><span class="cx"> [Reflect] attribute boolean disabled;
</span><del>- readonly attribute HTMLFormElement form;
</del><ins>+ readonly attribute HTMLFormElement? form;
</ins><span class="cx"> attribute boolean multiple;
</span><span class="cx"> [Reflect] attribute DOMString name;
</span><span class="cx"> [Reflect] attribute boolean required;
</span><span class="lines">@@ -39,8 +38,6 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute HTMLOptionsCollection options;
</span><span class="cx"> #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
</span><del>- // DOM Level 2 changes type of length attribute to unsigned long,
- // for compatibility we keep DOM Level 1 definition.
</del><span class="cx"> readonly attribute long length;
</span><span class="cx"> #else
</span><span class="cx"> [SetterRaisesException] attribute unsigned long length;
</span><span class="lines">@@ -50,8 +47,8 @@
</span><span class="cx"> getter Node item(unsigned long index);
</span><span class="cx"> Node namedItem([Default=Undefined] optional DOMString name);
</span><span class="cx"> #else
</span><del>- getter HTMLOptionElement item(unsigned long index);
- HTMLOptionElement namedItem([Default=Undefined] optional DOMString name);
</del><ins>+ getter HTMLOptionElement? item(unsigned long index);
+ HTMLOptionElement? namedItem([Default=Undefined] optional DOMString name);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> [ObjCLegacyUnnamedParameters, RaisesException] void add(HTMLElement element, [Default=Undefined] optional HTMLElement? before);
</span><span class="lines">@@ -63,17 +60,17 @@
</span><span class="cx"> #else
</span><span class="cx"> [ImplementedAs=removeByIndex] void remove(long index);
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> readonly attribute HTMLCollection selectedOptions;
</span><span class="cx"> attribute long selectedIndex;
</span><span class="cx">
</span><del>- // FIXME: This should not use [TreatNullAs=LegacyNullString].
- [TreatNullAs=LegacyNullString] attribute DOMString value;
</del><ins>+ [TreatNullAs=LegacyNullString] attribute DOMString value; // FIXME: This should not use [TreatNullAs=LegacyNullString].
</ins><span class="cx">
</span><span class="cx"> readonly attribute boolean willValidate;
</span><span class="cx"> readonly attribute ValidityState validity;
</span><span class="cx"> readonly attribute DOMString validationMessage;
</span><span class="cx"> boolean checkValidity();
</span><del>- void setCustomValidity(DOMString? error);
</del><ins>+ void setCustomValidity(DOMString? error); // FIXME: Argument should not be nullable.
</ins><span class="cx">
</span><span class="cx"> readonly attribute NodeList labels;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebKit/win/ChangeLog 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-11 Darin Adler <darin@apple.com>
+
+ Remove UsePointersEvenForNonNullableObjectArguments from HTMLSelectElement
+ https://bugs.webkit.org/show_bug.cgi?id=156458
+
+ Reviewed by Chris Dumez.
+
+ * DOMCoreClasses.cpp: Added now-needed include.
+
</ins><span class="cx"> 2016-04-11 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit should adopt journal_mode=wal for all SQLite databases.
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCoreClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/DragImage.h>
</span><span class="cx"> #include <WebCore/Element.h>
</span><ins>+#include <WebCore/Event.h>
</ins><span class="cx"> #include <WebCore/Font.h>
</span><span class="cx"> #include <WebCore/FontCascade.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-11 Darin Adler <darin@apple.com>
+
+ Remove UsePointersEvenForNonNullableObjectArguments from HTMLSelectElement
+ https://bugs.webkit.org/show_bug.cgi?id=156458
+
+ Reviewed by Chris Dumez.
+
+ * WebProcess/Plugins/PDF/PDFPluginAnnotation.mm: Updated includes.
+
</ins><span class="cx"> 2016-04-11 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> When clearing cache, also clear AVFoundation cache.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginAnnotationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm (199333 => 199334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm 2016-04-12 03:42:29 UTC (rev 199333)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm 2016-04-12 04:15:16 UTC (rev 199334)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #import <WebCore/CSSPrimitiveValue.h>
</span><span class="cx"> #import <WebCore/CSSPropertyNames.h>
</span><span class="cx"> #import <WebCore/ColorMac.h>
</span><del>-#import <WebCore/HTMLElement.h>
</del><ins>+#import <WebCore/Event.h>
</ins><span class="cx"> #import <WebCore/HTMLInputElement.h>
</span><span class="cx"> #import <WebCore/HTMLNames.h>
</span><span class="cx"> #import <WebCore/HTMLOptionElement.h>
</span></span></pre>
</div>
</div>
</body>
</html>