AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[svg] Post-relocation cleanup

Browse Source 
Remove transitional headers and build file workarounds.

Change-Id: Iebe63d44b6ae3a736c7b31a45975056ec92b91cd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327716
Commit-Queue: Florin Malita <fmalita@google.com>
Reviewed-by: Tyler Denniston <tdenniston@google.com>
This commit is contained in:
Florin Malita 2020-10-16 10:53:27 -04:00 committed by Skia Commit-Bot
parent 27f7fe32f4
commit a5e8f6b402
31 changed files with 2 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
experimental/svg/model/SkSVGAttribute.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGAttribute.h"

10
experimental/svg/model/SkSVGAttributeParser.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGAttributeParser.h"

10
experimental/svg/model/SkSVGCircle.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGCircle.h"

10
experimental/svg/model/SkSVGClipPath.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGClipPath.h"

10
experimental/svg/model/SkSVGContainer.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGContainer.h"

10
experimental/svg/model/SkSVGDOM.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGDOM.h"

10
experimental/svg/model/SkSVGDefs.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGDefs.h"

10
experimental/svg/model/SkSVGEllipse.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGEllipse.h"

10
experimental/svg/model/SkSVGG.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGG.h"

10
experimental/svg/model/SkSVGGradient.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGGradient.h"

10
experimental/svg/model/SkSVGHiddenContainer.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGHiddenContainer.h"

10
experimental/svg/model/SkSVGIDMapper.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGIDMapper.h"

10
experimental/svg/model/SkSVGLine.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGLine.h"

10
experimental/svg/model/SkSVGLinearGradient.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGLinearGradient.h"

10
experimental/svg/model/SkSVGNode.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGNode.h"

10
experimental/svg/model/SkSVGPath.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGPath.h"

10
experimental/svg/model/SkSVGPattern.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGPattern.h"

10
experimental/svg/model/SkSVGPoly.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGPoly.h"

10
experimental/svg/model/SkSVGRadialGradient.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGRadialGradient.h"

10
experimental/svg/model/SkSVGRect.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGRect.h"

10
experimental/svg/model/SkSVGRenderContext.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGRenderContext.h"

10
experimental/svg/model/SkSVGSVG.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGSVG.h"

10
experimental/svg/model/SkSVGShape.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGShape.h"

10
experimental/svg/model/SkSVGStop.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGStop.h"

10
experimental/svg/model/SkSVGText.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGText.h"

10
experimental/svg/model/SkSVGTransformableNode.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGTransformableNode.h"

10
experimental/svg/model/SkSVGTypes.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGTypes.h"

10
experimental/svg/model/SkSVGUse.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGUse.h"

10
experimental/svg/model/SkSVGValue.h
View File

@ -1,10 +0,0 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Transitional forwarding header. To be removed.
#include "modules/svg/include/SkSVGValue.h"

6
public.bzl
View File

@ -988,11 +988,7 @@ SKOTTIE_IOS_LIB_SDK_FRAMEWORKS = [
################################################################################
def svg_lib_hdrs():
return native.glob([
# transitional headers, to be removed
"experimental/svg/model/*.h",
"modules/svg/include/*.h",
])
return native.glob(["modules/svg/include/*.h"])
def svg_lib_srcs():
return native.glob(["modules/svg/src/*.cpp"])

3
tools/rewrite_includes.py
View File

@ -39,8 +39,7 @@ roots = [
# Don't count our local Vulkan headers as Skia headers;
# we don't want #include <vulkan/vulkan_foo.h> rewritten to point to them.
# Nor do we care about things in node_modules, used by *Kits.
# Also ignore transitional SVG headers.
ignorelist = ['include/third_party/vulkan', 'node_modules', 'experimental/svg/model']
ignorelist = ['include/third_party/vulkan', 'node_modules']
assert '/' in [os.sep, os.altsep]
def fix_path(p):