diff options
author | 2014-11-13 08:06:40 -0800 | |
---|---|---|
committer | 2014-11-13 08:06:40 -0800 | |
commit | 3b27adef0a52f6d321fdee7412ef69e7a7284bcc (patch) | |
tree | 44edab4ef6bc06603d150d35575cbef69833c82e /dm | |
parent | 1c6e7571d40e31247609fd7469f8422018304310 (diff) |
Revert of Make nanobench and dm be usable from Chromium build (patchset #5 id:80001 of https://codereview.chromium.org/657373002/)
Reason for revert:
Causing breakages on Mac build.
Original issue's description:
> Make nanobench and dm be usable from Chromium build
>
> Move the app logic for each app as follows:
>
> <app>.cpp -- the file which contains main(). Embedders that compile
> their own apps, such as ios shell, upcoming Chromium dm etc, do not use this.
>
> <app>_main.cpp -- the main logic of the Skia test application. This will be
> used by Skia -compiled apps as well as embedder -compiled apps.
>
> <app>_main.h -- the API for the main logic. This will be
> used by Skia -compiled apps as well as embedder -compiled apps.
>
> This way (the upcoming) Chromium dm can setup its Chromium-specific setup
> in custom main(), and then call dm_main(), without the need of any
> SK_BUILD_FOR_XXXX defines controlling whether the tool defines main or not.
>
> BUG=skia:2992
>
> Committed: https://skia.googlesource.com/skia/+/c092d3bdab5f723576cc0346cea3ee282a9cb444
TBR=mtklein@chromium.org,mtklein@google.com,borenet@google.com,kkinnunen@nvidia.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2992
Review URL: https://codereview.chromium.org/724073002
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DM.cpp | 10 | ||||
-rw-r--r-- | dm/dm.h | 14 | ||||
-rw-r--r-- | dm/dm_main.cpp | 16 |
3 files changed, 10 insertions, 30 deletions
@@ -1,6 +1,7 @@ // Main binary for DM. // For a high-level overview, please see dm/README. +#include "CrashHandler.h" #include "LazyDecodeBitmap.h" #include "SkCommonFlags.h" #include "SkForceLinking.h" @@ -186,7 +187,9 @@ static void append_matching_factories(Registry* head, SkTDArray<typename Registr } } +int dm_main(); int dm_main() { + SetupCrashHandler(); SkAutoGraphics ag; SkTaskGroup::Enabler enabled(FLAGS_threads); @@ -241,3 +244,10 @@ int dm_main() { report_failures(failures); return failures.count() > 0; } + +#if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) +int main(int argc, char** argv) { + SkCommandLineFlags::Parse(argc, argv); + return dm_main(); +} +#endif diff --git a/dm/dm.h b/dm/dm.h deleted file mode 100644 index 99b6e10a66..0000000000 --- a/dm/dm.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2014 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#ifndef dm_DEFINED -#define dm_DEFINED - -// API for dm app. - -int dm_main(); - -#endif diff --git a/dm/dm_main.cpp b/dm/dm_main.cpp deleted file mode 100644 index ac8e0f3ce0..0000000000 --- a/dm/dm_main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2014 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "CrashHandler.h" -#include "SkCommandLineFlags.h" -#include "dm.h" - -int main(int argc, char * const argv[]) { - SetupCrashHandler(); - SkCommandLineFlags::Parse(argc, const_cast<char**>(argv)); - return dm_main(); -} |