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

Unified Diff: src/views/SkWindow.cpp

Issue 1260453008: Remove SK_BUILD_FOR_WINCE. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/views/SkWindow.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/views/SkWindow.cpp
diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp
index 7ab729e1d28877b97b61baf13c0ad11435d8f9ae..9eef0230eb3838ae7cd1d685f74606cbcfe90cd8 100644
--- a/src/views/SkWindow.cpp
+++ b/src/views/SkWindow.cpp
@@ -20,13 +20,7 @@ SkWindow::SkWindow()
{
fClicks.reset();
fWaitingOnInval = false;
-
-#ifdef SK_BUILD_FOR_WINCE
- fColorType = kRGB_565_SkColorType;
-#else
fColorType = kN32_SkColorType;
-#endif
-
fMatrix.reset();
}
@@ -105,31 +99,12 @@ void SkWindow::forceInvalAll() {
SkScalarCeilToInt(this->height()));
}
-#if defined(SK_BUILD_FOR_WINCE) && defined(USE_GX_SCREEN)
- #include <windows.h>
- #include <gx.h>
- extern GXDisplayProperties gDisplayProps;
-#endif
-
#ifdef SK_SIMULATE_FAILED_MALLOC
extern bool gEnableControlledThrow;
#endif
bool SkWindow::update(SkIRect* updateArea) {
if (!fDirtyRgn.isEmpty()) {
-#if defined(SK_BUILD_FOR_WINCE) && defined(USE_GX_SCREEN)
- SkBitmap bm = this->getBitmap();
-
- char* buffer = (char*)GXBeginDraw();
- SkASSERT(buffer);
-
- RECT rect;
- GetWindowRect((HWND)((SkOSWindow*)this)->getHWND(), &rect);
- buffer += rect.top * gDisplayProps.cbyPitch + rect.left * gDisplayProps.cbxPitch;
-
- bm.setPixels(buffer);
-#endif
-
SkAutoTUnref<SkSurface> surface(this->createSurface());
SkCanvas* canvas = surface->getCanvas();
@@ -161,10 +136,6 @@ bool SkWindow::update(SkIRect* updateArea) {
gEnableControlledThrow = false;
#endif
-#if defined(SK_BUILD_FOR_WINCE) && defined(USE_GX_SCREEN)
- GXEndDraw();
-#endif
-
return true;
}
return false;
« no previous file with comments | « include/views/SkWindow.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698