102289 2012-11-14 14:56:56 -0800 Cleanup BasicShape blending check 2012-11-14 15:27:53 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 95389 1 krit krit dbates eric webkit.review.bot oldest_to_newest 767341 0 krit 2012-11-14 14:56:56 -0800 We have the same checks if two BasicShape objects can be blended twice. Refactor the code and add a canBlend method in BasicShape that combined the check. 767356 1 174268 krit 2012-11-14 15:18:27 -0800 Created attachment 174268 Patch 767360 2 174268 eric 2012-11-14 15:25:13 -0800 Comment on attachment 174268 Patch The double-negatives are a bit confusing. But this looks right. 767366 3 krit 2012-11-14 15:27:53 -0800 Committed r134679: <http://trac.webkit.org/changeset/134679> 174268 2012-11-14 15:18:27 -0800 2012-11-14 15:25:13 -0800 Patch bug-102289-20121114151625.patch text/plain 4384 krit U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0Njc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YwMjhiNzMxNjFhNzYy NWVhNGY1NDIwYzViMDg1OTg5MzI3NmE5MC4uZjA4NWNmOTAyZTQxYjcwZGQzYjc5NDJiNTc2ZWI5 N2ZlYTI1MmI0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEyLTExLTE0ICBEaXJr IFNjaHVsemUgIDxrcml0QHdlYmtpdC5vcmc+CiAKKyAgICAgICAgQ2xlYW51cCBCYXNpY1NoYXBl IGJsZW5kaW5nIGNoZWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDIyODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDU1NQcm9wZXJ0eUFuaW1hdGlvbiBoYWQgdGhlIHNhbWUgY29kZSBmb3IgdmFyaWZ5 aW5nIHRoYXQgdHdvIEJhc2ljU2hhcGUgb2JqZWN0cyBjYW4gYmUgYmxlbmRlZCAKKyAgICAgICAg dHdpY2UuIFJlZmFjdG9yIHRoZSBjb2RlIGFuZCBhZGQgYSBjYW5CbGVuZCBtZXRob2QgaW4gQmFz aWNTaGFwZSB0aGF0IGNvbWJpbmVzIGJvdGggY2hlY2tzLiBUaGlzCisgICAgICAgIGlzIGEgcHJl cGFyYXRpb24gZm9yIGZvbGxvdy11cCBwYXRjaGVzLgorCisgICAgICAgIFB1cmUgcmVmYWN0b3Jp bmcgd2l0aG91dCBiZWhhdmlvciBjaGFuZ2UsIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBh Z2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmJsZW5kRnVuYyk6IENhbGwgbmV3IGNhbkJsZW5kIG1ldGhvZCBmb3IgYmxlbmRpbmcgdmVyaWZp Y2F0aW9uLgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpCYXNpY1NoYXBlOjpjYW5CbGVuZCk6IENoZWNrIGlmIHR3byBCYXNpY1No YXBlIG9iamVjdHMgY2FuIGJlIGJsZW5kZWQuCisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KiByZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaDoKKworMjAxMi0xMS0xNCAgRGlyayBTY2h1 bHplICA8a3JpdEB3ZWJraXQub3JnPgorCiAgICAgICAgIFtDU1MgRXhjbHVzaW9uc10gQmFzaWMg c2hhcGVzIG9uICdzaGFwZS1pbnNpZGUnIHNob3VsZCBiZSBhbmltYXRhYmxlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIxMjMKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3Bw CmluZGV4IDFjOGFhYWI3OGM3ZTJiYzI2ZDljYjNlNmQ4ZGMzZWY3OTUyYzk1ZjcuLjJjYzdjZTU2 NWU4ZmNhODEyYjRiZjhiZDJiMTliOGIyMmYzYmE1ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0aW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHAKQEAgLTEzNSwx MiArMTM1LDcgQEAgc3RhdGljIGlubGluZSBQYXNzUmVmUHRyPENsaXBQYXRoT3BlcmF0aW9uPiBi bGVuZEZ1bmMoY29uc3QgQW5pbWF0aW9uQmFzZSosIENsaXAKICAgICBjb25zdCBCYXNpY1NoYXBl KiBmcm9tU2hhcGUgPSBzdGF0aWNfY2FzdDxTaGFwZUNsaXBQYXRoT3BlcmF0aW9uKj4oZnJvbSkt PmJhc2ljU2hhcGUoKTsKICAgICBjb25zdCBCYXNpY1NoYXBlKiB0b1NoYXBlID0gc3RhdGljX2Nh c3Q8U2hhcGVDbGlwUGF0aE9wZXJhdGlvbio+KHRvKS0+YmFzaWNTaGFwZSgpOwogCi0gICAgLy8g RklYTUU6IFN1cHBvcnQgYW5pbWF0aW9ucyBiZXR3ZWVuIGRpZmZlcmVudCBzaGFwZXMgaW4gdGhl IGZ1dHVyZS4KLSAgICBpZiAoZnJvbVNoYXBlLT50eXBlKCkgIT0gdG9TaGFwZS0+dHlwZSgpKQot ICAgICAgICByZXR1cm4gdG87Ci0KLSAgICAvLyBGSVhNRTogU3VwcG9ydCBhbmltYXRpb25zIGJl dHdlZW4gcG9seWdvbnMgaW4gdGhlIGZ1dHVyZS4KLSAgICBpZiAoZnJvbVNoYXBlLT50eXBlKCkg PT0gQmFzaWNTaGFwZTo6QkFTSUNfU0hBUEVfUE9MWUdPTikKKyAgICBpZiAoIWZyb21TaGFwZS0+ Y2FuQmxlbmQodG9TaGFwZSkpCiAgICAgICAgIHJldHVybiB0bzsKIAogICAgIHJldHVybiBTaGFw ZUNsaXBQYXRoT3BlcmF0aW9uOjpjcmVhdGUodG9TaGFwZS0+YmxlbmQoZnJvbVNoYXBlLCBwcm9n cmVzcykpOwpAQCAtMTQ5LDEyICsxNDQsNyBAQCBzdGF0aWMgaW5saW5lIFBhc3NSZWZQdHI8Q2xp cFBhdGhPcGVyYXRpb24+IGJsZW5kRnVuYyhjb25zdCBBbmltYXRpb25CYXNlKiwgQ2xpcAogI2lm IEVOQUJMRShDU1NfRVhDTFVTSU9OUykKIHN0YXRpYyBpbmxpbmUgUGFzc1JlZlB0cjxCYXNpY1No YXBlPiBibGVuZEZ1bmMoY29uc3QgQW5pbWF0aW9uQmFzZSosIEJhc2ljU2hhcGUqIGZyb20sIEJh c2ljU2hhcGUqIHRvLCBkb3VibGUgcHJvZ3Jlc3MpCiB7Ci0gICAgLy8gRklYTUU6IFN1cHBvcnQg YW5pbWF0aW9ucyBiZXR3ZWVuIGRpZmZlcmVudCBzaGFwZXMgaW4gdGhlIGZ1dHVyZS4KLSAgICBp ZiAoZnJvbS0+dHlwZSgpICE9IHRvLT50eXBlKCkpCi0gICAgICAgIHJldHVybiB0bzsKLQotICAg IC8vIEZJWE1FOiBTdXBwb3J0IGFuaW1hdGlvbnMgYmV0d2VlbiBwb2x5Z29ucyBpbiB0aGUgZnV0 dXJlLgotICAgIGlmIChmcm9tLT50eXBlKCkgPT0gQmFzaWNTaGFwZTo6QkFTSUNfU0hBUEVfUE9M WUdPTikKKyAgICBpZiAoIWZyb20tPmNhbkJsZW5kKHRvKSkKICAgICAgICAgcmV0dXJuIHRvOwog CiAgICAgcmV0dXJuIHRvLT5ibGVuZChmcm9tLCBwcm9ncmVzcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmNwcAppbmRleCAyNzUwZGI5MWQ4ZjI4MTA4 NmVhZmM2MDFkZDU4ZjcxNTQwYjFhOGVlLi5mYTMzMTgzNTlhNjQ0MWRjYjg4MDZkMjY5YjBmODY4 MzM5NTk4YTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFz aWNTaGFwZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9CYXNpY1No YXBlcy5jcHAKQEAgLTM3LDYgKzM3LDE5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorYm9v bCBCYXNpY1NoYXBlOjpjYW5CbGVuZChjb25zdCBCYXNpY1NoYXBlKiBvdGhlcikgY29uc3QKK3sK KyAgICAvLyBGSVhNRTogU3VwcG9ydCBhbmltYXRpb25zIGJldHdlZW4gZGlmZmVyZW50IHNoYXBl cyBpbiB0aGUgZnV0dXJlLgorICAgIGlmICh0eXBlKCkgIT0gb3RoZXItPnR5cGUoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gRklYTUU6IFN1cHBvcnQgYW5pbWF0aW9ucyBiZXR3 ZWVuIHBvbHlnb25zIGluIHRoZSBmdXR1cmUuCisgICAgaWYgKHR5cGUoKSA9PSBCYXNpY1NoYXBl OjpCQVNJQ19TSEFQRV9QT0xZR09OKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKwogdm9pZCBCYXNpY1NoYXBlUmVjdGFuZ2xlOjpwYXRoKFBhdGgmIHBhdGgs IGNvbnN0IEZsb2F0UmVjdCYgYm91bmRpbmdCb3gpCiB7CiAgICAgQVNTRVJUKHBhdGguaXNFbXB0 eSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9CYXNpY1No YXBlcy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmgKaW5k ZXggNzk4OTM3NGY1ZTU3NWE1ZmNlNjU2OGEzZjI0NDViOWI0OTFiZGU0Mi4uMTcxZDljMWY2Y2M5 YjQwYzA4ODljNGU3YTA1NjRmY2FiNzkzYWQwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmgKQEAgLTUyLDYgKzUyLDggQEAgcHVibGljOgogICAgICAg ICBCQVNJQ19TSEFQRV9QT0xZR09OID0gNAogICAgIH07CiAKKyAgICBib29sIGNhbkJsZW5kKGNv bnN0IEJhc2ljU2hhcGUqKSBjb25zdDsKKwogICAgIHZpcnR1YWwgdm9pZCBwYXRoKFBhdGgmLCBj b25zdCBGbG9hdFJlY3QmKSA9IDA7CiAgICAgdmlydHVhbCBXaW5kUnVsZSB3aW5kUnVsZSgpIGNv bnN0IHsgcmV0dXJuIFJVTEVfTk9OWkVSTzsgfQogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxCYXNp Y1NoYXBlPiBibGVuZChjb25zdCBCYXNpY1NoYXBlKiwgZG91YmxlKSBjb25zdCA9IDA7Cg==