From 81abc43e6f0b1a789e1bf116820c8ede68d778ab Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Mon, 25 Jun 2018 16:30:08 -0400 Subject: explicitly include blurimagefilter include Try explicitly adding to fix the bookmaker nightly bot. R=jcgregorio@google.com,caryclark@google.com Docs-Preview: https://skia.org/?cl=137421 Bug: skia:6898 Change-Id: Iff27845e6872b885b8494e9fc236f4f05c10c301 Reviewed-on: https://skia-review.googlesource.com/137421 Reviewed-by: Cary Clark Reviewed-by: Joe Gregorio Commit-Queue: Cary Clark Commit-Queue: Joe Gregorio Auto-Submit: Cary Clark --- site/user/api/SkCanvas_Reference.md | 4 +- site/user/api/SkPaint_Reference.md | 6 +-- site/user/api/catalog.htm | 91 ++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 53 deletions(-) (limited to 'site/user') diff --git a/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md index b2b0f9362f..5c391e0245 100644 --- a/site/user/api/SkCanvas_Reference.md +++ b/site/user/api/SkCanvas_Reference.md @@ -2100,7 +2100,7 @@ depth of saved stack ### Example -
Rectangles are blurred by Image Filter when restore draws Layer to main +
Rectangles are blurred by Image Filter when restore draws Layer to main Canvas.
@@ -2149,7 +2149,7 @@ depth of saved stack ### Example -
Rectangles are blurred by Image Filter when restore draws Layer to main Canvas. +
Rectangles are blurred by Image Filter when restore draws Layer to main Canvas. The red rectangle is clipped; it does not fully fit on Layer. Image Filter blurs past edge of Layer so red rectangle is blurred on all sides.
diff --git a/site/user/api/SkPaint_Reference.md b/site/user/api/SkPaint_Reference.md index a4c62dbc57..3821dc3d87 100644 --- a/site/user/api/SkPaint_Reference.md +++ b/site/user/api/SkPaint_Reference.md @@ -4034,7 +4034,7 @@ implementation. Returns Typeface if set, or nullptr. -Increments Typeface Reference Count by one. +Does not alter Typeface Reference Count. ### Return Value @@ -4120,7 +4120,7 @@ can operate on all channels of Color, whil ### Example -
+
## getImageFilter @@ -4138,7 +4138,7 @@ Does not alter Image Filter storage(size);\n SkPMColor* pixels = storage.get();\n sk_sp surface(SkSurface::MakeRasterDirect(info, pixels, info.minRowBytes()));\n SkCanvas* canvas = surface->getCanvas();\n canvas->clear(SK_ColorWHITE);\n SkPMColor pmWhite = pixels[0];\n SkPaint paint;\n canvas->drawPoint(1, 1, paint);\n canvas->flush(); // ensure that point was drawn\n for (int y = 0; y < info.height(); ++y) {\n for (int x = 0; x < info.width(); ++x) {\n SkDebugf(\"%c\", *pixels++ == pmWhite ? '-' : 'x');\n }\n SkDebugf(\"\\n\");\n }\n}\n", @@ -3205,6 +3226,13 @@ "file": "SkSurface_Reference", "name": "SkSurface::MakeRaster_2", "stdout": "---\\n-x-\\n---\\n" + }, + "SkSurface_generationID": { + "code": "void draw(SkCanvas* canvas) {\n auto surface = SkSurface::MakeRasterN32Premul(1, 1);\n for (int i = 0; i < 3; ++i) {\n SkDebugf(\"surface generationID: %d\\n\", surface->generationID());\n if (0 == i) {\n surface->getCanvas()->drawColor(SK_ColorBLACK);\n } else {\n surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode);\n }\n }\n}", + "hash": "be9574c4a14f891e1abb4ec2b1e51d6c", + "file": "SkSurface_Reference", + "name": "SkSurface::generationID", + "stdout": "surface generationID: 1\\nsurface generationID: 2\\nsurface generationID: 3\\n" }, "SkSurface_height": { "code": "void draw(SkCanvas* canvas) {\n const int width = 37;\n const int height = 1000;\n auto surf = SkSurface::MakeNull(width, height);\n auto nullCanvas = surf->getCanvas();\n SkDebugf(\"surface height=%d canvas height=%d\\n\", surf->height(),\n nullCanvas->getBaseLayerSize().fHeight);\n}", @@ -3212,6 +3240,13 @@ "file": "SkSurface_Reference", "name": "SkSurface::height()", "stdout": "surface height=1000 canvas height=1000\\n" + }, + "SkSurface_notifyContentWillChange": { + "code": "void draw(SkCanvas* canvas) {\n auto surface = SkSurface::MakeRasterN32Premul(1, 1);\n for (int i = 0; i < 3; ++i) {\n SkDebugf(\"surface generationID: %d\\n\", surface->generationID());\n if (0 == i) {\n surface->getCanvas()->drawColor(SK_ColorBLACK);\n } else {\n surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode);\n }\n }\n}", + "hash": "be9574c4a14f891e1abb4ec2b1e51d6c", + "file": "SkSurface_Reference", + "name": "SkSurface::notifyContentWillChange", + "stdout": "surface generationID: 1\\nsurface generationID: 2\\nsurface generationID: 3\\n" }, "SkSurface_props": { "code": "void draw(SkCanvas* canvas) {\n const char* names[] = { \"Unknown\", \"RGB_H\", \"BGR_H\", \"RGB_V\", \"BGR_V\" };\n sk_sp surf(SkSurface::MakeRasterN32Premul(64, 64));\n SkDebugf(\"surf.props(): k%s_SkPixelGeometry\\n\", names[surf->props().pixelGeometry()]);\n}", @@ -3566,10 +3601,10 @@ "name": "Font_Metrics" }, "Paint_Image_Filter_Methods": { - "code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setStyle(SkPaint::kStroke_Style);\n paint.setStrokeWidth(2);\n SkRegion region;\n region.op( 10, 10, 50, 50, SkRegion::kUnion_Op);\n region.op( 10, 50, 90, 90, SkRegion::kUnion_Op);\n paint.setImageFilter(SkBlurImageFilter::Make(5.0f, 5.0f, nullptr));\n canvas->drawRegion(region, paint);\n paint.setImageFilter(nullptr);\n paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 5));\n canvas->translate(100, 100);\n canvas->drawRegion(region, paint);\n}\n", + "code": "#include \"SkBlurImageFilter.h\"\n\nvoid draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setStyle(SkPaint::kStroke_Style);\n paint.setStrokeWidth(2);\n SkRegion region;\n region.op( 10, 10, 50, 50, SkRegion::kUnion_Op);\n region.op( 10, 50, 90, 90, SkRegion::kUnion_Op);\n paint.setImageFilter(SkBlurImageFilter::Make(5.0f, 5.0f, nullptr));\n canvas->drawRegion(region, paint);\n paint.setImageFilter(nullptr);\n paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 5));\n canvas->translate(100, 100);\n canvas->drawRegion(region, paint);\n}\n", "width": 256, "height": 256, - "hash": "250e45c5935d54eac6aca775d1fe3475", + "hash": "ece04ee3d3761e3425f37c8f06f054c1", "file": "SkPaint_Reference", "name": "Image_Filter_Methods" }, @@ -3844,14 +3879,6 @@ "hash": "3e9126152ff1cc592aef6facbcb5fc96", "file": "SkBitmap_Reference", "name": "SkBitmap::bounds()" -}, - "SkBitmap_colorType": { - "code": "void draw(SkCanvas* canvas) {\n const char* colors[] = {\"Unknown\", \"Alpha_8\", \"RGB_565\", \"ARGB_4444\", \"RGBA_8888\", \"RGB_888x\",\n \"BGRA_8888\", \"RGBA_1010102\", \"RGB_101010x\", \"Gray_8\", \"RGBA_F16\"};\n SkBitmap bitmap;\n bitmap.setInfo(SkImageInfo::MakeA8(16, 32));\n SkDebugf(\"color type: k\" \"%s\" \"_SkColorType\\n\", colors[bitmap.colorType()]);\n}", - "width": 256, - "height": 256, - "hash": "ceb77fab7326b57822a147b04aa0960e", - "file": "SkBitmap_Reference", - "name": "SkBitmap::colorType" }, "SkBitmap_erase": { "code": "void draw(SkCanvas* canvas) {\n SkBitmap bitmap;\n bitmap.allocPixels(SkImageInfo::MakeN32(2, 2, kPremul_SkAlphaType));\n bitmap.erase(0x7fff7f3f, SkIRect::MakeWH(1, 1));\n bitmap.erase(0x7f7f3fff, SkIRect::MakeXYWH(0, 1, 1, 1));\n bitmap.erase(0x7f3fff7f, SkIRect::MakeXYWH(1, 0, 1, 1));\n bitmap.erase(0x7f1fbf5f, SkIRect::MakeXYWH(1, 1, 1, 1));\n canvas->scale(25, 25);\n canvas->drawBitmap(bitmap, 0, 0);\n canvas->drawBitmap(bitmap, .5f, .5f);\n}", @@ -3916,14 +3943,6 @@ "hash": "0c45da35172bc0a529b2faecddae62a2", "file": "SkBitmap_Reference", "name": "SkBitmap::getBounds_2" -}, - "SkBitmap_info": { - "code": "void draw(SkCanvas* canvas) {\n // SkBitmap source; // pre-populated with soccer ball by fiddle.skia.org\n const SkImageInfo& info = source.info();\n const char* alphas[] = {\"Unknown\", \"Opaque\", \"Premul\", \"Unpremul\"};\n const char* colors[] = {\"Unknown\", \"Alpha_8\", \"RGB_565\", \"ARGB_4444\", \"RGBA_8888\", \"RGB_888x\",\n \"BGRA_8888\", \"RGBA_1010102\", \"RGB_101010x\", \"Gray_8\", \"RGBA_F16\"};\n SkDebugf(\"width: %d height: %d color: %s alpha: %s\\n\", info.width(), info.height(),\n colors[info.colorType()], alphas[info.alphaType()]);\n}\n", - "width": 256, - "height": 256, - "hash": "ec47c4dc23e2925ad565eaba55a91553", - "file": "SkBitmap_Reference", - "name": "SkBitmap::info()" }, "SkBitmap_installPixels_2": { "code": "void draw(SkCanvas* canvas) {\n SkRandom random;\n SkBitmap bitmap;\n const int width = 8;\n const int height = 8;\n uint32_t pixels[width * height];\n for (unsigned x = 0; x < width * height; ++x) {\n pixels[x] = random.nextU();\n }\n SkImageInfo info = SkImageInfo::MakeN32(width, height, kUnpremul_SkAlphaType);\n if (bitmap.installPixels(info, pixels, info.minRowBytes())) {\n canvas->scale(32, 32);\n canvas->drawBitmap(bitmap, 0, 0);\n }\n}\n", @@ -4798,10 +4817,10 @@ "name": "SkCanvas::save()" }, "SkCanvas_saveLayer": { - "code": "void draw(SkCanvas* canvas) {\n SkPaint paint, blur;\n blur.setImageFilter(SkBlurImageFilter::Make(3, 3, nullptr));\n canvas->saveLayer(nullptr, &blur);\n SkRect rect = { 25, 25, 50, 50};\n canvas->drawRect(rect, paint);\n canvas->translate(50, 50);\n paint.setColor(SK_ColorRED);\n canvas->drawRect(rect, paint);\n canvas->restore();\n}\n", + "code": "#include \"SkBlurImageFilter.h\"\n\nvoid draw(SkCanvas* canvas) {\n SkPaint paint, blur;\n blur.setImageFilter(SkBlurImageFilter::Make(3, 3, nullptr));\n canvas->saveLayer(nullptr, &blur);\n SkRect rect = { 25, 25, 50, 50};\n canvas->drawRect(rect, paint);\n canvas->translate(50, 50);\n paint.setColor(SK_ColorRED);\n canvas->drawRect(rect, paint);\n canvas->restore();\n}\n", "width": 256, "height": 128, - "hash": "1a025d6018f64140af2dc36acad59008", + "hash": "42318b18d403e17e07a541652da91ee2", "file": "SkCanvas_Reference", "name": "SkCanvas::saveLayer" }, @@ -4822,10 +4841,10 @@ "name": "SkCanvas::saveLayerPreserveLCDTextRequests" }, "SkCanvas_saveLayer_2": { - "code": "void draw(SkCanvas* canvas) {\n SkPaint paint, blur;\n blur.setImageFilter(SkBlurImageFilter::Make(3, 3, nullptr));\n canvas->saveLayer(SkRect::MakeWH(90, 90), &blur);\n SkRect rect = { 25, 25, 50, 50};\n canvas->drawRect(rect, paint);\n canvas->translate(50, 50);\n paint.setColor(SK_ColorRED);\n canvas->drawRect(rect, paint);\n canvas->restore();\n}\n", + "code": "#include \"SkBlurImageFilter.h\"\n\nvoid draw(SkCanvas* canvas) {\n SkPaint paint, blur;\n blur.setImageFilter(SkBlurImageFilter::Make(3, 3, nullptr));\n canvas->saveLayer(SkRect::MakeWH(90, 90), &blur);\n SkRect rect = { 25, 25, 50, 50};\n canvas->drawRect(rect, paint);\n canvas->translate(50, 50);\n paint.setColor(SK_ColorRED);\n canvas->drawRect(rect, paint);\n canvas->restore();\n}\n", "width": 256, "height": 128, - "hash": "5b59231feae0c09cb1ab6a292229d7a4", + "hash": "a17aec3aa4909527be039e26a7eda694", "file": "SkCanvas_Reference", "name": "SkCanvas::saveLayer_2" }, @@ -7148,14 +7167,6 @@ "hash": "5e87093b9cbe95124ae14cbe77091eb7", "file": "SkSurface_Reference", "name": "SkSurface::MakeFromBackendTextureAsRenderTarget" -}, - "SkSurface_MakeRaster": { - "code": "void draw(SkCanvas* ) {\n SkImageInfo info = SkImageInfo::MakeN32Premul(3, 3);\n const size_t rowBytes = 64;\n sk_sp surface(SkSurface::MakeRaster(info, rowBytes, nullptr));\n SkCanvas* canvas = surface->getCanvas();\n canvas->clear(SK_ColorWHITE);\n SkPixmap pixmap;\n if (surface->peekPixels(&pixmap)) {\n const uint32_t* colorPtr = pixmap.addr32();\n SkPMColor pmWhite = colorPtr[0];\n SkPaint paint;\n canvas->drawPoint(1, 1, paint);\n canvas->flush(); // ensure that point was drawn\n for (int y = 0; y < info.height(); ++y) {\n for (int x = 0; x < info.width(); ++x) {\n SkDebugf(\"%c\", colorPtr[x] == pmWhite ? '-' : 'x');\n }\n colorPtr += rowBytes / sizeof(colorPtr[0]);\n SkDebugf(\"\\n\");\n }\n }\n}\n", - "width": 256, - "height": 256, - "hash": "a803910ada4f8733f0b62456afead55f", - "file": "SkSurface_Reference", - "name": "SkSurface::MakeRaster" }, "SkSurface_MakeRenderTarget": { "code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setTextSize(32);\n GrContext* context = canvas->getGrContext();\n if (!context) {\n canvas->drawString(\"GPU only!\", 20, 40, paint);\n return;\n }\n SkImageInfo info = SkImageInfo::MakeN32(256, 64, kOpaque_SkAlphaType);\n for (auto surfaceOrigin : { kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin } ) {\n auto gpuSurface(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info, 0,\n surfaceOrigin, nullptr));\n auto surfaceCanvas = gpuSurface->getCanvas();\n surfaceCanvas->clear(SK_ColorWHITE);\n surfaceCanvas->drawString(\"GPU rocks!\", 20, 40, paint);\n sk_sp image(gpuSurface->makeImageSnapshot());\n canvas->drawImage(image, 0, 0);\n canvas->translate(0, 128);\n }\n}", @@ -7204,14 +7215,6 @@ "hash": "46d9bacf593deaaeabd74ff42f2571a0", "file": "SkSurface_Reference", "name": "SkSurface::draw_2" -}, - "SkSurface_generationID": { - "code": "void draw(SkCanvas* canvas) {\n auto surface = SkSurface::MakeRasterN32Premul(1, 1);\n for (int i = 0; i < 3; ++i) {\n SkDebugf(\"surface generationID: %d\\n\", surface->generationID());\n if (0 == i) {\n surface->getCanvas()->drawColor(SK_ColorBLACK);\n } else {\n surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode);\n }\n }\n}", - "width": 256, - "height": 256, - "hash": "be9574c4a14f891e1abb4ec2b1e51d6c", - "file": "SkSurface_Reference", - "name": "SkSurface::generationID" }, "SkSurface_getCanvas": { "code": "void draw(SkCanvas* canvas) {\n sk_sp surface(SkSurface::MakeRasterN32Premul(64, 64));\n SkCanvas* surfaceCanvas = surface->getCanvas();\n surfaceCanvas->clear(SK_ColorBLUE);\n SkPaint paint;\n paint.setTextSize(40);\n surfaceCanvas->drawString(\"\\xF0\\x9F\\x98\\x81\", 12, 45, paint);\n surface->draw(canvas, 0, 0, nullptr);\n}", @@ -7236,14 +7239,6 @@ "hash": "a9889b519a26896b900da0444e423c61", "file": "SkSurface_Reference", "name": "SkSurface::makeSurface" -}, - "SkSurface_notifyContentWillChange": { - "code": "void draw(SkCanvas* canvas) {\n auto surface = SkSurface::MakeRasterN32Premul(1, 1);\n for (int i = 0; i < 3; ++i) {\n SkDebugf(\"surface generationID: %d\\n\", surface->generationID());\n if (0 == i) {\n surface->getCanvas()->drawColor(SK_ColorBLACK);\n } else {\n surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode);\n }\n }\n}", - "width": 256, - "height": 256, - "hash": "be9574c4a14f891e1abb4ec2b1e51d6c", - "file": "SkSurface_Reference", - "name": "SkSurface::notifyContentWillChange" }, "SkSurface_peekPixels": { "code": "void draw(SkCanvas* canvas) {\n sk_sp surf(SkSurface::MakeRasterN32Premul(64, 64));\n auto surfCanvas = surf->getCanvas();\n surfCanvas->clear(SK_ColorRED);\n SkPaint paint;\n paint.setTextSize(40);\n surfCanvas->drawString(\"&\", 16, 48, paint);\n SkPixmap pixmap;\n if (surf->peekPixels(&pixmap)) {\n SkBitmap surfBits;\n surfBits.installPixels(pixmap);\n canvas->drawBitmap(surfBits, 0, 0);\n }\n}", -- cgit v1.2.3