Changeset 93850 in webkit
- Timestamp:
- Aug 25, 2011 9:27:02 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/platform/chromium/test_expectations.txt (modified) (3 diffs)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (modified) (2 diffs)
-
Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (modified) (1 diff)
-
Source/WebCore/rendering/RenderObject.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r93849 r93850 1 2011-08-25 Ben Wells <benwells@chromium.org> 2 3 Use PATH_BASED_BORDER_RADIUS_DRAWING for skia 4 https://bugs.webkit.org/show_bug.cgi?id=65583 5 6 Reviewed by James Robinson. 7 8 Update expectations: added failures for baselines to come. removed some 9 failure expectations for tests that now pass and moved some expectations 10 into the group of tests to be rebaselined. 11 12 * platform/chromium/test_expectations.txt: 13 1 14 2011-08-25 Martin Robinson <mrobinson@igalia.com> 2 15 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r93846 r93850 1935 1935 BUGCR47826 SKIP MAC : fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html = FAIL 1936 1936 1937 1938 BUGWK41311 LINUX WIN : fast/borders/border-radius-circle.html = IMAGE1939 BUGWK41311 LINUX WIN : fast/borders/border-radius-groove-01.html = IMAGE1940 BUGWK41311 LINUX WIN : fast/borders/border-radius-groove-02.html = IMAGE1941 BUGWK41311 LINUX WIN : fast/borders/border-radius-groove-03.html = IMAGE1942 BUGWK41311 LINUX WIN : fast/borders/border-radius-wide-border-01.html = IMAGE1943 BUGWK41311 LINUX WIN : fast/borders/border-radius-wide-border-02.html = IMAGE1944 BUGWK41311 LINUX WIN : fast/borders/border-radius-wide-border-03.html = IMAGE1945 BUGWK41311 LINUX WIN : fast/borders/border-radius-wide-border-04.html = IMAGE1946 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDashed04.html = IMAGE1947 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDashed05.html = IMAGE1948 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDashed06.html = IMAGE1949 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDotted04.html = IMAGE1950 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDotted05.html = IMAGE1951 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDotted06.html = IMAGE1952 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDouble04.html = IMAGE1953 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDouble05.html = IMAGE1954 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDouble06.html = IMAGE1955 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDouble07.html = IMAGE1956 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDouble08.html = IMAGE1957 BUGWK41311 LINUX WIN : fast/borders/borderRadiusDouble09.html = IMAGE1958 1959 BUGWK41311 LINUX WIN : fast/borders/mixed-border-styles-radius.html = IMAGE+TEXT1960 BUGWK41311 LINUX WIN : fast/borders/mixed-border-styles-radius2.html = IMAGE+TEXT1961 BUGWK41311 LINUX WIN : fast/borders/mixed-border-styles.html = IMAGE+TEXT1962 1963 1937 // Flaky tests. 1964 1938 BUGCR44345 LINUX : svg/zoom/text/zoom-hixie-mixed-009.xml = PASS IMAGE … … 2998 2972 BUGCR79917 LINUX WIN : fast/repaint/reflection-repaint-test.html = IMAGE 2999 2973 BUGCR79917 LINUX WIN : fast/repaint/table-cell-vertical-overflow.html = IMAGE 3000 BUGCR79917 LINUX WIN : fast/repaint/transform-absolute-child.html = IMAGE3001 BUGCR79917 LINUX WIN : fast/repaint/transform-absolute-in-positioned-container.html = IMAGE3002 2974 BUGCR79917 LINUX WIN : fast/repaint/transform-layout-repaint.html = IMAGE 3003 BUGCR79917 LINUX WIN : fast/repaint/transform-relative-position.html = IMAGE3004 BUGCR79917 LINUX WIN : fast/repaint/transform-repaint-descendants.html = IMAGE3005 2975 BUGCR79917 LINUX WIN : fast/table/border-collapsing/002-vertical.html = IMAGE 3006 2976 BUGCR79917 LINUX WIN : fast/table/border-collapsing/002.html = IMAGE 3007 2977 BUGCR79917 LINUX WIN : fast/table/empty-table-percent-height.html = IMAGE 3008 2978 BUGCR79917 LINUX WIN : fast/table/table-and-parts-outline.html = IMAGE 3009 BUGCR79917 LINUX WIN : fast/transforms/diamond.html = IMAGE3010 BUGCR79917 LINUX WIN : fast/transforms/matrix-01.html = IMAGE3011 BUGCR79917 LINUX WIN : fast/transforms/matrix-02.html = IMAGE3012 BUGCR79917 LINUX WIN : fast/transforms/skew-with-unitless-zero.html = IMAGE3013 2979 BUGCR79917 LINUX WIN : fast/transforms/transformed-caret.html = IMAGE 3014 2980 BUGCR79917 LINUX WIN : svg/custom/no-inherited-dashed-stroke.xhtml = IMAGE … … 3520 3486 BUGWK65462 VISTA : http/tests/cache/history-only-cached-subresource-loads-max-age-https.html = PASS TIMEOUT 3521 3487 3488 // Need new baselines due to border drawing now using the PATH_BASED_BORDER_RADIUS_DRAWING 3489 // code path. 3490 BUGWK65583 WIN LINUX : css2.1/t0805-c5517-brdr-s-00-c.html = IMAGE 3491 BUGWK65583 WIN LINUX : fast/backgrounds/border-radius-split-background-image.html = IMAGE 3492 BUGWK65583 WIN LINUX : fast/backgrounds/border-radius-split-background.html = IMAGE 3493 BUGWK65583 WIN LINUX : fast/backgrounds/gradient-background-leakage.html = IMAGE 3494 BUGWK65583 WIN LINUX : fast/backgrounds/repeat/negative-offset-repeat-transformed.html = IMAGE 3495 BUGWK65583 WIN LINUX : fast/writing-mode/border-radius-clipping-vertical-lr.html = IMAGE 3496 BUGWK65583 WIN LINUX : fast/writing-mode/box-shadow-horizontal-bt.html = IMAGE 3497 BUGWK65583 WIN LINUX : fast/writing-mode/box-shadow-vertical-lr.html = IMAGE 3498 BUGWK65583 WIN LINUX : fast/writing-mode/box-shadow-vertical-rl.html = IMAGE 3499 BUGWK65583 WIN LINUX : fast/borders/border-antialiasing.html = IMAGE 3500 BUGWK65583 WIN LINUX : fast/borders/border-radius-constraints.html = IMAGE 3501 BUGWK65583 WIN LINUX : fast/borders/border-radius-huge-assert.html = IMAGE 3502 BUGWK65583 WIN LINUX : fast/borders/border-radius-inline-flow.html = IMAGE 3503 BUGWK65583 WIN LINUX : fast/borders/border-radius-split-inline.html = IMAGE 3504 BUGWK65583 WIN LINUX : fast/borders/borderRadiusAllStylesAllCorners.html = IMAGE 3505 BUGWK65583 WIN LINUX : fast/borders/borderRadiusArcs01.html = IMAGE 3506 BUGWK65583 WIN LINUX : fast/borders/borderRadiusDashed02.html = IMAGE 3507 BUGWK65583 WIN LINUX : fast/borders/borderRadiusDashed03.html = IMAGE 3508 BUGWK65583 WIN LINUX : fast/borders/borderRadiusDotted01.html = IMAGE 3509 BUGWK65583 WIN LINUX : fast/borders/borderRadiusDouble01.html = IMAGE 3510 BUGWK65583 WIN LINUX : fast/borders/borderRadiusDouble02.html = IMAGE 3511 BUGWK65583 WIN LINUX : fast/borders/borderRadiusDouble03.html = IMAGE 3512 BUGWK65583 WIN LINUX : fast/borders/borderRadiusGroove01.html = IMAGE 3513 BUGWK65583 WIN LINUX : fast/borders/borderRadiusGroove02.html = IMAGE 3514 BUGWK65583 WIN LINUX : fast/borders/borderRadiusInset01.html = IMAGE 3515 BUGWK65583 WIN LINUX : fast/borders/borderRadiusInvalidColor.html = IMAGE 3516 BUGWK65583 WIN LINUX : fast/borders/borderRadiusOutset01.html = IMAGE 3517 BUGWK65583 WIN LINUX : fast/borders/borderRadiusRidge01.html = IMAGE 3518 BUGWK65583 WIN LINUX : fast/borders/borderRadiusSolid01.html = IMAGE 3519 BUGWK65583 WIN LINUX : fast/borders/borderRadiusSolid02.html = IMAGE 3520 BUGWK65583 WIN LINUX : fast/borders/borderRadiusSolid03.html = IMAGE 3521 BUGWK65583 WIN LINUX : fast/borders/borderRadiusSolid04.html = IMAGE 3522 BUGWK65583 WIN LINUX : fast/borders/different-color-borders.html = IMAGE 3523 BUGWK65583 WIN LINUX : fast/borders/fieldsetBorderRadius.html = IMAGE 3524 BUGWK65583 WIN LINUX : fast/borders/rtl-border-01.html = IMAGE 3525 BUGWK65583 WIN LINUX : fast/borders/rtl-border-02.html = IMAGE 3526 BUGWK65583 WIN LINUX : fast/borders/rtl-border-03.html = IMAGE 3527 BUGWK65583 WIN LINUX : fast/borders/rtl-border-04.html = IMAGE 3528 BUGWK65583 WIN LINUX : fast/borders/rtl-border-05.html = IMAGE 3529 BUGWK65583 WIN LINUX : fast/borders/table-borders.html = IMAGE 3530 BUGWK65583 WIN LINUX : fast/box-shadow/basic-shadows.html = IMAGE 3531 BUGWK65583 WIN LINUX : fast/box-shadow/border-radius-big.html = IMAGE 3532 BUGWK65583 WIN LINUX : fast/box-shadow/inset-box-shadow-radius.html = IMAGE 3533 BUGWK65583 WIN LINUX : fast/box-shadow/inset-box-shadows.html = IMAGE 3534 BUGWK65583 WIN LINUX : fast/box-shadow/inset-with-extraordinary-radii-and-border.html = IMAGE 3535 BUGWK65583 WIN LINUX : fast/box-shadow/inset.html = IMAGE 3536 BUGWK65583 WIN LINUX : fast/box-shadow/spread-multiple-normal.html = IMAGE 3537 BUGWK65583 WIN LINUX : fast/box-shadow/spread.html = IMAGE 3538 BUGWK65583 WIN LINUX : fast/css/box-shadow-and-border-radius.html = IMAGE 3539 BUGWK65583 WIN LINUX : fast/css/color-leakage.html = IMAGE 3540 BUGWK65583 WIN LINUX : fast/css/nested-rounded-corners.html = IMAGE 3541 BUGWK65583 WIN LINUX : fast/css/text-input-with-webkit-border-radius.html = IMAGE 3542 BUGWK65583 WIN LINUX : fast/forms/basic-selects.html = IMAGE 3543 BUGWK65583 WIN LINUX : fast/forms/validation-message-appearance.html = IMAGE 3544 BUGWK65583 WIN LINUX : fast/gradients/background-clipped.html = IMAGE 3545 BUGWK65583 WIN LINUX : fast/inline/inline-borders-with-bidi-override.html = IMAGE 3546 BUGWK65583 WIN LINUX : fast/multicol/client-rects.html = IMAGE 3547 BUGWK65583 WIN LINUX : fast/overflow/border-radius-clipping.html = IMAGE 3548 BUGWK65583 WIN LINUX : fast/repaint/border-radius-repaint.html = IMAGE 3549 BUGWK65583 WIN LINUX : fast/repaint/shadow-multiple-horizontal.html = IMAGE 3550 BUGWK65583 WIN LINUX : fast/repaint/shadow-multiple-strict-horizontal.html = IMAGE 3551 BUGWK65583 WIN LINUX : fast/repaint/shadow-multiple-strict-vertical.html = IMAGE 3552 BUGWK65583 WIN LINUX : fast/repaint/shadow-multiple-vertical.html = IMAGE 3553 BUGWK65583 WIN LINUX : fast/transforms/rotated-transform-affects-scrolling-1.html = IMAGE 3554 BUGWK65583 WIN LINUX : fast/transforms/rotated-transform-affects-scrolling-2.html = IMAGE 3555 BUGWK65583 WIN LINUX : fast/transforms/shadows.html = IMAGE 3556 BUGWK65583 WIN LINUX : media/video-layer-crash.html = IMAGE 3557 BUGWK65583 WIN LINUX : media/video-transformed.html = IMAGE 3558 3559 BUGWK65583 LINUX WIN : fast/borders/border-radius-circle.html = IMAGE 3560 BUGWK65583 LINUX WIN : fast/borders/border-radius-groove-01.html = IMAGE 3561 BUGWK65583 LINUX WIN : fast/borders/border-radius-groove-02.html = IMAGE 3562 BUGWK65583 LINUX WIN : fast/borders/border-radius-groove-03.html = IMAGE 3563 BUGWK65583 LINUX WIN : fast/borders/border-radius-wide-border-01.html = IMAGE 3564 BUGWK65583 LINUX WIN : fast/borders/border-radius-wide-border-02.html = IMAGE 3565 BUGWK65583 LINUX WIN : fast/borders/border-radius-wide-border-03.html = IMAGE 3566 BUGWK65583 LINUX WIN : fast/borders/border-radius-wide-border-04.html = IMAGE 3567 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDashed04.html = IMAGE 3568 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDashed05.html = IMAGE 3569 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDashed06.html = IMAGE 3570 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDotted04.html = IMAGE 3571 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDotted05.html = IMAGE 3572 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDotted06.html = IMAGE 3573 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDouble04.html = IMAGE 3574 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDouble05.html = IMAGE 3575 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDouble06.html = IMAGE 3576 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDouble07.html = IMAGE 3577 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDouble08.html = IMAGE 3578 BUGWK65583 LINUX WIN : fast/borders/borderRadiusDouble09.html = IMAGE 3579 3580 BUGWK65583 LINUX WIN : fast/borders/mixed-border-styles-radius.html = IMAGE+TEXT 3581 BUGWK65583 LINUX WIN : fast/borders/mixed-border-styles-radius2.html = IMAGE+TEXT 3582 BUGWK65583 LINUX WIN : fast/borders/mixed-border-styles.html = IMAGE+TEXT 3583 3584 BUGWK65583 LINUX WIN : fast/frames/iframe-scaling-with-scroll.html = IMAGE 3585 3586 BUGWK65583 LINUX WIN : fast/css/border-radius-non-negative.html = IMAGE 3587 3522 3588 // Introduced in r92298, which might cause another test crashing. 3523 3589 BUGZMO SKIP : fast/loader/reload-zero-byte-plugin.html = FAIL -
trunk/Source/WebCore/ChangeLog
r93848 r93850 1 2011-08-25 Ben Wells <benwells@chromium.org> 2 3 Use PATH_BASED_BORDER_RADIUS_DRAWING for skia 4 https://bugs.webkit.org/show_bug.cgi?id=65583 5 6 This change brings in the new border rendering for Skia. To support this without aliasing the skia 7 graphics context has been updated to support anti-aliased clipping around convex polygons and also 8 anti-aliased clipping outside a path. 9 10 Reviewed by James Robinson. 11 12 * platform/graphics/skia/GraphicsContextSkia.cpp: 13 (WebCore::GraphicsContext::clipOut): 14 (WebCore::GraphicsContext::clipConvexPolygon): 15 * platform/graphics/skia/PlatformContextSkia.cpp: 16 (WebCore::PlatformContextSkia::clipPathAntiAliased): 17 * rendering/RenderObject.h: 18 1 19 2011-08-25 Luke Macpherson <macpherson@chromium.org> 2 20 -
trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
r93386 r93850 393 393 return; 394 394 395 const SkPath&path = *p.platformPath();395 SkPath path = *p.platformPath(); 396 396 if (!isPathSkiaSafe(getCTM(), path)) 397 397 return; 398 398 399 platformContext()->canvas()->clipPath(path, SkRegion::kDifference_Op); 399 path.toggleInverseFillType(); 400 platformContext()->clipPathAntiAliased(path); 400 401 } 401 402 … … 480 481 481 482 SkPath path; 483 if (!isPathSkiaSafe(getCTM(), path)) 484 return; 485 482 486 setPathFromConvexPoints(&path, numPoints, points); 483 platformContext()->canvas()->clipPath(path); 487 if (antialiased) 488 platformContext()->clipPathAntiAliased(path); 489 else 490 platformContext()->canvas()->clipPath(path); 484 491 } 485 492 -
trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
r93386 r93850 284 284 if (!haveLayerOutstanding) { 285 285 SkRect bounds = clipPath.getBounds(); 286 canvas()->saveLayerAlpha(&bounds, 255, static_cast<SkCanvas::SaveFlags>(SkCanvas::kHasAlphaLayer_SaveFlag | SkCanvas::kFullColorLayer_SaveFlag | SkCanvas::kClipToLayer_SaveFlag)); 286 // If we are doing a clip outside of clipPath our layer needs to be for the whole 287 // canvas, otherwise we can create a smaller layer. 288 SkRect* layerBounds = 0; 289 if (!clipPath.isInverseFillType()) 290 layerBounds = &bounds; 291 canvas()->saveLayerAlpha(layerBounds, 255, static_cast<SkCanvas::SaveFlags>(SkCanvas::kHasAlphaLayer_SaveFlag | SkCanvas::kFullColorLayer_SaveFlag | SkCanvas::kClipToLayer_SaveFlag)); 287 292 // Guards state modification during clipped operations. 288 293 // The state is popped in applyAntiAliasedClipPaths(). -
trunk/Source/WebCore/rendering/RenderObject.h
r93547 r93850 39 39 #include <wtf/UnusedParam.h> 40 40 41 #if USE(CG) || USE(CAIRO) || PLATFORM(QT)41 #if USE(CG) || USE(CAIRO) || USE(SKIA) || PLATFORM(QT) 42 42 #define HAVE_PATH_BASED_BORDER_RADIUS_DRAWING 1 43 43 #endif
Note: See TracChangeset
for help on using the changeset viewer.
