Commit 39636202 authored by Alberto Garcia's avatar Alberto Garcia
Browse files

Update upstream source from tag 'upstream/2.29.1'

Update to upstream version '2.29.1'
with Debian dir b5cf86823b1ef4a97d5476f760bf8034589b9f4a
parents 1a6e5cff 7985640c

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -31,6 +31,10 @@ if (NOT DEFINED ENABLE_TOOLS AND EXISTS "${CMAKE_SOURCE_DIR}/Tools")
set(ENABLE_TOOLS ON)
endif ()
if (NOT DEFINED ENABLE_WEBINSPECTORUI)
set(ENABLE_WEBINSPECTORUI ON)
endif ()
# -----------------------------------------------------------------------------
# Determine which port will be built
# -----------------------------------------------------------------------------
......@@ -187,11 +191,7 @@ if (ENABLE_TOOLS)
add_subdirectory(Tools)
endif ()
if ("${PORT}" STREQUAL "GTK" OR "${PORT}" STREQUAL "WPE")
if (DEVELOPER_MODE)
add_subdirectory(PerformanceTests)
endif ()
else ()
if (DEVELOPER_MODE)
add_subdirectory(PerformanceTests)
endif ()
......
......@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">JavaScriptCore GLib Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">for JavaScriptCore 2.28.2</p></div>
<div><p class="releaseinfo">for JavaScriptCore 2.29.1</p></div>
</div>
<hr>
</div>
......
......@@ -169,13 +169,13 @@ have included when compiling your code.</p>
<hr>
<div class="refsect2">
<a name="JSC-MINOR-VERSION:CAPS"></a><h3>JSC_MINOR_VERSION</h3>
<pre class="programlisting">#define JSC_MINOR_VERSION (28)
<pre class="programlisting">#define JSC_MINOR_VERSION (29)
</pre>
</div>
<hr>
<div class="refsect2">
<a name="JSC-MICRO-VERSION:CAPS"></a><h3>JSC_MICRO_VERSION</h3>
<pre class="programlisting">#define JSC_MICRO_VERSION (2)
<pre class="programlisting">#define JSC_MICRO_VERSION (1)
</pre>
</div>
</div>
......
......@@ -260,10 +260,10 @@ webkit_context_menu_item_new_from_stock_action
Stock actions are handled automatically by WebKit so that, for example,
when a menu item created with a <a class="link" href="WebKitContextMenuItem.html#WEBKIT-CONTEXT-MENU-ACTION-STOP:CAPS"><code class="literal">WEBKIT_CONTEXT_MENU_ACTION_STOP</code></a> is
activated the action associated will be handled by WebKit and the current
load operation will be stopped. You can get the <a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a> of a
load operation will be stopped. You can get the <a href="../gio/GAction.html#GAction-struct"><span class="type">GAction</span></a> of a
<a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a> created with a <a class="link" href="WebKitContextMenuItem.html#WebKitContextMenuAction" title="enum WebKitContextMenuAction"><span class="type">WebKitContextMenuAction</span></a> with
<a class="link" href="WebKitContextMenuItem.html#webkit-context-menu-item-get-action" title="webkit_context_menu_item_get_action ()"><code class="function">webkit_context_menu_item_get_action()</code></a> and connect to <a href="../gtk3/GtkAction.html#GtkAction-activate"><span class="type">“activate”</span></a> signal
to be notified when the item is activated. But you can't prevent the associated
<a class="link" href="WebKitContextMenuItem.html#webkit-context-menu-item-get-gaction" title="webkit_context_menu_item_get_gaction ()"><code class="function">webkit_context_menu_item_get_gaction()</code></a> and connect to the <a href="../gio/GSimpleAction.html#GSimpleAction-activate"><span class="type">“activate”</span></a> signal
to be notified when the item is activated, but you can't prevent the associated
action from being performed.</p>
<div class="refsect3">
<a name="webkit-context-menu-item-new-from-stock-action.parameters"></a><h4>Parameters</h4>
......@@ -898,6 +898,13 @@ doesn't have a submenu. </p>
<td class="enum_member_annotations"> </td>
</tr>
<tr>
<td class="enum_member_name"><p><a name="WEBKIT-CONTEXT-MENU-ACTION-PASTE-AS-PLAIN-TEXT:CAPS"></a>WEBKIT_CONTEXT_MENU_ACTION_PASTE_AS_PLAIN_TEXT</p></td>
<td class="enum_member_description">
<p>Paste clipboard contents as plain text. Since 2.30</p>
</td>
<td class="enum_member_annotations"> </td>
</tr>
<tr>
<td class="enum_member_name"><p><a name="WEBKIT-CONTEXT-MENU-ACTION-CUSTOM:CAPS"></a>WEBKIT_CONTEXT_MENU_ACTION_CUSTOM</p></td>
<td class="enum_member_description">
<p>Custom action defined by applications.</p>
......
......@@ -4946,13 +4946,13 @@ signal will be emitted.</p>
<div class="refsect2">
<a name="WebKitSettings--allow-top-navigation-to-data-urls"></a><h3>The <code class="literal">“allow-top-navigation-to-data-urls”</code> property</h3>
<pre class="programlisting"> “allow-top-navigation-to-data-urls” <a href="../glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
<p>Whether or not the top frame is allowed to navigate to data URLs. It is encouraged to disable it
<p>Whether or not the top frame is allowed to navigate to data URLs. It is disabled by default
due to the risk it poses when loading untrusted URLs, with data URLs being used in scamming
and phishing attacks. In contrast, a scenario where it could be enabled could be an app that
embeds a WebView and you have control of the pages being shown instead of a generic browser.</p>
embeds a WebView and you have control of the pages being show instead of a generic browser.</p>
<p>Owner: WebKitSettings</p>
<p>Flags: Read / Write / Construct</p>
<p>Default value: TRUE</p>
<p>Default value: FALSE</p>
<p class="since">Since: <a class="link" href="api-index-2-28.html#api-index-2.28">2.28</a></p>
</div>
<hr>
......
......@@ -389,6 +389,22 @@
<span class="returnvalue">void</span>
</td>
<td class="function_name">
<a class="link" href="WebKitWebContext.html#webkit-web-context-set-use-system-appearance-for-scrollbars" title="webkit_web_context_set_use_system_appearance_for_scrollbars ()">webkit_web_context_set_use_system_appearance_for_scrollbars</a> <span class="c_punctuation">()</span>
</td>
</tr>
<tr>
<td class="function_type">
<a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
</td>
<td class="function_name">
<a class="link" href="WebKitWebContext.html#webkit-web-context-get-use-system-appearance-for-scrollbars" title="webkit_web_context_get_use_system_appearance_for_scrollbars ()">webkit_web_context_get_use_system_appearance_for_scrollbars</a> <span class="c_punctuation">()</span>
</td>
</tr>
<tr>
<td class="function_type">
<span class="returnvalue">void</span>
</td>
<td class="function_name">
<span class="c_punctuation">(</span><a class="link" href="WebKitWebContext.html#WebKitURISchemeRequestCallback" title="WebKitURISchemeRequestCallback ()">*WebKitURISchemeRequestCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
</td>
</tr>
......@@ -424,6 +440,11 @@
<td class="property_flags">Read / Write / Construct Only</td>
</tr>
<tr>
<td class="property_type"><a href="../glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
<td class="property_name"><a class="link" href="WebKitWebContext.html#WebKitWebContext--use-system-appearance-for-scrollbars" title="The “use-system-appearance-for-scrollbars” property">use-system-appearance-for-scrollbars</a></td>
<td class="property_flags">Read / Write / Construct</td>
</tr>
<tr>
<td class="property_type">
<a class="link" href="WebKitWebsiteDataManager.html" title="WebKitWebsiteDataManager"><span class="type">WebKitWebsiteDataManager</span></a> *</td>
<td class="property_name"><a class="link" href="WebKitWebContext.html#WebKitWebContext--website-data-manager" title="The “website-data-manager” property">website-data-manager</a></td>
......@@ -1981,6 +2002,66 @@ If <em class="parameter"><code>message</code></em>
</div>
<hr>
<div class="refsect2">
<a name="webkit-web-context-set-use-system-appearance-for-scrollbars"></a><h3>webkit_web_context_set_use_system_appearance_for_scrollbars ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span>
webkit_web_context_set_use_system_appearance_for_scrollbars
(<em class="parameter"><code><a class="link" href="WebKitWebContext.html" title="WebKitWebContext"><span class="type">WebKitWebContext</span></a> *context</code></em>,
<em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);</pre>
<p>Set the <a class="link" href="WebKitWebContext.html#WebKitWebContext--use-system-appearance-for-scrollbars" title="The “use-system-appearance-for-scrollbars” property"><span class="type">“use-system-appearance-for-scrollbars”</span></a> property.</p>
<div class="refsect3">
<a name="webkit-web-context-set-use-system-appearance-for-scrollbars.parameters"></a><h4>Parameters</h4>
<div class="informaltable"><table class="informaltable" width="100%" border="0">
<colgroup>
<col width="150px" class="parameters_name">
<col class="parameters_description">
<col width="200px" class="parameters_annotations">
</colgroup>
<tbody>
<tr>
<td class="parameter_name"><p>context</p></td>
<td class="parameter_description"><p>a <a class="link" href="WebKitWebContext.html" title="WebKitWebContext"><span class="type">WebKitWebContext</span></a></p></td>
<td class="parameter_annotations"> </td>
</tr>
<tr>
<td class="parameter_name"><p>enabled</p></td>
<td class="parameter_description"><p>value to set</p></td>
<td class="parameter_annotations"> </td>
</tr>
</tbody>
</table></div>
</div>
<p class="since">Since: 2.30</p>
</div>
<hr>
<div class="refsect2">
<a name="webkit-web-context-get-use-system-appearance-for-scrollbars"></a><h3>webkit_web_context_get_use_system_appearance_for_scrollbars ()</h3>
<pre class="programlisting"><a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
webkit_web_context_get_use_system_appearance_for_scrollbars
(<em class="parameter"><code><a class="link" href="WebKitWebContext.html" title="WebKitWebContext"><span class="type">WebKitWebContext</span></a> *context</code></em>);</pre>
<p>Get the <a class="link" href="WebKitWebContext.html#WebKitWebContext--use-system-appearance-for-scrollbars" title="The “use-system-appearance-for-scrollbars” property"><span class="type">“use-system-appearance-for-scrollbars”</span></a> property.</p>
<div class="refsect3">
<a name="webkit-web-context-get-use-system-appearance-for-scrollbars.parameters"></a><h4>Parameters</h4>
<div class="informaltable"><table class="informaltable" width="100%" border="0">
<colgroup>
<col width="150px" class="parameters_name">
<col class="parameters_description">
<col width="200px" class="parameters_annotations">
</colgroup>
<tbody><tr>
<td class="parameter_name"><p>context</p></td>
<td class="parameter_description"><p>a <a class="link" href="WebKitWebContext.html" title="WebKitWebContext"><span class="type">WebKitWebContext</span></a></p></td>
<td class="parameter_annotations"> </td>
</tr></tbody>
</table></div>
</div>
<div class="refsect3">
<a name="webkit-web-context-get-use-system-appearance-for-scrollbars.returns"></a><h4>Returns</h4>
<p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if scrollbars are rendering using the system appearance, or <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
</div>
<p class="since">Since: 2.30</p>
</div>
<hr>
<div class="refsect2">
<a name="WebKitURISchemeRequestCallback"></a><h3>WebKitURISchemeRequestCallback ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span>
<span class="c_punctuation">(</span>*WebKitURISchemeRequestCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="WebKitURISchemeRequest.html" title="WebKitURISchemeRequest"><span class="type">WebKitURISchemeRequest</span></a> *request</code></em>,
......@@ -2339,6 +2420,19 @@ websites stealing data from other visited pages.</p>
</div>
<hr>
<div class="refsect2">
<a name="WebKitWebContext--use-system-appearance-for-scrollbars"></a><h3>The <code class="literal">“use-system-appearance-for-scrollbars”</code> property</h3>
<pre class="programlisting"> “use-system-appearance-for-scrollbars” <a href="../glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
<p>Whether to use system appearance for rendering scrollbars.</p>
<p>This is enabled by default for backwards compatibility, but it's only
recommened to use when the application includes other widgets to ensure
consistency, or when consistency with other applications is required too.</p>
<p>Owner: WebKitWebContext</p>
<p>Flags: Read / Write / Construct</p>
<p>Default value: TRUE</p>
<p class="since">Since: 2.30</p>
</div>
<hr>
<div class="refsect2">
<a name="WebKitWebContext--website-data-manager"></a><h3>The <code class="literal">“website-data-manager”</code> property</h3>
<pre class="programlisting"> “website-data-manager” <a class="link" href="WebKitWebsiteDataManager.html" title="WebKitWebsiteDataManager"><span class="type">WebKitWebsiteDataManager</span></a> *</pre>
<p>The <a class="link" href="WebKitWebsiteDataManager.html" title="WebKitWebsiteDataManager"><span class="type">WebKitWebsiteDataManager</span></a> associated with this context.</p>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">WebKitGTK Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">for WebKitGTK 2.28.2</p></div>
<div><p class="releaseinfo">for WebKitGTK 2.29.1</p></div>
</div>
<hr>
</div>
......
......@@ -204,7 +204,7 @@ against at application run time.</p>
<hr>
<div class="refsect2">
<a name="WEBKIT-MINOR-VERSION:CAPS"></a><h3>WEBKIT_MINOR_VERSION</h3>
<pre class="programlisting">#define WEBKIT_MINOR_VERSION (28)
<pre class="programlisting">#define WEBKIT_MINOR_VERSION (29)
</pre>
<p>Like <a class="link" href="webkit2gtk-4.0-WebKitVersion.html#webkit-get-minor-version" title="webkit_get_minor_version ()"><code class="function">webkit_get_minor_version()</code></a>, but from the headers used at
application compile time, rather than from the library linked
......@@ -213,7 +213,7 @@ against at application run time.</p>
<hr>
<div class="refsect2">
<a name="WEBKIT-MICRO-VERSION:CAPS"></a><h3>WEBKIT_MICRO_VERSION</h3>
<pre class="programlisting">#define WEBKIT_MICRO_VERSION (2)
<pre class="programlisting">#define WEBKIT_MICRO_VERSION (1)
</pre>
<p>Like <a class="link" href="webkit2gtk-4.0-WebKitVersion.html#webkit-get-micro-version" title="webkit_get_micro_version ()"><code class="function">webkit_get_micro_version()</code></a>, but from the headers used at
application compile time, rather than from the library linked
......
......@@ -132,6 +132,8 @@
<keyword type="function" name="webkit_web_context_set_process_model ()" link="WebKitWebContext.html#webkit-web-context-set-process-model" since="2.4"/>
<keyword type="function" name="webkit_web_context_initialize_notification_permissions ()" link="WebKitWebContext.html#webkit-web-context-initialize-notification-permissions" since="2.16"/>
<keyword type="function" name="webkit_web_context_send_message_to_all_extensions ()" link="WebKitWebContext.html#webkit-web-context-send-message-to-all-extensions" since="2.28"/>
<keyword type="function" name="webkit_web_context_set_use_system_appearance_for_scrollbars ()" link="WebKitWebContext.html#webkit-web-context-set-use-system-appearance-for-scrollbars" since="2.30"/>
<keyword type="function" name="webkit_web_context_get_use_system_appearance_for_scrollbars ()" link="WebKitWebContext.html#webkit-web-context-get-use-system-appearance-for-scrollbars" since="2.30"/>
<keyword type="function" name="WebKitURISchemeRequestCallback ()" link="WebKitWebContext.html#WebKitURISchemeRequestCallback"/>
<keyword type="function" name="webkit_web_context_register_uri_scheme ()" link="WebKitWebContext.html#webkit-web-context-register-uri-scheme"/>
<keyword type="struct" name="struct WebKitWebContext" link="WebKitWebContext.html#WebKitWebContext-struct"/>
......@@ -141,6 +143,7 @@
<keyword type="enum" name="enum WebKitNetworkProxyMode" link="WebKitWebContext.html#WebKitNetworkProxyMode" since="2.16"/>
<keyword type="property" name="The “local-storage-directory” property" link="WebKitWebContext.html#WebKitWebContext--local-storage-directory"/>
<keyword type="property" name="The “process-swap-on-cross-site-navigation-enabled” property" link="WebKitWebContext.html#WebKitWebContext--process-swap-on-cross-site-navigation-enabled"/>
<keyword type="property" name="The “use-system-appearance-for-scrollbars” property" link="WebKitWebContext.html#WebKitWebContext--use-system-appearance-for-scrollbars"/>
<keyword type="property" name="The “website-data-manager” property" link="WebKitWebContext.html#WebKitWebContext--website-data-manager"/>
<keyword type="signal" name="The “automation-started” signal" link="WebKitWebContext.html#WebKitWebContext-automation-started"/>
<keyword type="signal" name="The “download-started” signal" link="WebKitWebContext.html#WebKitWebContext-download-started"/>
......@@ -1272,6 +1275,7 @@
<keyword type="constant" name="WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK" link="WebKitContextMenuItem.html#WEBKIT-CONTEXT-MENU-ACTION-DOWNLOAD-VIDEO-TO-DISK:CAPS"/>
<keyword type="constant" name="WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK" link="WebKitContextMenuItem.html#WEBKIT-CONTEXT-MENU-ACTION-DOWNLOAD-AUDIO-TO-DISK:CAPS"/>
<keyword type="constant" name="WEBKIT_CONTEXT_MENU_ACTION_INSERT_EMOJI" link="WebKitContextMenuItem.html#WEBKIT-CONTEXT-MENU-ACTION-INSERT-EMOJI:CAPS"/>
<keyword type="constant" name="WEBKIT_CONTEXT_MENU_ACTION_PASTE_AS_PLAIN_TEXT" link="WebKitContextMenuItem.html#WEBKIT-CONTEXT-MENU-ACTION-PASTE-AS-PLAIN-TEXT:CAPS"/>
<keyword type="constant" name="WEBKIT_CONTEXT_MENU_ACTION_CUSTOM" link="WebKitContextMenuItem.html#WEBKIT-CONTEXT-MENU-ACTION-CUSTOM:CAPS"/>
<keyword type="constant" name="WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES" link="webkit2gtk-4.0-WebKitUserContent.html#WEBKIT-USER-CONTENT-INJECT-ALL-FRAMES:CAPS"/>
<keyword type="constant" name="WEBKIT_USER_CONTENT_INJECT_TOP_FRAME" link="webkit2gtk-4.0-WebKitUserContent.html#WEBKIT-USER-CONTENT-INJECT-TOP-FRAME:CAPS"/>
......
......@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">WebKitDOMGTK+ Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">for WebKitDOMGTK+ 2.28.2</p></div>
<div><p class="releaseinfo">for WebKitDOMGTK+ 2.29.1</p></div>
</div>
<hr>
</div>
......
================
WebKitGTK 2.28.2
WebKitGTK 2.29.1
================
What's new in WebKitGTK 2.28.2?
What's new in WebKitGTK 2.29.1?
- Fix excessive CPU usage due to GdkFrameClock not being stopped.
- Fix UI process crash when EGL_WL_bind_wayland_display extension is not available.
- Fix position of select popup menus in X11.
- Fix playing of Youtube 'live stream'/H264 URLs.
- Fix a crash under X11 when cairo uses xcb.
- Fix the build in MIPS64.
- Fix several crashes and rendering issues.
================
WebKitGTK 2.28.1
================
What's new in WebKitGTK 2.28.1?
- Fix position of default option element popup windows under Wayland.
- Fix rendering after a cross site navigation with PSON enabled and hardware acceleration forced.
- Fix a crash in nested wayland compositor when closing a tab with PSON enabled.
- Update Chrome and Firefox versions in user agent quirks.
- Fix a crash with bubblewrap sandbox enabled.
- Fix a crash in JavaScriptCore in ppc64el.
- Fix the build with GStreamer 1.12.
- Fix several crashes and rendering issues.
================
WebKitGTK 2.28.0
================
What's new in WebKitGTK 2.28.0?
- Enable JIT in MIPS platform.
- Do not limit the surrounding text for input methods to current paragraph.
- Fix the build with OpenGL disabled.
- Fix the build when Wayland target is disabled.
- Fix the build on ppc64le if __unix is undefined.
- Fix several crashes and rendering issues.
- Translation updates: Polish.
=================
WebKitGTK 2.27.91
=================
What's new in WebKitGTK 2.27.91?
- Update user agent quirks to fix the unsupported browser message in several google services.
- Fix several compile warnings with GCC 10.
- Fix the build with GCC 10.
- Fix several crashes and rendering issues.
- Translation updates: Chinese
=================
WebKitGTK 2.27.90
=================
What's new in WebKitGTK 2.27.90?
- Add support for same-site cookies.
- Add flatpak sandbox support.
- Enable WebAudio and WebGL by default in WebKitSettings.
- Add a setting to disallow top level navigation to a data URI.
- Add support for the -webkit-font-smoothing CSS property.
- Always use a light theme for rendering form controls.
- Stop making the Web Inspector windows transient.
- Ensure mouse cursor is hidden during fullscreen video playback.
- Add support for inspecting service workers to the remote inspector.
- Stop using GTK theming to render form controls.
- Add API to disable GTK theming for scrollbars too.
- Fix several race conditions and threading issues in the media player.
- Add USER_AGENT_BRANDING build option.
- Add paste as plain text option to the context menu for rich editable content.
- Fix several crashes and rendering issues.
================
......
......@@ -29,6 +29,10 @@ if (USE_LIBWEBRTC)
add_subdirectory(ThirdParty/libwebrtc)
endif ()
if (ENABLE_WEBINSPECTORUI)
add_subdirectory(WebInspectorUI)
endif ()
if (ENABLE_WEBCORE)
add_subdirectory(WebCore)
endif ()
......
/*
* Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
* Copyright (C) 2013-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -48,7 +48,7 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::call(JSGlobalObject* globalObj
auto scope = DECLARE_THROW_SCOPE(vm);
JSContextRef execRef = toRef(globalObject);
JSObjectRef functionRef = toRef(callFrame->jsCallee());
JSObjectRef thisObjRef = toRef(jsCast<JSObject*>(callFrame->thisValue().toThis(globalObject, NotStrictMode)));
JSObjectRef thisObjRef = toRef(jsCast<JSObject*>(callFrame->thisValue().toThis(globalObject, ECMAMode::sloppy())));
int argumentCount = static_cast<int>(callFrame->argumentCount());
Vector<JSValueRef, 16> arguments;
......@@ -56,14 +56,16 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::call(JSGlobalObject* globalObj
for (int i = 0; i < argumentCount; i++)
arguments.uncheckedAppend(toRef(globalObject, callFrame->uncheckedArgument(i)));
JSValueRef exception = 0;
JSValueRef exception = nullptr;
JSValueRef result;
{
JSLock::DropAllLocks dropAllLocks(globalObject);
result = jsCast<T*>(toJS(functionRef))->functionCallback()(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception);
}
if (exception)
if (exception) {
throwException(globalObject, scope, toJS(globalObject, exception));
return JSValue::encode(jsUndefined());
}
// result must be a valid JSValue.
if (!result)
......@@ -89,7 +91,7 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::construct(JSGlobalObject* glob
for (size_t i = 0; i < argumentCount; ++i)
arguments.uncheckedAppend(toRef(globalObject, callFrame->uncheckedArgument(i)));
JSValueRef exception = 0;
JSValueRef exception = nullptr;
JSObjectRef result;
{
JSLock::DropAllLocks dropAllLocks(globalObject);
......@@ -97,7 +99,7 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::construct(JSGlobalObject* glob
}
if (exception) {
throwException(globalObject, scope, toJS(globalObject, exception));
return JSValue::encode(toJS(globalObject, exception));
return JSValue::encode(jsUndefined());
}
// result must be a valid JSValue.
if (!result)
......@@ -105,7 +107,7 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::construct(JSGlobalObject* glob
return JSValue::encode(toJS(result));
}
return JSValue::encode(toJS(JSObjectMake(ctx, jsCast<JSCallbackConstructor*>(constructor)->classRef(), 0)));
return JSValue::encode(toJS(JSObjectMake(ctx, jsCast<JSCallbackConstructor*>(constructor)->classRef(), nullptr)));
}
} // namespace JSC
......
......@@ -54,7 +54,7 @@ public:
static Structure* createStructure(VM& vm, JSValue prototype)
{
auto* result = Structure::create(vm, 0, prototype, TypeInfo(GlobalObjectType, StructureFlags), info());
auto* result = Structure::create(vm, nullptr, prototype, TypeInfo(GlobalObjectType, StructureFlags), info());
result->setTransitionWatchpointIsLikelyToBeFired(true);
return result;
}
......
......@@ -23,8 +23,6 @@
#include "config.h"
#include "JSAPIValueWrapper.h"
#include "NumberObject.h"
namespace JSC {
STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSAPIValueWrapper);
......
......@@ -57,7 +57,7 @@ public:
return wrapper;
}
protected:
private:
void finishCreation(VM& vm, JSValue value)
{
Base::finishCreation(vm);
......@@ -65,7 +65,6 @@ protected:
ASSERT(!value.isCell());
}
private:
JSAPIValueWrapper(VM& vm)
: JSCell(vm, vm.apiWrapperStructure.get())
{
......
......@@ -29,20 +29,16 @@
#include "JSBasePrivate.h"
#include "APICast.h"
#include "CallFrame.h"
#include "Completion.h"
#include "Exception.h"
#include "GCActivityCallback.h"
#include "Identifier.h"
#include "InitializeThreading.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "JSObject.h"
#include "ObjectConstructor.h"
#include "OpaqueJSString.h"
#include "JSCInlines.h"
#include "SourceCode.h"
#include <wtf/text/StringHash.h>
#if ENABLE(REMOTE_INSPECTOR)
#include "JSGlobalObjectInspectorController.h"
......@@ -193,7 +189,7 @@ JSObjectRef JSGetMemoryUsageStatistics(JSContextRef ctx)
{
if (!ctx) {
ASSERT_NOT_REACHED();
return 0;
return nullptr;
}
JSGlobalObject* globalObject = toJS(ctx);
......
......@@ -27,7 +27,6 @@
#include "JSCTestRunnerUtils.h"
#include "APICast.h"
#include "JSCInlines.h"
#include "TestRunnerUtils.h"
namespace JSC {
......
......@@ -32,7 +32,6 @@
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "ObjectPrototype.h"
#include "JSCInlines.h"
namespace JSC {
......@@ -64,10 +63,12 @@ void JSCallbackConstructor::destroy(JSCell* cell)
static_cast<JSCallbackConstructor*>(cell)->JSCallbackConstructor::~JSCallbackConstructor();
}
ConstructType JSCallbackConstructor::getConstructData(JSCell*, ConstructData& constructData)
CallData JSCallbackConstructor::getConstructData(JSCell*)
{
CallData constructData;
constructData.type = CallData::Type::Native;
constructData.native.function = APICallbackFunction::construct<JSCallbackConstructor>;
return ConstructType::Host;
return constructData;
}
} // namespace JSC
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment