From cd2bb30aba89a05c0bbd4d6973fa070205e3a1e8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 22 Dec 2015 13:49:44 -0800 Subject: Merge to XFA: Add ContainsKey() and ContainsValue() and use them where appropriate. TBR=ochang@chromium.org Review URL: https://codereview.chromium.org/1540263003 . (cherry picked from commit 1fc92867ca53f0fba4272fbee3814d844f487495) Review URL: https://codereview.chromium.org/1542193002 . --- fpdfsdk/src/javascript/JS_Runtime.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/src/javascript/JS_Runtime.cpp') diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index eaf2dda36c..a20ca8f44d 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -26,6 +26,7 @@ #include "global.h" #include "report.h" #include "util.h" +#include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA #include "../../../xfa/src/fxjse/src/value.h" @@ -326,11 +327,11 @@ FX_BOOL CJS_Runtime::SetHValueByName(const CFX_ByteStringC& utf8Name, #endif void CJS_Runtime::AddObserver(Observer* observer) { - ASSERT(m_observers.find(observer) == m_observers.end()); + ASSERT(!pdfium::ContainsKey(m_observers, observer)); m_observers.insert(observer); } void CJS_Runtime::RemoveObserver(Observer* observer) { - ASSERT(m_observers.find(observer) != m_observers.end()); + ASSERT(pdfium::ContainsKey(m_observers, observer)); m_observers.erase(observer); } -- cgit v1.2.3