From 0fe12bcfb79de1d1066a4c3213184dbf2aac1321 Mon Sep 17 00:00:00 2001 From: brucedawson Date: Fri, 26 Feb 2016 16:31:12 -0800 Subject: [PATCH] Revert of Add non-inline SkRTreeFactory constructor to fix clang-cl (patchset #2 id:20001 of https://codereview.chromium.org/1676833002/ ) Reason for revert: This workaround should no longer be needed, per comment#16 from thakis@ on the original CL. Original issue's description: > Add non-inline SkRTreeFactory constructor to fix clang-cl > > When Chromium is switched to build with VS 2015 that switches clang-cl > to build in -fmsc-version=1900 mode. This causes some changes in > importing of constructors and vftables which leads to link errors in > blink_platform.dll. Adding a non-inline constructor makes 1900 mode > behave consistently with 1800 mode and avoids the link error. > > The root cause needs investigation but this will unblock the VS 2015 > switch. > > BUG=440500,498544 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1676833002 > > Committed: https://skia.googlesource.com/skia/+/964eec67760196585954203ba625e440607f7e92 TBR=reed@google.com,bsalomon@google.com,mtklein@chromium.org,thakis@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=440500,498544 Review URL: https://codereview.chromium.org/1739363002 --- include/core/SkBBHFactory.h | 1 - src/core/SkBBHFactory.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/include/core/SkBBHFactory.h b/include/core/SkBBHFactory.h index 6e56449..ca70404 100644 --- a/include/core/SkBBHFactory.h +++ b/include/core/SkBBHFactory.h @@ -23,7 +23,6 @@ public: class SK_API SkRTreeFactory : public SkBBHFactory { public: - SkRTreeFactory(); SkBBoxHierarchy* operator()(const SkRect& bounds) const override; private: typedef SkBBHFactory INHERITED; diff --git a/src/core/SkBBHFactory.cpp b/src/core/SkBBHFactory.cpp index b10dc98..e8534ca 100644 --- a/src/core/SkBBHFactory.cpp +++ b/src/core/SkBBHFactory.cpp @@ -14,7 +14,3 @@ SkBBoxHierarchy* SkRTreeFactory::operator()(const SkRect& bounds) const { SkScalar aspectRatio = bounds.width() / bounds.height(); return new SkRTree(aspectRatio); } - -// TODO(thakis@chromium): remove once HTTP://llvm.org/26506 is fixed -SkRTreeFactory::SkRTreeFactory() { -} -- 2.7.4