[svg] Post-relocation cleanup

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>

experimental/svg/model/SkSVGAttribute.h

@@ -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"
-

experimental/svg/model/SkSVGAttributeParser.h

@@ -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"
-

experimental/svg/model/SkSVGCircle.h

@@ -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"
-

experimental/svg/model/SkSVGClipPath.h

@@ -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"
-

experimental/svg/model/SkSVGContainer.h

@@ -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"
-

experimental/svg/model/SkSVGDOM.h

@@ -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"
-

experimental/svg/model/SkSVGDefs.h

@@ -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"
-

experimental/svg/model/SkSVGEllipse.h

@@ -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"
-

experimental/svg/model/SkSVGG.h

@@ -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"
-

experimental/svg/model/SkSVGGradient.h

@@ -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"
-

experimental/svg/model/SkSVGHiddenContainer.h

@@ -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"
-

experimental/svg/model/SkSVGIDMapper.h

@@ -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"
-

experimental/svg/model/SkSVGLine.h

@@ -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"
-

experimental/svg/model/SkSVGLinearGradient.h

@@ -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"
-

experimental/svg/model/SkSVGNode.h

@@ -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"
-

experimental/svg/model/SkSVGPath.h

@@ -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"
-

experimental/svg/model/SkSVGPattern.h

@@ -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"
-

experimental/svg/model/SkSVGPoly.h

@@ -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"
-

experimental/svg/model/SkSVGRadialGradient.h

@@ -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"
-

experimental/svg/model/SkSVGRect.h

@@ -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"
-

experimental/svg/model/SkSVGRenderContext.h

@@ -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"
-

experimental/svg/model/SkSVGSVG.h

@@ -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"
-

experimental/svg/model/SkSVGShape.h

@@ -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"
-

experimental/svg/model/SkSVGStop.h

@@ -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"
-

experimental/svg/model/SkSVGText.h

@@ -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"
-

experimental/svg/model/SkSVGTransformableNode.h

@@ -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"
-

experimental/svg/model/SkSVGTypes.h

@@ -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"
-

experimental/svg/model/SkSVGUse.h

@@ -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"
-

experimental/svg/model/SkSVGValue.h

@@ -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"
-

public.bzl

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

tools/rewrite_includes.py

@@ -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']
-ignorelist = ['include/third_party/vulkan', 'node_modules', 'experimental/svg/model']
 
 assert '/' in [os.sep, os.altsep]
 def fix_path(p):