Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: include/views/SkOSWindow_Unix.h

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/utils/SkProxyCanvas.h ('k') | samplecode/ClockFaceView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkOSWindow_Unix_DEFINED 8 #ifndef SkOSWindow_Unix_DEFINED
9 #define SkOSWindow_Unix_DEFINED 9 #define SkOSWindow_Unix_DEFINED
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*) ; 46 bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*) ;
47 void detach(); 47 void detach();
48 void present(); 48 void present();
49 49
50 int getMSAASampleCount() const { return fMSAASampleCount; } 50 int getMSAASampleCount() const { return fMSAASampleCount; }
51 51
52 //static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay); 52 //static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
53 53
54 protected: 54 protected:
55 // Overridden from from SkWindow: 55 // Overridden from from SkWindow:
56 virtual void onSetTitle(const char title[]) SK_OVERRIDE; 56 void onSetTitle(const char title[]) SK_OVERRIDE;
57 57
58 private: 58 private:
59 enum NextXEventResult { 59 enum NextXEventResult {
60 kContinue_NextXEventResult, 60 kContinue_NextXEventResult,
61 kQuitRequest_NextXEventResult, 61 kQuitRequest_NextXEventResult,
62 kPaintRequest_NextXEventResult 62 kPaintRequest_NextXEventResult
63 }; 63 };
64 64
65 NextXEventResult nextXEvent(); 65 NextXEventResult nextXEvent();
66 void doPaint(); 66 void doPaint();
67 void mapWindowAndWait(); 67 void mapWindowAndWait();
68 68
69 void closeWindow(); 69 void closeWindow();
70 void initWindow(int newMSAASampleCount, AttachmentInfo* info); 70 void initWindow(int newMSAASampleCount, AttachmentInfo* info);
71 71
72 SkUnixWindow fUnixWindow; 72 SkUnixWindow fUnixWindow;
73 73
74 // Needed for GL 74 // Needed for GL
75 XVisualInfo* fVi; 75 XVisualInfo* fVi;
76 // we recreate the underlying xwindow if this changes 76 // we recreate the underlying xwindow if this changes
77 int fMSAASampleCount; 77 int fMSAASampleCount;
78 78
79 typedef SkWindow INHERITED; 79 typedef SkWindow INHERITED;
80 }; 80 };
81 81
82 #endif 82 #endif
OLDNEW
« no previous file with comments | « include/utils/SkProxyCanvas.h ('k') | samplecode/ClockFaceView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698