commit 47793dc8668a6377c9b2469f40d34506ce6b8eda
author Tom Sepez <tsepez@chromium.org> Wed May 26 20:03:38 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 26 20:03:38 2021 +0000
tree 03b1f3404054fa825141be949f0732b1b49ac65d
parent 0056f91ea7dcbf5b8d4bcb5bcb9f912e33285eb3

Remove bool arg from ReentrantHasObjectOwnPropertyHelper()

Only caller always passes it as false.

Change-Id: Iff0b7602318f47ffff33f0aebecfd111c8e1b846
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/81111
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

fxjs/fxv8.cpp

diff --git a/fxjs/fxv8.cpp b/fxjs/fxv8.cpp
index 551338d..e139e26 100644
--- a/fxjs/fxv8.cpp
+++ b/fxjs/fxv8.cpp
@@ -234,8 +234,7 @@
 
 bool ReentrantHasObjectOwnPropertyHelper(v8::Isolate* pIsolate,
                                          v8::Local<v8::Object> pObj,
-                                         ByteStringView bsUTF8PropertyName,
-                                         bool bUseTypeGetter) {
+                                         ByteStringView bsUTF8PropertyName) {
   if (pObj.IsEmpty())
     return false;
 
@@ -243,9 +242,7 @@
   v8::Local<v8::Context> pContext = pIsolate->GetCurrentContext();
   v8::Local<v8::String> hKey =
       fxv8::NewStringHelper(pIsolate, bsUTF8PropertyName);
-  return pObj->HasRealNamedProperty(pContext, hKey).FromJust() ||
-         (bUseTypeGetter &&
-          pObj->HasOwnProperty(pContext, hKey).FromMaybe(false));
+  return pObj->HasRealNamedProperty(pContext, hKey).FromJust();
 }
 
 bool ReentrantSetObjectOwnPropertyHelper(v8::Isolate* pIsolate,

fxjs/fxv8.h

diff --git a/fxjs/fxv8.h b/fxjs/fxv8.h
index 88ff38e..75655c7 100644
--- a/fxjs/fxv8.h
+++ b/fxjs/fxv8.h
@@ -76,8 +76,7 @@
     v8::Local<v8::Object> pObj);
 bool ReentrantHasObjectOwnPropertyHelper(v8::Isolate* pIsolate,
                                          v8::Local<v8::Object> pObj,
-                                         ByteStringView bsUTF8PropertyName,
-                                         bool bUseTypeGetter);
+                                         ByteStringView bsUTF8PropertyName);
 bool ReentrantSetObjectOwnPropertyHelper(v8::Isolate* pIsolate,
                                          v8::Local<v8::Object> pObj,
                                          ByteStringView bsUTF8PropertyName,

fxjs/xfa/cfxjse_engine.cpp

diff --git a/fxjs/xfa/cfxjse_engine.cpp b/fxjs/xfa/cfxjse_engine.cpp
index cc83f08..fc5f118 100644
--- a/fxjs/xfa/cfxjse_engine.cpp
+++ b/fxjs/xfa/cfxjse_engine.cpp
@@ -595,7 +595,7 @@
   }
 
   if (!fxv8::ReentrantHasObjectOwnPropertyHelper(GetIsolate(), pObject,
-                                                 szPropName, false)) {
+                                                 szPropName)) {
     return false;
   }