Use HeapProfiler::FindObjectById when searching for node

Source/bindings/v8/ScriptProfiler.cpp

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 89 matching lines @@
 {
     v8::V8::LowMemoryNotification();
 }
 
 ScriptObject ScriptProfiler::objectByHeapObjectId(unsigned id)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HeapProfiler* profiler = isolate->GetHeapProfiler();
     if (!profiler)
         return ScriptObject();
-    // As ids are unique, it doesn't matter which HeapSnapshot owns HeapGraphNode.
-    // We need to find first HeapSnapshot containing a node with the specified id.
-    const v8::HeapGraphNode* node = 0;
-    for (int i = 0, l = profiler->GetSnapshotCount(); i < l; ++i) {
-        const v8::HeapSnapshot* snapshot = profiler->GetHeapSnapshot(i);
-        node = snapshot->GetNodeById(id);
-        if (node)
-            break;
-    }
-    if (!node)
-        return ScriptObject();
 
     v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Value> value = node->GetHeapValue();
-    if (!value->IsObject())
+    v8::Handle<v8::Value> value = profiler->FindObjectById(id);
+    if (value.IsEmpty() || !value->IsObject())
         return ScriptObject();
 
     v8::Handle<v8::Object> object = value.As<v8::Object>();
 
     if (object->InternalFieldCount() >= v8DefaultWrapperInternalFieldCount) {
         v8::Handle<v8::Value> wrapper = object->GetInternalField(v8DOMWrapperObjectIndex);
         // Skip wrapper boilerplates which are like regular wrappers but don't have
         // native object.
         if (!wrapper.IsEmpty() && wrapper->IsUndefined())
             return ScriptObject();
     }
 
     ScriptState* scriptState = ScriptState::forContext(object->CreationContext());
     return ScriptObject(scriptState, object);
 }
 
 unsigned ScriptProfiler::getHeapObjectId(const ScriptValue& value)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HeapProfiler* profiler = isolate->GetHeapProfiler();
     v8::SnapshotObjectId id = profiler->GetObjectId(value.v8Value());
     return id;
 }
 
+void ScriptProfiler::clearHeapObjectIds()
+{
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::HeapProfiler* profiler = isolate->GetHeapProfiler();

[alph, 2013/12/04 10:18:41]

Just curious, why do you check for profiler not being null in
objectByHeapObjectId but not here?

[yurys, 2013/12/04 11:33:27]

The check is redundant, removed it from ScriptProfiler::objectByHeapObjectId
too.

+    profiler->ClearObjectIds();
+}
+
 namespace {
 
 class ActivityControlAdapter : public v8::ActivityControl {
 public:
     ActivityControlAdapter(ScriptProfiler::HeapSnapshotProgress* progress)
             : m_progress(progress), m_firstReport(true) { }
     ControlOption ReportProgressValue(int done, int total)
     {
         ControlOption result = m_progress->isCanceled() ? kAbort : kContinue;
         if (m_firstReport) {
@@ skipping 153 matching lines @@
 }
 
 void ScriptProfiler::setIdle(bool isIdle)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     if (v8::CpuProfiler* profiler = isolate->GetCpuProfiler())
         profiler->SetIdle(isIdle);
 }
 
 } // namespace WebCore