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 /src/gl | |
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 'src/gl')
-rw-r--r-- | src/gl/SkGLCanvas.cpp | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/src/gl/SkGLCanvas.cpp b/src/gl/SkGLCanvas.cpp new file mode 100644 index 0000000000..17e60165a9 --- /dev/null +++ b/src/gl/SkGLCanvas.cpp @@ -0,0 +1,50 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "SkGLCanvas.h" +#include "SkGLDevice.h" + +SkGLCanvas::SkGLCanvas() : SkCanvas(SkNEW(SkGLDeviceFactory)) {} + +// static +size_t SkGLCanvas::GetTextureCacheMaxCount() { + return SkGLDevice::GetTextureCacheMaxCount(); +} + +// static +void SkGLCanvas::SetTextureCacheMaxCount(size_t count) { + SkGLDevice::SetTextureCacheMaxCount(count); +} + +// static +size_t SkGLCanvas::GetTextureCacheMaxSize() { + return SkGLDevice::GetTextureCacheMaxSize(); +} + +// static +void SkGLCanvas::SetTextureCacheMaxSize(size_t size) { + SkGLDevice::SetTextureCacheMaxSize(size); +} + +// static +void SkGLCanvas::DeleteAllTextures() { + SkGLDevice::DeleteAllTextures(); +} + +// static +void SkGLCanvas::AbandonAllTextures() { + SkGLDevice::AbandonAllTextures(); +} |