aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar brucedawson <brucedawson@chromium.org>2016-02-06 12:40:56 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-06 12:40:56 -0800
commit964eec67760196585954203ba625e440607f7e92 (patch)
tree98f4388c0f1e200f7a37c678e2f1abaa2eec1727 /include
parentf1036b2c6610e106b299a1e2b69b814ff18b60f5 (diff)
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 Review URL: https://codereview.chromium.org/1676833002
Diffstat (limited to 'include')
-rw-r--r--include/core/SkBBHFactory.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/core/SkBBHFactory.h b/include/core/SkBBHFactory.h
index ca7040409d..6e564499f5 100644
--- a/include/core/SkBBHFactory.h
+++ b/include/core/SkBBHFactory.h
@@ -23,6 +23,7 @@ public:
class SK_API SkRTreeFactory : public SkBBHFactory {
public:
+ SkRTreeFactory();
SkBBoxHierarchy* operator()(const SkRect& bounds) const override;
private:
typedef SkBBHFactory INHERITED;