Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1862692 - Part 16: Use 1-origin column number type in JS::DescribeScriptedCaller. r=iain

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D193029
This commit is contained in:
Tooru Fujisawa 2023-11-09 11:41:10 +00:00
parent d1b761b606
commit c8916f8e8e
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caps/nsScriptSecurityManager.cpp
View File

@ -71,7 +71,7 @@
#include "nsContentUtils.h"
#include "nsJSUtils.h"
#include "nsILoadInfo.h"
#include "js/ColumnNumber.h" // JS::ColumnNumberZeroOrigin
#include "js/ColumnNumber.h" // JS::ColumnNumberOneOrigin
// This should be probably defined on some other place... but I couldn't find it
#define WEBAPPS_PERM_NAME "webapps-manage"
@ -533,7 +533,7 @@ bool nsScriptSecurityManager::ContentSecurityPolicyPermitsJSAction(
JS::AutoFilename scriptFilename;
nsAutoString fileName;
uint32_t lineNum = 0;
JS::ColumnNumberZeroOrigin columnNum;
JS::ColumnNumberOneOrigin columnNum;
if (JS::DescribeScriptedCaller(cx, &scriptFilename, &lineNum, &columnNum)) {
if (const char* file = scriptFilename.get()) {
CopyUTF8toUTF16(nsDependentCString(file), fileName);

4
dom/base/nsJSUtils.cpp
View File

@ -51,7 +51,7 @@ using namespace mozilla::dom;
bool nsJSUtils::GetCallingLocation(JSContext* aContext, nsACString& aFilename,
uint32_t* aLineno, uint32_t* aColumn) {
JS::AutoFilename filename;
JS::ColumnNumberZeroOrigin column;
JS::ColumnNumberOneOrigin column;
if (!JS::DescribeScriptedCaller(aContext, &filename, aLineno, &column)) {
return false;
}
@ -65,7 +65,7 @@ bool nsJSUtils::GetCallingLocation(JSContext* aContext, nsACString& aFilename,
bool nsJSUtils::GetCallingLocation(JSContext* aContext, nsAString& aFilename,
uint32_t* aLineno, uint32_t* aColumn) {
JS::AutoFilename filename;
JS::ColumnNumberZeroOrigin column;
JS::ColumnNumberOneOrigin column;
if (!JS::DescribeScriptedCaller(aContext, &filename, aLineno, &column)) {
return false;
}

4
dom/events/EventListenerManager.cpp
View File

@ -7,7 +7,7 @@
// Microsoft's API Name hackery sucks
#undef CreateEvent
#include "js/ColumnNumber.h" // JS::ColumnNumberZeroOrigin
#include "js/ColumnNumber.h" // JS::ColumnNumberOneOrigin
#include "js/loader/LoadedScript.h"
#include "mozilla/BasicEvents.h"
#include "mozilla/BinarySearch.h"
@ -1030,7 +1030,7 @@ nsresult EventListenerManager::SetEventHandler(nsAtom* aName,
// Perform CSP check
nsCOMPtr<nsIContentSecurityPolicy> csp = doc->GetCsp();
uint32_t lineNum = 0;
JS::ColumnNumberZeroOrigin columnNum;
JS::ColumnNumberOneOrigin columnNum;
JSContext* cx = nsContentUtils::GetCurrentJSContext();
if (cx && !JS::DescribeScriptedCaller(cx, nullptr, &lineNum, &columnNum)) {

4
dom/system/IOUtils.cpp
View File

@ -11,7 +11,7 @@
#include "ErrorList.h"
#include "TypedArray.h"
#include "js/ArrayBuffer.h"
#include "js/ColumnNumber.h" // JS::ColumnNumberZeroOrigin
#include "js/ColumnNumber.h" // JS::ColumnNumberOneOrigin
#include "js/JSON.h"
#include "js/Utility.h"
#include "js/experimental/TypedData.h"
@ -293,7 +293,7 @@ static bool AssertParentProcessWithCallerLocationImpl(GlobalObject& aGlobal,
JS::AutoFilename scriptFilename;
uint32_t lineNo = 0;
JS::ColumnNumberZeroOrigin colNo;
JS::ColumnNumberOneOrigin colNo;
NS_ENSURE_TRUE(
JS::DescribeScriptedCaller(cx, &scriptFilename, &lineNo, &colNo), false);

6
dom/websocket/WebSocket.cpp
View File

@ -9,7 +9,7 @@
#include "mozilla/dom/WebSocketBinding.h"
#include "mozilla/net/WebSocketChannel.h"
#include "js/ColumnNumber.h" // JS::ColumnNumberZeroOrigin
#include "js/ColumnNumber.h" // JS::ColumnNumberOneOrigin
#include "jsapi.h"
#include "jsfriendapi.h"
#include "mozilla/Atomics.h"
@ -1371,7 +1371,7 @@ already_AddRefed<WebSocket> WebSocket::ConstructorCommon(
MOZ_ASSERT(workerPrivate);
uint32_t lineno;
JS::ColumnNumberZeroOrigin column;
JS::ColumnNumberOneOrigin column;
JS::AutoFilename file;
if (!JS::DescribeScriptedCaller(aGlobal.Context(), &file, &lineno,
&column)) {
@ -1610,7 +1610,7 @@ nsresult WebSocketImpl::Init(JSContext* aCx, bool aIsSecure,
MOZ_ASSERT(aCx);
uint32_t lineno;
JS::ColumnNumberZeroOrigin column;
JS::ColumnNumberOneOrigin column;
JS::AutoFilename file;
if (JS::DescribeScriptedCaller(aCx, &file, &lineno, &column)) {
mScriptFile = file.get();

4
dom/workers/RuntimeService.cpp
View File

@ -21,7 +21,7 @@
#include <algorithm>
#include "mozilla/ipc/BackgroundChild.h"
#include "GeckoProfiler.h"
#include "js/ColumnNumber.h" // JS::ColumnNumberZeroOrigin
#include "js/ColumnNumber.h" // JS::ColumnNumberOneOrigin
#include "js/experimental/CTypes.h" // JS::CTypesActivityType, JS::SetCTypesActivityCallback
#include "jsfriendapi.h"
#include "js/friend/ErrorMessages.h" // js::GetErrorMessage, JSMSG_*
@ -519,7 +519,7 @@ bool ContentSecurityPolicyAllows(JSContext* aCx, JS::RuntimeCode aKind,
if (reportViolation) {
nsString fileName;
uint32_t lineNum = 0;
JS::ColumnNumberZeroOrigin columnNum;
JS::ColumnNumberOneOrigin columnNum;
JS::AutoFilename file;
if (JS::DescribeScriptedCaller(aCx, &file, &lineNum, &columnNum) &&

10
js/src/jsapi.cpp
View File

@ -42,7 +42,7 @@
#include "jit/JitSpewer.h"
#include "js/CallAndConstruct.h" // JS::IsCallable
#include "js/CharacterEncoding.h"
#include "js/ColumnNumber.h" // JS::TaggedColumnNumberOneOrigin, JS::ColumnNumberZeroOrigin, JS::ColumnNumberOneOrigin
#include "js/ColumnNumber.h" // JS::TaggedColumnNumberOneOrigin, JS::ColumnNumberOneOrigin
#include "js/CompileOptions.h"
#include "js/ContextOptions.h" // JS::ContextOptions{,Ref}
#include "js/Conversions.h"
@ -4616,7 +4616,7 @@ const char* AutoFilename::get() const {
JS_PUBLIC_API bool DescribeScriptedCaller(JSContext* cx, AutoFilename* filename,
uint32_t* lineno,
JS::ColumnNumberZeroOrigin* column) {
JS::ColumnNumberOneOrigin* column) {
if (filename) {
filename->reset();
}
@ -4624,7 +4624,7 @@ JS_PUBLIC_API bool DescribeScriptedCaller(JSContext* cx, AutoFilename* filename,
*lineno = 0;
}
if (column) {
*column = JS::ColumnNumberZeroOrigin::zero();
*column = JS::ColumnNumberOneOrigin();
}
if (!cx->compartment()) {
@ -4661,12 +4661,12 @@ JS_PUBLIC_API bool DescribeScriptedCaller(JSContext* cx, AutoFilename* filename,
JS::TaggedColumnNumberOneOrigin columnNumber;
*lineno = i.computeLine(&columnNumber);
if (column) {
*column = JS::ColumnNumberZeroOrigin(columnNumber.zeroOriginValue());
*column = JS::ColumnNumberOneOrigin(columnNumber.oneOriginValue());
}
} else if (column) {
JS::TaggedColumnNumberOneOrigin columnNumber;
i.computeLine(&columnNumber);
*column = JS::ColumnNumberZeroOrigin(columnNumber.zeroOriginValue());
*column = JS::ColumnNumberOneOrigin(columnNumber.oneOriginValue());
}
return true;

2
js/src/jsapi.h
View File

@ -965,7 +965,7 @@ class MOZ_RAII JS_PUBLIC_API AutoFilename {
*/
extern JS_PUBLIC_API bool DescribeScriptedCaller(
JSContext* cx, AutoFilename* filename = nullptr, uint32_t* lineno = nullptr,
JS::ColumnNumberZeroOrigin* column = nullptr);
JS::ColumnNumberOneOrigin* column = nullptr);
extern JS_PUBLIC_API JSObject* GetScriptedCallerGlobal(JSContext* cx);

4
js/xpconnect/wrappers/XrayWrapper.cpp
View File

@ -16,7 +16,7 @@
#include "jsapi.h"
#include "js/CallAndConstruct.h" // JS::Call, JS::Construct, JS::IsCallable
#include "js/ColumnNumber.h" // JS::ColumnNumberZeroOrigin
#include "js/ColumnNumber.h" // JS::ColumnNumberOneOrigin
#include "js/experimental/TypedData.h" // JS_GetTypedArrayLength
#include "js/friend/WindowProxy.h" // js::IsWindowProxy
#include "js/friend/XrayJitInfo.h" // JS::XrayJitInfo
@ -219,7 +219,7 @@ bool ReportWrapperDenial(JSContext* cx, HandleId id, WrapperDenialType type,
}
AutoFilename filename;
uint32_t line = 0;
JS::ColumnNumberZeroOrigin column;
JS::ColumnNumberOneOrigin column;
DescribeScriptedCaller(cx, &filename, &line, &column);
// Warn to the terminal for the logs.