diff options
author | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 17:43:44 +0000 |
---|---|---|
committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 17:43:44 +0000 |
commit | 7158e6acca1b1ecc321d4d514a31cba11b5ead60 (patch) | |
tree | a7a1a00365caf900fa940e586fc41e10261c23ff /include/views | |
parent | 671eac67ef5f44b80f882e06cf17f1b8f6802980 (diff) |
Improve NaCl support
- Add nacl_make script to build Skia targets for NaCl using gyp
- Add nacl_interface for command-line apps
- Add nacl_sample as front-end for SampleApp
- Add freetype to DEPS
- Various gyp tweaks for NaCl
TODO:
- Implement GL interface
- Implement font host
- Fix plumbing so that SampleApp works properly
Review URL: https://codereview.appspot.com/6671044
git-svn-id: http://skia.googlecode.com/svn/trunk@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/views')
-rw-r--r-- | include/views/SkOSWindow_NaCl.h | 46 | ||||
-rw-r--r-- | include/views/SkWindow.h | 4 |
2 files changed, 49 insertions, 1 deletions
diff --git a/include/views/SkOSWindow_NaCl.h b/include/views/SkOSWindow_NaCl.h new file mode 100644 index 0000000000..8c4ddc6083 --- /dev/null +++ b/include/views/SkOSWindow_NaCl.h @@ -0,0 +1,46 @@ + +/* + * Copyright 2012 Skia + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + + +#ifndef SkOSWindow_NaCl_DEFINED +#define SkOSWindow_NaCl_DEFINED + +#include "SkWindow.h" + +class SkIRect; + +class SkOSWindow : public SkWindow { +public: + SkOSWindow(void*) {} + ~SkOSWindow() {} + + enum SkBackEndTypes { + kNone_BackEndType, + kNativeGL_BackEndType, + }; + + bool attach(SkBackEndTypes /* attachType */, int /* msaaSampleCount */) { + return true; + } + void detach() {} + void present() {} + + virtual void onPDFSaved(const char title[], const char desc[], + const char path[]); + +protected: + // overrides from SkWindow + virtual void onHandleInval(const SkIRect&); + virtual void onSetTitle(const char title[]); + +private: + typedef SkWindow INHERITED; +}; + +#endif + diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h index f1d3881fe3..ca48e27114 100644 --- a/include/views/SkWindow.h +++ b/include/views/SkWindow.h @@ -102,7 +102,9 @@ private: //////////////////////////////////////////////////////////////////////////////// -#if defined(SK_BUILD_FOR_MAC) +#if defined(SK_BUILD_FOR_NACL) + #include "SkOSWindow_NaCl.h" +#elif defined(SK_BUILD_FOR_MAC) #include "SkOSWindow_Mac.h" #elif defined(SK_BUILD_FOR_WIN) #include "SkOSWindow_Win.h" |