ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
108 lines
2.8 KiB
C++
108 lines
2.8 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "SampleCode.h"
|
|
#include "SkView.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkDevice.h"
|
|
#include "SkPaint.h"
|
|
|
|
static void DrawRoundRect() {
|
|
#ifdef SK_SCALAR_IS_FIXED
|
|
bool ret = false;
|
|
SkPaint paint;
|
|
SkBitmap bitmap;
|
|
SkCanvas canvas;
|
|
SkMatrix matrix;
|
|
matrix.reset();
|
|
|
|
bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1370, 812);
|
|
bitmap.allocPixels();
|
|
canvas.setBitmapDevice(bitmap);
|
|
|
|
// set up clipper
|
|
SkRect skclip;
|
|
skclip.set(SkIntToFixed(284), SkIntToFixed(40), SkIntToFixed(1370), SkIntToFixed(708));
|
|
|
|
ret = canvas.clipRect(skclip);
|
|
SkASSERT(ret);
|
|
|
|
matrix.set(SkMatrix::kMTransX, SkFloatToFixed(-1153.28));
|
|
matrix.set(SkMatrix::kMTransY, SkFloatToFixed(1180.50));
|
|
|
|
matrix.set(SkMatrix::kMScaleX, SkFloatToFixed(0.177171));
|
|
matrix.set(SkMatrix::kMScaleY, SkFloatToFixed(0.177043));
|
|
|
|
matrix.set(SkMatrix::kMSkewX, SkFloatToFixed(0.126968));
|
|
matrix.set(SkMatrix::kMSkewY, SkFloatToFixed(-0.126876));
|
|
|
|
matrix.set(SkMatrix::kMPersp0, SkFloatToFixed(0.0));
|
|
matrix.set(SkMatrix::kMPersp1, SkFloatToFixed(0.0));
|
|
|
|
ret = canvas.concat(matrix);
|
|
|
|
paint.setAntiAlias(true);
|
|
paint.setColor(0xb2202020);
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setStrokeWidth(SkFloatToFixed(68.13));
|
|
|
|
SkRect r;
|
|
r.set(SkFloatToFixed(-313.714417), SkFloatToFixed(-4.826389), SkFloatToFixed(18014.447266), SkFloatToFixed(1858.154541));
|
|
canvas.drawRoundRect(r, SkFloatToFixed(91.756363), SkFloatToFixed(91.756363), paint);
|
|
#endif
|
|
}
|
|
|
|
static bool HitTestPath(const SkPath& path, SkScalar x, SkScalar y) {
|
|
SkRegion rgn, clip;
|
|
|
|
int ix = SkScalarFloor(x);
|
|
int iy = SkScalarFloor(y);
|
|
|
|
clip.setRect(ix, iy, ix + 1, iy + 1);
|
|
|
|
bool contains = rgn.setPath(path, clip);
|
|
return contains;
|
|
}
|
|
|
|
static void TestOverflowHitTest() {
|
|
SkPath path;
|
|
|
|
#ifdef SK_SCALAR_IS_FLOATx
|
|
path.addCircle(0, 0, 70000, SkPath::kCCW_Direction);
|
|
SkASSERT(HitTestPath(path, 40000, 40000));
|
|
#endif
|
|
}
|
|
|
|
class OverflowView : public SampleView {
|
|
public:
|
|
OverflowView() {}
|
|
|
|
protected:
|
|
// overrides from SkEventSink
|
|
virtual bool onQuery(SkEvent* evt) {
|
|
if (SampleCode::TitleQ(*evt)) {
|
|
SampleCode::TitleR(evt, "Circles");
|
|
return true;
|
|
}
|
|
return this->INHERITED::onQuery(evt);
|
|
}
|
|
|
|
virtual void onDrawContent(SkCanvas* canvas) {
|
|
DrawRoundRect();
|
|
TestOverflowHitTest();
|
|
}
|
|
|
|
private:
|
|
typedef SampleView INHERITED;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
static SkView* MyFactory() { return new OverflowView; }
|
|
static SkViewRegister reg(MyFactory);
|
|
|