diff --git a/base/debug/stack_trace_android.cc b/base/debug/stack_trace_android.cc index 5168b188da2f683a1ae50c830fbfdb57421a69e2..6604701b77d119c2ec0b51ddd5092cb4ce0b56df 100644 --- a/base/debug/stack_trace_android.cc +++ b/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, ®ions)) { __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) { diff --git a/base/logging.cc b/base/logging.cc index 559cb083b6ad3227e161ed57dc551a51a699b46a..29421f0f1b8816e5f40a9b412f2181c0acee8b5b 100644 --- a/base/logging.cc +++ b/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); diff --git a/services/sky/compositor/layer_host.cc b/services/sky/compositor/layer_host.cc index 6266c8a9215886c94d54d9e27397b8b7e033333b..0073217c22327c3222cb9af000a29805b021032e 100644 --- a/services/sky/compositor/layer_host.cc +++ b/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); diff --git a/services/sky/compositor/rasterizer_ganesh.cc b/services/sky/compositor/rasterizer_ganesh.cc index 1d660bee4bbaa6fe8d284b901e72bae9440a1432..9d61d0114c768e9720ab01124b4b696d398df19e 100644 --- a/services/sky/compositor/rasterizer_ganesh.cc +++ b/services/sky/compositor/rasterizer_ganesh.cc @@ -20,7 +20,7 @@ RasterizerGanesh::~RasterizerGanesh() { } scoped_ptr 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()); diff --git a/services/sky/compositor/texture_layer.cc b/services/sky/compositor/texture_layer.cc index 134fcf37aca787b98e761baacc03800438e58589..a2c55ce3335b6645bf901ddf1b48c167f7fe0911 100644 --- a/services/sky/compositor/texture_layer.cc +++ b/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 picture = RecordPicture(); texture_ = rasterizer_->Rasterize(picture.get()); } PassRefPtr TextureLayer::RecordPicture() { - TRACE_EVENT0("sky", "Layer::RecordPicture"); + TRACE_EVENT0("flutter", "Layer::RecordPicture"); SkRTreeFactory factory; SkPictureRecorder recorder; diff --git a/sky/engine/bindings/dart_runtime_hooks.cc b/sky/engine/bindings/dart_runtime_hooks.cc index fa247ebae05a5fa8ce71b9d0217d0a1e1732fa25..fb5a372a8405a5bf00a3a53e427f49e72b6c9774 100644 --- a/sky/engine/bindings/dart_runtime_hooks.cc +++ b/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 diff --git a/sky/engine/core/dom/Microtask.cpp b/sky/engine/core/dom/Microtask.cpp index 5affa51ceaafffe17dabbde96a0e4f2dfc47cdaf..66c2cee44512f2b9857bf4a5c20bcfb20c7ac076 100644 --- a/sky/engine/core/dom/Microtask.cpp +++ b/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); diff --git a/sky/engine/core/script/dart_controller.cc b/sky/engine/core/script/dart_controller.cc index 0835697fe4f41f62239f1b8a5ca5334bb49c0a5c..7112751f44305f08ab310ebfad8de13b82fe30e1 100644 --- a/sky/engine/core/script/dart_controller.cc +++ b/sky/engine/core/script/dart_controller.cc @@ -43,7 +43,7 @@ void CreateEmptyRootLibraryIfNeeded() { } void CallHandleMessage(base::WeakPtr dart_state) { - TRACE_EVENT0("sky", "CallHandleMessage"); + TRACE_EVENT0("flutter", "CallHandleMessage"); if (!dart_state) return; diff --git a/sky/engine/tonic/dart_invoke.cc b/sky/engine/tonic/dart_invoke.cc index 148447b54237c756a5a0081ad9d95d721789c128..e606c282426ce8fd098691e33bd4794d086be718 100644 --- a/sky/engine/tonic/dart_invoke.cc +++ b/sky/engine/tonic/dart_invoke.cc @@ -13,7 +13,7 @@ namespace blink { bool DartInvokeField(Dart_Handle target, const char* name, std::initializer_list 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(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)); diff --git a/sky/engine/tonic/dart_library_loader.cc b/sky/engine/tonic/dart_library_loader.cc index 0b65fd6ea6e904b3c2c1339348054430014a840d..b74a00423fcd0682f18dfc8c4dd339bcf9a790e9 100644 --- a/sky/engine/tonic/dart_library_loader.cc +++ b/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_); } diff --git a/sky/engine/tonic/dart_snapshot_loader.cc b/sky/engine/tonic/dart_snapshot_loader.cc index b735337648eaf87f6e161e8a6da138eb1770ee44..8eef46bbe313219ef02c8e089052877f475112c7 100644 --- a/sky/engine/tonic/dart_snapshot_loader.cc +++ b/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()); diff --git a/sky/shell/gpu/direct/rasterizer_direct.cc b/sky/shell/gpu/direct/rasterizer_direct.cc index cedb362bd53645803e2b78bad3e2656b53c150d9..0df4e920469774961c09a3d322fc116dd60fafd5 100644 --- a/sky/shell/gpu/direct/rasterizer_direct.cc +++ b/sky/shell/gpu/direct/rasterizer_direct.cc @@ -50,7 +50,7 @@ void RasterizerDirect::OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widge } void RasterizerDirect::Draw(scoped_ptr layer_tree) { - TRACE_EVENT0("sky", "RasterizerDirect::Draw"); + TRACE_EVENT0("flutter", "RasterizerDirect::Draw"); if (!surface_) return; diff --git a/sky/shell/gpu/mojo/rasterizer_mojo.cc b/sky/shell/gpu/mojo/rasterizer_mojo.cc index ae2e6166880e5cd4ede9a073c6c702471a663bac..0c98c77ab7da27fdd203e25ef40d8c4b8e0401a3 100644 --- a/sky/shell/gpu/mojo/rasterizer_mojo.cc +++ b/sky/shell/gpu/mojo/rasterizer_mojo.cc @@ -39,7 +39,7 @@ RasterCallback RasterizerMojo::GetRasterCallback() { } void RasterizerMojo::Draw(scoped_ptr 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()); diff --git a/sky/shell/platform/mac/Info.plist b/sky/shell/platform/mac/Info.plist index 02327c57cef03d08bdc669eefe6272f195d78666..76ee583303b1c1e7cecffc2189aeb95389609ca3 100644 --- a/sky/shell/platform/mac/Info.plist +++ b/sky/shell/platform/mac/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Sky + Flutter CFBundlePackageType APPL CFBundleShortVersionString @@ -25,7 +25,7 @@ LSMinimumSystemVersion 10.6 NSHumanReadableCopyright - Copyright © 2015 The Chromium Authors. All rights reserved. + Copyright 2015 The Flutter Authors. All rights reserved. NSMainNibFile sky_mac NSPrincipalClass diff --git a/sky/shell/platform/mac/sky_mac.xib b/sky/shell/platform/mac/sky_mac.xib index 0173ec3d28ee92d225c08920b1d445acbd5d00b5..88f0843c562b5fe8529c764394a700b7520cb5f9 100644 --- a/sky/shell/platform/mac/sky_mac.xib +++ b/sky/shell/platform/mac/sky_mac.xib @@ -19,11 +19,11 @@ - + - + - + @@ -37,7 +37,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -656,7 +656,7 @@ - + @@ -666,7 +666,7 @@ - + diff --git a/sky/shell/ui/animator.cc b/sky/shell/ui/animator.cc index bad4b2458d1db2bc716446625dad516ad1355935..ae869e491f02f605832e4852a4e8bc0616148ffb 100644 --- a/sky/shell/ui/animator.cc +++ b/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_; diff --git a/sky/shell/ui/engine.cc b/sky/shell/ui/engine.cc index 5f6dbda141469a75b67279307edf1a8451080bf7..96c28b4de46b436080304bb27c031d5179fdd9a0 100644 --- a/sky/shell/ui/engine.cc +++ b/sky/shell/ui/engine.cc @@ -73,7 +73,7 @@ base::WeakPtr 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 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) {