diff options
author | 2012-09-24 19:33:57 +0000 | |
---|---|---|
committer | 2012-09-24 19:33:57 +0000 | |
commit | 594dd3cd78e2f970d53bb0934fbbb63b41e1d40c (patch) | |
tree | aeb48bc17abb7631ecac0998dc8b1609b386670b /src/views/mac | |
parent | cdb426d55a4bc4dae4f6d4f23e6994762950fdc3 (diff) |
iOS support work in progress
include/core/SkTypes.h
- address unsigned warning
include/core/SkInstCnt.h
src/core/SkInstCnt.cpp
gyp/common.gypi
- always define SK_ENABLE_INST_COUNT for debug builds
src/views/mac/SkNSView.mm
- only call glClear if there is a GL context
src/ports/SkImageDecoder_CG.cpp
- fix iOS hack by using proper include
gyp/opts.gyp
- exclude more ARM files from iOS for now (see issue 900)
gyp/common_conditions.gypi
- add release, more ios specific common settings
gyp/bench.gyp
- add iOS condition
gyp/SampleApp.gyp
- remove precompiled header, hardcoded SDK path
- add more frameworks
gyp/debugger.gyp
- fix syntax error
- add iOS/Android condition
gyp/core.gyp
- remove hardcoded SDK path, add more frameworks
gyp/common_variables.gypi
- add ios SDK path
- add ios SDK version
gyp/iOSSampleApp.gyp
- remove obsolete project
gyp/zlib.gyp
- add ios library path
Review URL: https://codereview.appspot.com/6551070
git-svn-id: http://skia.googlecode.com/svn/trunk@5649 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/views/mac')
-rw-r--r-- | src/views/mac/SkNSView.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/views/mac/SkNSView.mm b/src/views/mac/SkNSView.mm index b3c6762747..f43af64df1 100644 --- a/src/views/mac/SkNSView.mm +++ b/src/views/mac/SkNSView.mm @@ -57,7 +57,9 @@ SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build); - (void)resizeSkView:(NSSize)newSize { if (NULL != fWind && (fWind->width() != newSize.width || fWind->height() != newSize.height)) { fWind->resize((int) newSize.width, (int) newSize.height); - glClear(GL_STENCIL_BUFFER_BIT); + if (NULL != fGLContext) { + glClear(GL_STENCIL_BUFFER_BIT); + } [fGLContext update]; } } |