diff options
| author |  vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-11-11 00:49:41 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-11-11 00:49:41 +0000 |
| commit | 8c1d88dcfb978835779b6b5c5e7d1cbb78b6ca4d (patch) | |
| tree | 7f0701a3339e048a71e3d8571f50d5b6dface25b /include/core/SkDevice.h | |
| parent | 7e2ff7cf7da604b29378978ef5d4655499485368 (diff) | |
Remove include of SkGLDevice.h from SkGLCanvas.h
The '#include "SkGLDevice.h"' from include/core/SkDevice.h requires internal
Skia code to be added to the include search paths when using the deprecated API.
This change adds back SkGLCanvas.cpp to avoid exposing SkGLDevice.h to the
public API.
The change also includes an explicit virtual destructor on SkDeviceFactory to
silence a -Wnon-virtual-dtor warning and allow for -Werror.
Original Issue: http://codereview.appspot.com/3009041/
Review URL: http://codereview.appspot.com/2994042
git-svn-id: http://skia.googlecode.com/svn/trunk@623 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkDevice.h')
| -rw-r--r-- | include/core/SkDevice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 0ff3241776..089d6e6f96 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2010 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,7 @@ class SkRegion; */ class SkDeviceFactory { public: + virtual ~SkDeviceFactory(); virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height, bool isOpaque, bool isForLayer) = 0; }; |