From 83f7076457c3ef7419fae7b5e2bd1b11726ed08b Mon Sep 17 00:00:00 2001 From: Andy Weiss Date: Fri, 11 Dec 2020 10:16:24 -0800 Subject: [PATCH] Use include for C/C++ headers in darwin/macos The consistent style in this code is to use #include for C/C++ headers and #import for ObjC and project local dependencies. One of the scripts that handles this code relies on that fact. The skia headers should be using #include and these are using #import so this changes them. See other examples that uses the right mix of import/include: shell/platform/darwin/macos/framework/Source/FlutterGlCompositor.h shell/platform/darwin/ios/ios_surface_metal.h --- .../macos/framework/Source/FlutterGLCompositor.mm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.mm b/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.mm index 4f187232ec143..7a07212847be4 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.mm @@ -6,15 +6,17 @@ #import -#import "flutter/fml/logging.h" -#import "flutter/fml/platform/darwin/cf_utils.h" +#include "flutter/fml/logging.h" +#include "flutter/fml/platform/darwin/cf_utils.h" + #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStoreData.h" #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterFrameBufferProvider.h" #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h" -#import "third_party/skia/include/core/SkCanvas.h" -#import "third_party/skia/include/core/SkSurface.h" -#import "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h" -#import "third_party/skia/include/utils/mac/SkCGUtils.h" + +#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h" +#include "third_party/skia/include/utils/mac/SkCGUtils.h" namespace flutter {