From 416e39437971c66c38e0b244188378e344923d37 Mon Sep 17 00:00:00 2001 From: caryclark Date: Thu, 29 Jan 2015 10:44:35 -0800 Subject: [PATCH] remove experimental pixman files these files have never worked, and contain nother of value R=reed@google.com Review URL: https://codereview.chromium.org/890703002 --- experimental/pixman/Pixman-version.h | 50 ---------------- experimental/pixman/config.h | 3 - experimental/pixman/junk.cpp | 108 ----------------------------------- experimental/pixman/pixman.mm | 99 -------------------------------- 4 files changed, 260 deletions(-) delete mode 100644 experimental/pixman/Pixman-version.h delete mode 100644 experimental/pixman/config.h delete mode 100644 experimental/pixman/junk.cpp delete mode 100644 experimental/pixman/pixman.mm diff --git a/experimental/pixman/Pixman-version.h b/experimental/pixman/Pixman-version.h deleted file mode 100644 index 1e3543a..0000000 --- a/experimental/pixman/Pixman-version.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright © 2008 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Author: Carl D. Worth - */ - -#ifndef PIXMAN_VERSION_H__ -#define PIXMAN_VERSION_H__ - -#ifndef PIXMAN_H__ -# error pixman-version.h should only be included by pixman.h -#endif - -#define PIXMAN_VERSION_MAJOR 0 -#define PIXMAN_VERSION_MINOR 27 -#define PIXMAN_VERSION_MICRO 33 - -#define PIXMAN_VERSION_STRING "@PIXMAN_VERSION_MAJOR@.@PIXMAN_VERSION_MINOR@.@PIXMAN_VERSION_MICRO@" - -#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \ - ((major) * 10000) \ - + ((minor) * 100) \ - + ((micro) * 1)) - -#define PIXMAN_VERSION PIXMAN_VERSION_ENCODE( \ - PIXMAN_VERSION_MAJOR, \ - PIXMAN_VERSION_MINOR, \ - PIXMAN_VERSION_MICRO) - -#endif /* PIXMAN_VERSION_H__ */ diff --git a/experimental/pixman/config.h b/experimental/pixman/config.h deleted file mode 100644 index 4546edc..0000000 --- a/experimental/pixman/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#define PACKAGE -#define HAVE_PTHREAD_SETSPECIFIC -#define PREFIX(a) a diff --git a/experimental/pixman/junk.cpp b/experimental/pixman/junk.cpp deleted file mode 100644 index f85a442..0000000 --- a/experimental/pixman/junk.cpp +++ /dev/null @@ -1,108 +0,0 @@ - -extern "C" { -#include -#include -#include -#include "pixman-private.h" -#include "utils.h" -#include "gtk-utils.h" - -} - -#include "SkBitmap.h" -#include "SkCanvas.h" -#include "SkGraphics.h" -#include "SkPaint.h" -#import "SkWindow.h" - -bool DrawPixman(SkCanvas* canvas, int step, bool useOld); -SkCanvas* canvas; - -extern "C" { - -void* -pixbuf_from_argb32 (uint32_t *bits, - int width, - int height, - int stride) -{ - SkBitmap* bitmap = new SkBitmap; - bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height); - bitmap->allocPixels(); - - int p_stride = bitmap->rowBytes(); - uint32_t *p_bits = bitmap->getAddr32(0, 0); - int i; - - for (i = 0; i < height; ++i) - { - uint32_t *src_row = &bits[i * (stride / 4)]; - uint32_t *dst_row = p_bits + i * (p_stride / 4); - - a8r8g8b8_to_rgba_np (dst_row, src_row, width); - } - return (void*) bitmap; -} - - -void show_image (pixman_image_t *image) { - int width, height; - pixman_format_code_t format; - pixman_image_t *copy; - - width = pixman_image_get_width (image); - height = pixman_image_get_height (image); - - - format = pixman_image_get_format (image); - - /* Three cases: - * - * - image is a8r8g8b8_sRGB: we will display without modification - * under the assumption that the monitor is sRGB - * - * - image is a8r8g8b8: we will display without modification - * under the assumption that whoever created the image - * probably did it wrong by using sRGB inputs - * - * - other: we will convert to a8r8g8b8 under the assumption that - * whoever created the image probably did it wrong. - */ - switch (format) - { - case PIXMAN_a8r8g8b8_sRGB: - case PIXMAN_a8r8g8b8: - copy = pixman_image_ref (image); - break; - - default: - copy = pixman_image_create_bits (PIXMAN_a8r8g8b8, - width, height, NULL, -1); - pixman_image_composite32 (PIXMAN_OP_SRC, - image, NULL, copy, - 0, 0, 0, 0, 0, 0, - width, height); - break; - } - - SkBitmap* bitmap = (SkBitmap*) pixbuf_from_argb32 (pixman_image_get_data (copy), - width, height, - pixman_image_get_stride (copy)); - canvas->drawBitmap(*bitmap, 0, 0); - delete bitmap; -} - -} - -bool DrawPixman(SkCanvas* c, int step, bool usePixman) { - canvas = c; - switch(step) { - case 0: - checkerboard_main(0, NULL); - break; - default: - alpha_main(0, NULL); - break; - } - return true; -} diff --git a/experimental/pixman/pixman.mm b/experimental/pixman/pixman.mm deleted file mode 100644 index f4db3df..0000000 --- a/experimental/pixman/pixman.mm +++ /dev/null @@ -1,99 +0,0 @@ - -#import "SkCanvas.h" -#import "SkWindow.h" -#include "SkGraphics.h" -#include "SkCGUtils.h" - -#include -#include - -bool DrawPixman(SkCanvas* canvas, int step, bool usePixman); - -class SkPixmanView : public SkView { -public: - SkPixmanView() { - this->setVisibleP(true); - this->setClipToBounds(false); - usePixman = true; - slide = 0; - step = -1; - }; -protected: - virtual void onDraw(SkCanvas* canvas) { - static int step = 0; // 12752; // 17908 ; // 17904; // drawLetters first error - // drawStars triggers error at 23275 - // error is not easy to debug in its current state - static double seconds; - if (step == -1) { - timeval t; - gettimeofday(&t, NULL); - seconds = t.tv_sec+t.tv_usec/1000000.0; - step = 0; - } - canvas->drawColor(SK_ColorWHITE); - if (DrawPixman(canvas, slide, usePixman)) { - if (step == 100) { - timeval t; - gettimeofday(&t, NULL); - double last = seconds; - seconds = t.tv_sec+t.tv_usec/1000000.0; - SkDebugf("usePixman=%d seconds=%g\n", usePixman, seconds - last); - step = 0; - } - inval(NULL); - } - } - - virtual Click* onFindClickHandler(SkScalar , SkScalar ) { - // usePixman ^= true; - ++slide; - return NULL; - } - -private: - bool usePixman; - int slide; - int step; - typedef SkView INHERITED; -}; - -void application_init(); -void application_term(); - -void application_init() { - SkGraphics::Init(); - SkEvent::Init(); -} - -void application_term() { - SkGraphics::Term(); - SkEvent::Term(); -} - -class FillLayout : public SkView::Layout { -protected: - virtual void onLayoutChildren(SkView* parent) { - SkView* view = SkView::F2BIter(parent).next(); - view->setSize(parent->width(), parent->height()); - } -}; - -#import "SimpleApp.h" - -@implementation SimpleNSView - -- (id)initWithDefaults { - if ((self = [super initWithDefaults])) { - fWind = new SkOSWindow(self); - fWind->setLayout(new FillLayout, false); - fWind->attachChildToFront(new SkPixmanView)->unref(); - } - return self; -} - -- (void)drawRect:(NSRect)dirtyRect { - CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - SkCGDrawBitmap(ctx, fWind->getBitmap(), 0, 0); -} - -@end -- 2.7.4