diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
| commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
| tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/third_party/blink/renderer/core/timing/performance_observer.cc | |
| parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
| download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/timing/performance_observer.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/timing/performance_observer.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/core/timing/performance_observer.cc b/chromium/third_party/blink/renderer/core/timing/performance_observer.cc index 64639d33800..9df0dbb3857 100644 --- a/chromium/third_party/blink/renderer/core/timing/performance_observer.cc +++ b/chromium/third_party/blink/renderer/core/timing/performance_observer.cc @@ -5,8 +5,7 @@ #include "third_party/blink/renderer/core/timing/performance_observer.h" #include <algorithm> -#include "third_party/blink/renderer/bindings/core/v8/exception_messages.h" -#include "third_party/blink/renderer/bindings/core/v8/exception_state.h" + #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h" #include "third_party/blink/renderer/bindings/core/v8/v8_performance_observer_callback.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h" @@ -19,6 +18,8 @@ #include "third_party/blink/renderer/core/timing/window_performance.h" #include "third_party/blink/renderer/core/timing/worker_global_scope_performance.h" #include "third_party/blink/renderer/core/workers/worker_global_scope.h" +#include "third_party/blink/renderer/platform/bindings/exception_messages.h" +#include "third_party/blink/renderer/platform/bindings/exception_state.h" #include "third_party/blink/renderer/platform/timer.h" namespace blink { @@ -72,8 +73,10 @@ void PerformanceObserver::observe(const PerformanceObserverInit& observer_init, PerformanceEntryTypeMask entry_types = PerformanceEntry::kInvalid; if (observer_init.hasEntryTypes() && observer_init.entryTypes().size()) { const Vector<String>& sequence = observer_init.entryTypes(); - for (const auto& entry_type_string : sequence) - entry_types |= PerformanceEntry::ToEntryTypeEnum(entry_type_string); + for (const auto& entry_type_string : sequence) { + entry_types |= + PerformanceEntry::ToEntryTypeEnum(AtomicString(entry_type_string)); + } } if (entry_types == PerformanceEntry::kInvalid) { exception_state.ThrowTypeError( @@ -141,9 +144,4 @@ void PerformanceObserver::Trace(blink::Visitor* visitor) { ContextClient::Trace(visitor); } -void PerformanceObserver::TraceWrappers(ScriptWrappableVisitor* visitor) const { - visitor->TraceWrappers(callback_); - ScriptWrappable::TraceWrappers(visitor); -} - } // namespace blink |