Merge pull request #2059 from collinjackson/rename_flutter_strings

Fix #371 Replace “chromium” and “sky” with “flutter” in logs and Mac Shell UI

base/debug/stack_trace_android.cc

@@ -74,7 +74,7 @@ StackTrace::StackTrace() {
 
 void StackTrace::Print() const {
   std::string backtrace = ToString();
-  __android_log_write(ANDROID_LOG_ERROR, "chromium", backtrace.c_str());
+  __android_log_write(ANDROID_LOG_ERROR, "flutter", backtrace.c_str());
 }
 
 // NOTE: Native libraries in APKs are stripped before installing. Print out the
@@ -91,10 +91,10 @@ void StackTrace::OutputToStream(std::ostream* os) const {
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   if (!ReadProcMaps(&proc_maps)) {
     __android_log_write(
-        ANDROID_LOG_ERROR, "chromium", "Failed to read /proc/self/maps");
+        ANDROID_LOG_ERROR, "flutter", "Failed to read /proc/self/maps");
   } else if (!ParseProcMaps(proc_maps, &regions)) {
     __android_log_write(
-        ANDROID_LOG_ERROR, "chromium", "Failed to parse /proc/self/maps");
+        ANDROID_LOG_ERROR, "flutter", "Failed to parse /proc/self/maps");
   }
 
   for (size_t i = 0; i < count_; ++i) {

base/logging.cc

@@ -582,7 +582,7 @@ LogMessage::~LogMessage() {
         priority = ANDROID_LOG_FATAL;
         break;
     }
-    __android_log_write(priority, "chromium", str_newline.c_str());
+    __android_log_write(priority, "flutter", str_newline.c_str());
 #endif
     ignore_result(fwrite(str_newline.data(), str_newline.size(), 1, stderr));
     fflush(stderr);

services/sky/compositor/layer_host.cc

@@ -57,7 +57,7 @@ void LayerHost::BeginFrameSoon() {
 }
 
 void LayerHost::BeginFrame() {
-  TRACE_EVENT0("sky", "LayerHost::BeginFrame");
+  TRACE_EVENT0("flutter", "LayerHost::BeginFrame");
 
   DCHECK(frame_requested_);
   frame_requested_ = false;
@@ -99,7 +99,7 @@ void LayerHost::BeginFrame() {
 }
 
 void LayerHost::Upload(TextureLayer* layer) {
-  TRACE_EVENT0("sky", "LayerHost::Upload");
+  TRACE_EVENT0("flutter", "LayerHost::Upload");
 
   gfx::Size size = layer->size();
   surface_holder_.SetSize(size);

services/sky/compositor/rasterizer_ganesh.cc

@@ -20,7 +20,7 @@ RasterizerGanesh::~RasterizerGanesh() {
 }
 
 scoped_ptr<mojo::GLTexture> RasterizerGanesh::Rasterize(SkPicture* picture) {
-  TRACE_EVENT0("sky", "RasterizerGanesh::Rasterize");
+  TRACE_EVENT0("flutter", "RasterizerGanesh::Rasterize");
 
   SkRect cull_rect = picture->cullRect();
   gfx::Size size(cull_rect.width(), cull_rect.height());

services/sky/compositor/texture_layer.cc

@@ -25,14 +25,14 @@ void TextureLayer::SetSize(const gfx::Size& size) {
 }
 
 void TextureLayer::Display() {
-  TRACE_EVENT0("sky", "Layer::Display");
+  TRACE_EVENT0("flutter", "Layer::Display");
   DCHECK(rasterizer_);
   RefPtr<SkPicture> picture = RecordPicture();
   texture_ = rasterizer_->Rasterize(picture.get());
 }
 
 PassRefPtr<SkPicture> TextureLayer::RecordPicture() {
-  TRACE_EVENT0("sky", "Layer::RecordPicture");
+  TRACE_EVENT0("flutter", "Layer::RecordPicture");
 
   SkRTreeFactory factory;
   SkPictureRecorder recorder;

sky/engine/bindings/dart_runtime_hooks.cc

@@ -147,7 +147,7 @@ void Logger_PrintString(Dart_NativeArguments args) {
 #if defined(OS_ANDROID)
     // In addition to writing to the stdout, write to the logcat so that the
     // message is discoverable when running on an unrooted device.
-    __android_log_print(ANDROID_LOG_INFO, "sky", "%.*s", length, chars);
+    __android_log_print(ANDROID_LOG_INFO, "flutter", "%.*s", length, chars);
 #elif __APPLE__
     syslog(1 /* LOG_ALERT */, "%.*s", (int)length, chars);
 #endif

sky/engine/core/dom/Microtask.cpp

@@ -70,7 +70,7 @@ void Microtask::performCheckpoint()
 {
     MicrotaskQueue& queue = microtaskQueue();
     while(!queue.isEmpty()) {
-        TRACE_EVENT0("sky", "Microtask::performCheckpoint");
+        TRACE_EVENT0("flutter", "Microtask::performCheckpoint");
 
         MicrotaskQueue local;
         swap(queue, local);

sky/engine/core/script/dart_controller.cc

@@ -43,7 +43,7 @@ void CreateEmptyRootLibraryIfNeeded() {
 }
 
 void CallHandleMessage(base::WeakPtr<DartState> dart_state) {
-  TRACE_EVENT0("sky", "CallHandleMessage");
+  TRACE_EVENT0("flutter", "CallHandleMessage");
 
   if (!dart_state)
     return;

sky/engine/tonic/dart_invoke.cc

@@ -13,7 +13,7 @@ namespace blink {
 bool DartInvokeField(Dart_Handle target,
                      const char* name,
                      std::initializer_list<Dart_Handle> args) {
-  TRACE_EVENT1("sky", "DartInvokeField", "name", name);
+  TRACE_EVENT1("flutter", "DartInvokeField", "name", name);
   Dart_Handle field = Dart_NewStringFromCString(name);
   return LogIfError(Dart_Invoke(
       target, field, args.size(), const_cast<Dart_Handle*>(args.begin())));
@@ -22,7 +22,7 @@ bool DartInvokeField(Dart_Handle target,
 bool DartInvokeAppClosure(Dart_Handle closure,
                           int number_of_arguments,
                           Dart_Handle* arguments) {
-  TRACE_EVENT0("sky", "DartInvoke::DartInvokeAppClosure");
+  TRACE_EVENT0("flutter", "DartInvoke::DartInvokeAppClosure");
   Dart_Handle handle = Dart_InvokeClosure(closure, number_of_arguments, arguments);
   bool result = LogIfError(handle);
   CHECK(!Dart_IsCompilationError(handle));

sky/engine/tonic/dart_library_loader.cc

@@ -75,14 +75,14 @@ class DartLibraryLoader::Job : public DartDependency,
 class DartLibraryLoader::ImportJob : public Job {
  public:
   ImportJob(DartLibraryLoader* loader, const std::string& name) : Job(loader, name) {
-    TRACE_EVENT_ASYNC_BEGIN1("sky", "DartLibraryLoader::ImportJob", this, "url",
+    TRACE_EVENT_ASYNC_BEGIN1("flutter", "DartLibraryLoader::ImportJob", this, "url",
                              name);
   }
 
  private:
   // DataPipeDrainer::Client
   void OnDataComplete() override {
-    TRACE_EVENT_ASYNC_END0("sky", "DartLibraryLoader::ImportJob", this);
+    TRACE_EVENT_ASYNC_END0("flutter", "DartLibraryLoader::ImportJob", this);
     loader_->DidCompleteImportJob(this, buffer_);
   }
 };
@@ -91,7 +91,7 @@ class DartLibraryLoader::SourceJob : public Job {
  public:
   SourceJob(DartLibraryLoader* loader, const std::string& name, Dart_Handle library)
       : Job(loader, name), library_(loader->dart_state(), library) {
-    TRACE_EVENT_ASYNC_BEGIN1("sky", "DartLibraryLoader::SourceJob", this, "url",
+    TRACE_EVENT_ASYNC_BEGIN1("flutter", "DartLibraryLoader::SourceJob", this, "url",
                              name);
   }
 
@@ -100,7 +100,7 @@ class DartLibraryLoader::SourceJob : public Job {
  private:
   // DataPipeDrainer::Client
   void OnDataComplete() override {
-    TRACE_EVENT_ASYNC_END0("sky", "DartLibraryLoader::SourceJob", this);
+    TRACE_EVENT_ASYNC_END0("flutter", "DartLibraryLoader::SourceJob", this);
     loader_->DidCompleteSourceJob(this, buffer_);
   }
 

sky/engine/tonic/dart_snapshot_loader.cc

@@ -24,7 +24,7 @@ DartSnapshotLoader::~DartSnapshotLoader() {
 
 void DartSnapshotLoader::LoadSnapshot(mojo::ScopedDataPipeConsumerHandle pipe,
                                       const base::Closure& callback) {
-  TRACE_EVENT_ASYNC_BEGIN0("sky", "DartSnapshotLoader::LoadSnapshot", this);
+  TRACE_EVENT_ASYNC_BEGIN0("flutter", "DartSnapshotLoader::LoadSnapshot", this);
 
   callback_ = callback;
   drainer_.reset(new DataPipeDrainer(this, pipe.Pass()));
@@ -36,7 +36,7 @@ void DartSnapshotLoader::OnDataAvailable(const void* data, size_t num_bytes) {
 }
 
 void DartSnapshotLoader::OnDataComplete() {
-  TRACE_EVENT_ASYNC_END0("sky", "DartSnapshotLoader::LoadSnapshot", this);
+  TRACE_EVENT_ASYNC_END0("flutter", "DartSnapshotLoader::LoadSnapshot", this);
 
   {
     DartIsolateScope scope(dart_state_->isolate());

sky/shell/gpu/direct/rasterizer_direct.cc

@@ -50,7 +50,7 @@ void RasterizerDirect::OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widge
 }
 
 void RasterizerDirect::Draw(scoped_ptr<compositor::LayerTree> layer_tree) {
-  TRACE_EVENT0("sky", "RasterizerDirect::Draw");
+  TRACE_EVENT0("flutter", "RasterizerDirect::Draw");
 
   if (!surface_)
     return;

sky/shell/gpu/mojo/rasterizer_mojo.cc

@@ -39,7 +39,7 @@ RasterCallback RasterizerMojo::GetRasterCallback() {
 }
 
 void RasterizerMojo::Draw(scoped_ptr<compositor::LayerTree> layer_tree) {
-  TRACE_EVENT0("sky", "RasterizerMojo::Draw");
+  TRACE_EVENT0("flutter", "RasterizerMojo::Draw");
   MGLResizeSurface(layer_tree->frame_size().width(),
                    layer_tree->frame_size().height());
   SkCanvas* canvas = ganesh_canvas_.GetCanvas(0, layer_tree->frame_size());

sky/shell/platform/mac/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Sky</string>
+	<string>Flutter</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -25,7 +25,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015 The Chromium Authors. All rights reserved.</string>
+	<string>Copyright 2015 The Flutter Authors. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>sky_mac</string>
 	<key>NSPrincipalClass</key>

sky/shell/platform/mac/sky_mac.xib

@@ -19,11 +19,11 @@
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
             <items>
-                <menuItem title="Sky" id="1Xt-HY-uBw">
+                <menuItem title="Flutter" id="1Xt-HY-uBw">
                     <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Sky" systemMenu="apple" id="uQy-DD-JDr">
+                    <menu key="submenu" title="Flutter" systemMenu="apple" id="uQy-DD-JDr">
                         <items>
-                            <menuItem title="About Sky" id="5kV-Vb-QxS">
+                            <menuItem title="About Flutter" id="5kV-Vb-QxS">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
@@ -37,7 +37,7 @@
                                 <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                            <menuItem title="Hide Sky" keyEquivalent="h" id="Olw-nP-bQN">
+                            <menuItem title="Hide Flutter" keyEquivalent="h" id="Olw-nP-bQN">
                                 <connections>
                                     <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
                                 </connections>
@@ -55,7 +55,7 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                            <menuItem title="Quit Sky" keyEquivalent="q" id="4sb-4s-VLi">
+                            <menuItem title="Quit Flutter" keyEquivalent="q" id="4sb-4s-VLi">
                                 <connections>
                                     <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
                                 </connections>
@@ -656,7 +656,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                         <items>
-                            <menuItem title="Sky Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                            <menuItem title="Flutter Help" keyEquivalent="?" id="FKE-Sm-Kum">
                                 <connections>
                                     <action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
                                 </connections>
@@ -666,7 +666,7 @@
                 </menuItem>
             </items>
         </menu>
-        <window title="Sky" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="SkyWindow">
+        <window title="Flutter" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="SkyWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>

sky/shell/ui/animator.cc

@@ -29,7 +29,7 @@ Animator::~Animator() {
 void Animator::RequestFrame() {
   if (engine_requested_frame_)
     return;
-  TRACE_EVENT_ASYNC_BEGIN0("sky", "Frame request pending", this);
+  TRACE_EVENT_ASYNC_BEGIN0("flutter", "Frame request pending", this);
   engine_requested_frame_ = true;
 
   DCHECK(!did_defer_frame_request_);
@@ -56,7 +56,7 @@ void Animator::Start() {
 }
 
 void Animator::BeginFrame(int64_t time_stamp) {
-  TRACE_EVENT_ASYNC_END0("sky", "Frame request pending", this);
+  TRACE_EVENT_ASYNC_END0("flutter", "Frame request pending", this);
   DCHECK(engine_requested_frame_);
   DCHECK(outstanding_requests_ > 0);
   DCHECK(outstanding_requests_ <= kPipelineDepth) << outstanding_requests_;

sky/shell/ui/engine.cc

@@ -73,7 +73,7 @@ base::WeakPtr<Engine> Engine::GetWeakPtr() {
 }
 
 void Engine::Init() {
-  TRACE_EVENT0("sky", "Engine::Init");
+  TRACE_EVENT0("flutter", "Engine::Init");
 
   base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
   blink::WebRuntimeFeatures::enableDartCheckedMode(
@@ -86,7 +86,7 @@ void Engine::Init() {
 
 std::unique_ptr<compositor::LayerTree> Engine::BeginFrame(
     base::TimeTicks frame_time) {
-  TRACE_EVENT0("sky", "Engine::BeginFrame");
+  TRACE_EVENT0("flutter", "Engine::BeginFrame");
 
   if (!sky_view_)
     return nullptr;
@@ -146,7 +146,7 @@ void Engine::OnViewportMetricsChanged(ViewportMetricsPtr metrics) {
 }
 
 void Engine::OnInputEvent(InputEventPtr event) {
-  TRACE_EVENT0("sky", "Engine::OnInputEvent");
+  TRACE_EVENT0("flutter", "Engine::OnInputEvent");
 
   if (event->type != EventType::BACK)
     return;
@@ -159,7 +159,7 @@ void Engine::OnInputEvent(InputEventPtr event) {
 }
 
 void Engine::OnPointerPacket(pointer::PointerPacketPtr packet) {
-  TRACE_EVENT0("sky", "Engine::OnPointerPacket");
+  TRACE_EVENT0("flutter", "Engine::OnPointerPacket");
 
   // Convert the pointers' x and y coordinates to logical pixels.
   for (auto it = packet->pointers.begin(); it != packet->pointers.end(); ++it) {