2 files changed, 111 insertions, 11 deletions
diff --git a/chromium/v8/samples/cppgc/cppgc-for-v8-embedders.cc b/chromium/v8/samples/cppgc/cppgc-for-v8-embedders.cc
new file mode 100644
index 00000000000..8aaa9cd39ce
--- /dev/null
+++ b/chromium/v8/samples/cppgc/cppgc-for-v8-embedders.cc
@@ -0,0 +1,106 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <include/cppgc/allocation.h>
+#include <include/cppgc/garbage-collected.h>
+#include <include/cppgc/heap.h>
+#include <include/cppgc/member.h>
+#include <include/cppgc/platform.h>
+#include <include/cppgc/visitor.h>
+#include <include/libplatform/libplatform.h>
+#include <include/v8.h>
+
+#include <iostream>
+#include <memory>
+#include <string>
+
+/**
+ * This sample program shows how to set up a stand-alone cppgc heap as an
+ * embedder of V8. Most importantly, this example shows how to reuse V8's
+ * platform for cppgc.
+ */
+
+/**
+ * Platform used by cppgc. Can just redirect to v8::Platform for most calls.
+ * Exception: GetForegroundTaskRunner(), see below.
+ *
+ * This example uses V8's default platform implementation to drive the cppgc
+ * platform.
+ */
+class Platform final : public cppgc::Platform {
+ public:
+  Platform() : v8_platform_(v8::platform::NewDefaultPlatform()) {}
+
+  cppgc::PageAllocator* GetPageAllocator() final {
+    return v8_platform_->GetPageAllocator();
+  }
+
+  double MonotonicallyIncreasingTime() final {
+    return v8_platform_->MonotonicallyIncreasingTime();
+  }
+
+  std::shared_ptr<cppgc::TaskRunner> GetForegroundTaskRunner() final {
+    // V8's default platform creates a new task runner when passed the
+    // v8::Isolate pointer the first time. For non-default platforms this will
+    // require getting the appropriate task runner.
+    return v8_platform_->GetForegroundTaskRunner(nullptr);
+  }
+
+  std::unique_ptr<cppgc::JobHandle> PostJob(
+      cppgc::TaskPriority priority,
+      std::unique_ptr<cppgc::JobTask> job_task) final {
+    return v8_platform_->PostJob(priority, std::move(job_task));
+  }
+
+ private:
+  std::unique_ptr<v8::Platform> v8_platform_;
+};
+
+/**
+ * Simple string rope to illustrate allocation and garbage collection below. The
+ * rope keeps the next parts alive via regular managed reference.
+ */
+class Rope final : public cppgc::GarbageCollected<Rope> {
+ public:
+  explicit Rope(std::string part, Rope* next = nullptr)
+      : part_(part), next_(next) {}
+
+  void Trace(cppgc::Visitor* visitor) const { visitor->Trace(next_); }
+
+ private:
+  std::string part_;
+  cppgc::Member<Rope> next_;
+
+  friend std::ostream& operator<<(std::ostream& os, const Rope& rope);
+};
+
+std::ostream& operator<<(std::ostream& os, const Rope& rope) {
+  os << rope.part_;
+  if (rope.next_) {
+    os << *rope.next_;
+  }
+  return os;
+}
+
+int main(int argc, char* argv[]) {
+  // Create a platform that is used by cppgc::Heap for execution and backend
+  // allocation.
+  auto cppgc_platform = std::make_shared<Platform>();
+  // Initialize the process. This must happen before any cppgc::Heap::Create()
+  // calls.
+  cppgc::InitializeProcess(cppgc_platform->GetPageAllocator());
+  // Create a managed heap.
+  std::unique_ptr<cppgc::Heap> heap = cppgc::Heap::Create(cppgc_platform);
+  // Allocate a string rope on the managed heap.
+  auto* greeting = cppgc::MakeGarbageCollected<Rope>(
+      heap->GetAllocationHandle(), "Hello ",
+      cppgc::MakeGarbageCollected<Rope>(heap->GetAllocationHandle(), "World!"));
+  // Manually trigger garbage collection. The object greeting is held alive
+  // through conservative stack scanning.
+  heap->ForceGarbageCollectionSlow("V8 embedders example", "Testing");
+  std::cout << *greeting << std::endl;
+  // Gracefully shutdown the process.
+  cppgc::ShutdownProcess();
+  return 0;
+}
diff --git a/chromium/v8/samples/shell.cc b/chromium/v8/samples/shell.cc
index aed050ceccd..70450296c76 100644
--- a/chromium/v8/samples/shell.cc
+++ b/chromium/v8/samples/shell.cc
@@ -108,21 +108,15 @@ v8::Local<v8::Context> CreateShellContext(v8::Isolate* isolate) {
   // Create a template for the global object.
   v8::Local<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate);
   // Bind the global 'print' function to the C++ Print callback.
-  global->Set(v8::String::NewFromUtf8Literal(isolate, "print"),
-              v8::FunctionTemplate::New(isolate, Print));
+  global->Set(isolate, "print", v8::FunctionTemplate::New(isolate, Print));
   // Bind the global 'read' function to the C++ Read callback.
-  global->Set(v8::String::NewFromUtf8Literal(isolate, "read"),
-              v8::FunctionTemplate::New(isolate, Read));
+  global->Set(isolate, "read", v8::FunctionTemplate::New(isolate, Read));
   // Bind the global 'load' function to the C++ Load callback.
-  global->Set(v8::String::NewFromUtf8Literal(isolate, "load"),
-              v8::FunctionTemplate::New(isolate, Load));
+  global->Set(isolate, "load", v8::FunctionTemplate::New(isolate, Load));
   // Bind the 'quit' function
-  global->Set(v8::String::NewFromUtf8Literal(isolate, "quit"),
-              v8::FunctionTemplate::New(isolate, Quit));
+  global->Set(isolate, "quit", v8::FunctionTemplate::New(isolate, Quit));
   // Bind the 'version' function
-  global->Set(v8::String::NewFromUtf8Literal(isolate, "version"),
-              v8::FunctionTemplate::New(isolate, Version));
-
+  global->Set(isolate, "version", v8::FunctionTemplate::New(isolate, Version));
   return v8::Context::New(isolate, NULL, global);
 }