test,tools: whitespace changes for clang-format

Change-Id: I67529f6c0ac26da603f60af22c620f8f603d8a19
Reviewed-on: https://skia-review.googlesource.com/155564
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2018-09-19 11:31:27 -04:00 committed by Skia Commit-Bot
parent 8f6cd824d2
commit 8a00144035
62 changed files with 128 additions and 77 deletions

View File

@ -13,6 +13,7 @@
#include "SkTemplates.h"
#include "gUniqueGlyphIDs.h"
#define gUniqueGlyphIDs_Sentinel 0xFFFF
static int count_glyphs(const uint16_t start[]) {

View File

@ -12,6 +12,7 @@
#include "SkRandom.h"
#include "SkTDArray.h"
#include "SkTemplates.h"
#include <new>
// change this to 0 to compare GrMemoryPool to default new / delete

View File

@ -1177,6 +1177,7 @@ DEF_BENCH( return new ConservativelyContainsBench(ConservativelyContainsBench::k
#include "SkPathOps.h"
#include "SkPathPriv.h"
DEF_BENCH( return new TightBoundsBench([](const SkPath& path){ return path.computeTightBounds();},
"priv"); )
DEF_BENCH( return new TightBoundsBench([](const SkPath& path) {

View File

@ -12,6 +12,7 @@
#include "SkRandom.h"
#include "SkRRect.h"
#include "SkString.h"
#include <stdio.h>
#include <stdlib.h>
#include <functional>

View File

@ -9,6 +9,7 @@
#include "SkRandom.h"
#include "SkString.h"
#include "SkTSort.h"
#include <algorithm>
#include <stdlib.h>

View File

@ -6,8 +6,6 @@
*/
#include "DMSrcSink.h"
#include <cmath>
#include <functional>
#include "../src/jumper/SkJumper.h"
#include "DDLPromiseImageHelper.h"
#include "DDLTileHelper.h"
@ -77,6 +75,9 @@
#include "SkXMLWriter.h"
#endif
#include <cmath>
#include <functional>
#include "../third_party/skcms/skcms.h"
DEFINE_bool(multiPage, false, "For document-type backends, render the source"

View File

@ -28,12 +28,12 @@
#include "SkSLCompiler.h"
#endif
#include "sk_tool_utils.h"
#include <iostream>
#include <map>
#include <regex>
#include <signal.h>
#include "sk_tool_utils.h"
DEFINE_string2(bytes, b, "", "A path to a file or a directory. If a file, the "
"contents will be used as the fuzz bytes. If a directory, all files "

View File

@ -8,6 +8,7 @@
#include "Fuzz.h"
#include "SkString.h"
#include "SkParsePath.h"
#include <stdlib.h>
// Most of this is taken from random_parse_path.cpp and adapted to use the Fuzz

View File

@ -50,6 +50,7 @@ static void sk_gm_get_colorfilters(SkTArray<sk_sp<SkColorFilter>>* array) {
}
///////////////////////////////////////////////////////////////////////////////////////////////////
#include "SkGradientShader.h"
#include "SkImage.h"
#include "Resources.h"
@ -187,6 +188,7 @@ DEF_SIMPLE_GM(colorfilterimagefilter_layer, canvas, 32, 32) {
///////////////////////////////////////////////////////////////////////////////////////////////////
#include "SkGradientShader.h"
template <typename T> class SkTRefArray : public SkTDArray<T> {
public:
~SkTRefArray() { this->unrefAll(); }

View File

@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
#include <functional>
#include "gm.h"
#include "sk_tool_utils.h"
#include "GrContext.h"
#include "SkAutoPixmapStorage.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
#include "SkData.h"
#include "SkCanvas.h"
#include "SkRandom.h"
#include "SkStream.h"
#include "SkSurface.h"
#include "gm.h"
#include "sk_tool_utils.h"
#include "GrContext.h"
#include <functional>
static void drawContents(SkSurface* surface, SkColor fillC) {
SkSize size = SkSize::Make(SkIntToScalar(surface->width()),

View File

@ -11,6 +11,7 @@
#include "SkPath.h"
#include "SkPoint.h"
#include "SkRandom.h"
#include <math.h>
namespace skiagm {

View File

@ -10,6 +10,7 @@
#include "SkPaint.h"
#include "SkPath.h"
#include "SkPoint.h"
#include <array>
#include <vector>

View File

@ -9,6 +9,7 @@
#include "SkCanvas.h"
#include "SkVertices.h"
#include "SkPoint.h"
#include <iostream>
#include <vector>

View File

@ -4,36 +4,37 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "Sample.h"
#include "SkBlurMask.h"
#include "SkCanvas.h"
#include "DecodeFile.h"
#include "Sk1DPathEffect.h"
#include "Sk2DPathEffect.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkCanvas.h"
#include "SkColorMatrixFilter.h"
#include "SkColorPriv.h"
#include "SkCornerPathEffect.h"
#include "SkDashPathEffect.h"
#include "SkDiscretePathEffect.h"
#include "SkEmbossMaskFilter.h"
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
#include "SkGradientShader.h"
#include "SkMath.h"
#include "SkPath.h"
#include "SkPictureRecorder.h"
#include "SkRegion.h"
#include "SkShader.h"
#include "SkCornerPathEffect.h"
#include "SkPathMeasure.h"
#include "SkPicture.h"
#include "SkPictureRecorder.h"
#include "SkRandom.h"
#include "SkReadBuffer.h"
#include "SkRegion.h"
#include "SkShader.h"
#include "SkTextOnPath.h"
#include "SkTypeface.h"
#include "SkUTF.h"
#include "SkWriteBuffer.h"
#include <math.h>
#include "DecodeFile.h"
class Dot2DPathEffect : public Sk2DPathEffect {
public:

View File

@ -16,8 +16,9 @@
#include "SkStream.h"
#include "SkTypes.h"
#include "Test.h"
#include "png.h"
#include "../third_party/skcms/skcms.h"
#include "png.h"
#include <memory>
#include <utility>

View File

@ -5,8 +5,11 @@
* found in the LICENSE file.
*/
#include "GrContextFactory.h"
#include "GrTypes.h"
#include "SkBitmap.h"
#include "SkDevice.h"
#include "SkGpuDevice.h"
#include "SkImage.h"
#include "SkImageInfo.h"
#include "SkRect.h"
@ -14,11 +17,8 @@
#include "SkSpecialImage.h"
#include "SkTypes.h"
#include "Test.h"
class SkColorSpace;
#include "GrContextFactory.h"
#include "GrTypes.h"
#include "SkGpuDevice.h"
class SkColorSpace;
class GrContext;
class DeviceTestingAccess {

View File

@ -12,7 +12,6 @@
* have been selected to require 32 bits of precision and full IEEE conformance
*/
#include <float.h>
#include "Test.h"
#include "GrContext.h"
@ -22,6 +21,8 @@
#include "ProxyUtils.h"
#include "SkHalf.h"
#include <float.h>
static const int DEV_W = 100, DEV_H = 100;
template <typename T>

View File

@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include <fontconfig/fontconfig.h>
#include "Resources.h"
#include "SkCanvas.h"
#include "SkFontMgr.h"
@ -13,6 +12,8 @@
#include "SkTypeface.h"
#include "Test.h"
#include <fontconfig/fontconfig.h>
static bool bitmap_compare(const SkBitmap& ref, const SkBitmap& test) {
for (int y = 0; y < test.height(); ++y) {
for (int x = 0; x < test.width(); ++x) {
@ -92,4 +93,4 @@ DEF_TEST(FontMgrFontConfig, reporter) {
bool success = bitmap_compare(bitmapStream, bitmapClone);
REPORTER_ASSERT(reporter, success);
}
}
}

View File

@ -9,6 +9,7 @@
#include "SkPointPriv.h"
#include "SkRandom.h"
#include "Test.h"
#include <array>
#include <numeric>

View File

@ -7,13 +7,12 @@
#include "SkGlyphRun.h"
#include "SkTextBlob.h"
#include "Test.h"
#include <algorithm>
#include <memory>
#include "SkTextBlob.h"
#include "Test.h"
DEF_TEST(GlyphRunGlyphIDSetBasic, reporter) {
SkGlyphID glyphs[] = {100, 3, 240, 3, 234};
auto glyphIDs = SkSpan<const SkGlyphID>(glyphs, SK_ARRAY_COUNT(glyphs));

View File

@ -24,6 +24,7 @@
#include "sk_tool_utils.h"
#include "ccpr/GrCoverageCountingPathRenderer.h"
#include "mock/GrMockTypes.h"
#include <cmath>
static constexpr int kCanvasSize = 100;

View File

@ -5,8 +5,6 @@
* found in the LICENSE file.
*/
#include <initializer_list>
#include <functional>
#include "Test.h"
#include "GrShape.h"
#include "SkCanvas.h"
@ -17,6 +15,8 @@
#include "SkSurface.h"
#include "SkClipOpPriv.h"
#include <initializer_list>
#include <functional>
#include <utility>
uint32_t GrShape::testingOnly_getOriginalGenerationID() const {

View File

@ -12,6 +12,7 @@
#include "SkICC.h"
#include "SkString.h"
#include "Test.h"
#include "../third_party/skcms/skcms.h"
DEF_TEST(WriteICCProfile, r) {

View File

@ -8,6 +8,7 @@
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
#include "SkString.h"
#include <atomic>
static int loopNo = 4;

View File

@ -8,6 +8,7 @@
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
#include "SkString.h"
#include <atomic>
static int loopNo = 158;

View File

@ -8,6 +8,7 @@
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
#include "SkString.h"
#include <atomic>
static int loopNo = 17;

View File

@ -7,6 +7,7 @@
#include "PathOpsDebug.h"
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
#include <atomic>
#define TEST(name) { name, #name }

View File

@ -8,7 +8,6 @@
#include "SkTypes.h"
#include "Test.h"
#include <random>
#include "GrClip.h"
#include "GrContext.h"
#include "GrContextPriv.h"
@ -23,6 +22,8 @@
#include "ops/GrMeshDrawOp.h"
#include "ops/GrRectOpFactory.h"
#include <random>
namespace {
class TestOp : public GrMeshDrawOp {
public:

View File

@ -12,8 +12,8 @@
#include "SkRecords.h"
#include "SkShader.h"
#include "Test.h"
#include <new>
#include <new>
// Sums the area of any DrawRect command it sees.
class AreaSummer {

View File

@ -14,6 +14,7 @@
#include "../include/core/SkString.h"
#include "../include/core/SkPictureRecorder.h"
#include "../src/core/SkBlendModePriv.h"
#include <cstring>
// Verify that replay of a recording into a clipped canvas

View File

@ -9,6 +9,7 @@
#include "SkTypes.h"
#include "SkWeakRefCnt.h"
#include "Test.h"
#include <thread>
static void bounce_ref(void* data) {

View File

@ -7,7 +7,6 @@
#include "SkTypes.h"
#include <thread>
#include "GrContext.h"
#include "GrContextPriv.h"
#include "GrContextFactory.h"
@ -27,6 +26,8 @@
#include "SkSurface.h"
#include "Test.h"
#include <thread>
static const int gWidth = 640;
static const int gHeight = 480;

View File

@ -9,9 +9,10 @@
#include "SkRasterPipeline.h"
#include "SkTypes.h"
#include "Test.h"
#include <math.h>
#include "../src/jumper/SkJumper.h"
#include <math.h>
DEF_TEST(sk_pipeline_srgb_roundtrip, r) {
uint32_t reds[256];
for (int i = 0; i < 256; i++) {

View File

@ -7,9 +7,10 @@
#include "SkScaleToSides.h"
#include <algorithm>
#include "Test.h"
#include <algorithm>
DEF_TEST(ScaleToSides, reporter) {
double interestingValues[] = {
// From sample app - PathFuzzer

View File

@ -7,13 +7,13 @@
#include "Test.h"
#include "SkString.h"
#include "SkStringUtils.h"
#include <stdarg.h>
#include <stdio.h>
#include <thread>
#include "SkString.h"
#include "SkStringUtils.h"
static const char* gThirtyWideDecimal = "%30d";
DEF_TEST(String, reporter) {

View File

@ -5,9 +5,6 @@
* found in the LICENSE file.
*/
#include <functional>
#include <initializer_list>
#include <vector>
#include "GrBackendSurface.h"
#include "GrContext.h"
#include "GrContextPriv.h"
@ -30,6 +27,10 @@
#include "SkUtils.h"
#include "Test.h"
#include <functional>
#include <initializer_list>
#include <vector>
#include "sk_tool_utils.h"

View File

@ -14,6 +14,7 @@
#include "SkRecordOpts.h"
#include "SkRecorder.h"
#include "SkStream.h"
#include <stdio.h>
DEFINE_string2(skps, r, "", ".SKPs to dump.");

View File

@ -20,6 +20,7 @@
#include "SkTSort.h"
#include "SkTypeface.h"
#include "SkUTF.h"
#include <stdio.h>
namespace {

View File

@ -10,6 +10,7 @@
#include "SkTypes.h"
#include "SkExchange.h"
#include <chrono>
namespace sk_gpu_test {

View File

@ -29,6 +29,7 @@
#include "ops/GrMeshDrawOp.h"
#include "text/GrGlyphCache.h"
#include "text/GrTextBlobCache.h"
#include <algorithm>
bool GrSurfaceProxy::isWrapped_ForTesting() const {

View File

@ -8,11 +8,12 @@
#ifndef MemoryCache_DEFINED
#define MemoryCache_DEFINED
#include <unordered_map>
#include "GrContextOptions.h"
#include "SkChecksum.h"
#include "SkData.h"
#include <unordered_map>
namespace sk_gpu_test {
/**

View File

@ -6,15 +6,17 @@
* found in the LICENSE file.
*/
#include <OpenGLES/ES2/gl.h>
#include "../GLWindowContext.h"
#include "SDL.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
#include "WindowContextFactory_ios.h"
#include "gl/GrGLInterface.h"
#include "sk_tool_utils.h"
#include <OpenGLES/ES2/gl.h>
#include "SDL.h"
using sk_app::DisplayParams;
using sk_app::window_context_factory::IOSWindowInfo;
using sk_app::GLWindowContext;

View File

@ -7,11 +7,12 @@
#include "SkTypes.h"
#include "SkTHash.h"
#include "SDL.h"
#include "Timer.h"
#include "Window_ios.h"
#include "../Application.h"
#include "SDL.h"
using sk_app::Application;
int main(int argc, char* argv[]) {

View File

@ -6,12 +6,13 @@
* found in the LICENSE file.
*/
#include <OpenGL/gl.h>
#include "../GLWindowContext.h"
#include "SDL.h"
#include "WindowContextFactory_mac.h"
#include "gl/GrGLInterface.h"
#include <OpenGL/gl.h>
#include "SDL.h"
using sk_app::DisplayParams;
using sk_app::window_context_factory::MacWindowInfo;
using sk_app::GLWindowContext;

View File

@ -6,15 +6,17 @@
* found in the LICENSE file.
*/
#include <OpenGL/gl.h>
#include "../GLWindowContext.h"
#include "SDL.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
#include "WindowContextFactory_mac.h"
#include "gl/GrGLInterface.h"
#include "sk_tool_utils.h"
#include <OpenGL/gl.h>
#include "SDL.h"
using sk_app::DisplayParams;
using sk_app::window_context_factory::MacWindowInfo;
using sk_app::GLWindowContext;

View File

@ -7,11 +7,12 @@
#include "SkTypes.h"
#include "SkTHash.h"
#include "SDL.h"
#include "Timer.h"
#include "Window_mac.h"
#include "../Application.h"
#include "SDL.h"
using sk_app::Application;
int main(int argc, char* argv[]) {

View File

@ -6,11 +6,12 @@
* found in the LICENSE file.
*/
#include <GL/gl.h>
#include "../GLWindowContext.h"
#include "WindowContextFactory_unix.h"
#include "gl/GrGLInterface.h"
#include <GL/gl.h>
using sk_app::window_context_factory::XlibWindowInfo;
using sk_app::DisplayParams;
using sk_app::GLWindowContext;

View File

@ -12,11 +12,11 @@
#include "vk/VkTestUtils.h"
#include <X11/Xlib-xcb.h>
#include "WindowContextFactory_unix.h"
#include "../VulkanWindowContext.h"
#include <X11/Xlib-xcb.h>
namespace sk_app {
namespace window_context_factory {

View File

@ -8,12 +8,13 @@
#ifndef Window_unix_DEFINED
#define Window_unix_DEFINED
#include <X11/Xlib.h>
#include <GL/glx.h>
#include "../Window.h"
#include "SkChecksum.h"
#include "SkTDynamicHash.h"
#include <GL/glx.h>
#include <X11/Xlib.h>
typedef Window XWindow;
namespace sk_app {

View File

@ -6,13 +6,14 @@
* found in the LICENSE file.
*/
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include "../GLWindowContext.h"
#include "WindowContextFactory_win.h"
#include "gl/GrGLAssembleInterface.h"
#include "gl/GrGLDefines.h"
#include <EGL/egl.h>
#include <EGL/eglext.h>
using sk_app::GLWindowContext;
using sk_app::DisplayParams;

View File

@ -6,13 +6,14 @@
* found in the LICENSE file.
*/
#include <Windows.h>
#include <GL/gl.h>
#include "../GLWindowContext.h"
#include "gl/GrGLInterface.h"
#include "WindowContextFactory_win.h"
#include "win/SkWGL.h"
#include <Windows.h>
#include <GL/gl.h>
using sk_app::GLWindowContext;
using sk_app::DisplayParams;

View File

@ -6,7 +6,6 @@
* found in the LICENSE file.
*/
#include <Windows.h>
#include "WindowContextFactory_win.h"
#include "../VulkanWindowContext.h"
@ -17,6 +16,8 @@
#include "vk/VkTestUtils.h"
#include <Windows.h>
namespace sk_app {
namespace window_context_factory {

View File

@ -8,9 +8,10 @@
#ifndef Window_win_DEFINED
#define Window_win_DEFINED
#include <windows.h>
#include "../Window.h"
#include <windows.h>
namespace sk_app {
class Window_win : public Window {

View File

@ -7,14 +7,14 @@
#include "Response.h"
#include "microhttpd.h"
#include "Request.h"
#include "SkCommandLineFlags.h"
#include "SkData.h"
#include "SkString.h"
#include "microhttpd.h"
DEFINE_string(source, "https://debugger-assets.skia.org", "Where to load the web UI from.");
static SkString generate_template(SkString source) {

View File

@ -11,10 +11,10 @@
#include "SkCommandLineFlags.h"
#include "SkGraphics.h"
#include "microhttpd.h"
#include "urlhandlers/UrlHandler.h"
#include "microhttpd.h"
#include <errno.h>
#if !defined _WIN32

View File

@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
#include <iostream>
#include "SkDebugCanvas.h"
#include "SkNullCanvas.h"
#include "SkPicture.h"
#include "SkStream.h"
#include <iostream>
#ifdef SK_BUILD_FOR_WIN
#include <fcntl.h>
#include <io.h>

View File

@ -5,12 +5,6 @@
* found in the LICENSE file.
*/
#include <stdlib.h>
#include <algorithm>
#include <array>
#include <chrono>
#include <cmath>
#include <vector>
#include "DDLPromiseImageHelper.h"
#include "DDLTileHelper.h"
#include "GpuTimer.h"
@ -41,6 +35,12 @@
#include "../experimental/svg/model/SkSVGDOM.h"
#endif
#include <stdlib.h>
#include <algorithm>
#include <array>
#include <chrono>
#include <cmath>
#include <vector>
/**
* This is a minimalist program whose sole purpose is to open a .skp or .svg file, benchmark it on a

View File

@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
#include "Timer.h"
#include <stdio.h>
SkString HumanizeMs(double ms) {

View File

@ -11,6 +11,7 @@
#include "SkCanvas.h"
#include "SkPath.h"
#include "Slide.h"
#include <stack>
/**

View File

@ -11,6 +11,7 @@
#include "SkPaint.h"
#include "SkTArray.h"
#include "sk_app/Window.h"
#include "imgui.h"
class ImGuiLayer : public sk_app::Window::Layer {

View File

@ -35,15 +35,15 @@
#include "SkTaskGroup.h"
#include "SkTestFontMgr.h"
#include "SkTo.h"
#include "SlideDir.h"
#include "SvgSlide.h"
#include "Viewer.h"
#include "ccpr/GrCoverageCountingPathRenderer.h"
#include "imgui.h"
#include <stdlib.h>
#include <map>
#include "SlideDir.h"
#include "imgui.h"
#if defined(SK_ENABLE_SKOTTIE)
#include "SkottieSlide.h"

View File

@ -7,6 +7,7 @@
#include "windows.h"
#include "win_dbghelp.h"
#include <process.h>
#include <string.h>
#include <stdlib.h>