127610 2014-01-24 23:15:05 -0800 Remove an unnecessary platform #if in BitmapImage(CG)::checkForSolidColor() 2014-01-25 13:21:30 -0800 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton commit-queue sam simon.fraser oldest_to_newest 971906 0 thorton 2014-01-24 23:15:05 -0800 BitmapImageCG's checkForSolidColor() has a #if !PLATFORM(IOS) that is basically identical to the #else. Mishmosh the best of both sides. 971907 1 222193 thorton 2014-01-24 23:20:54 -0800 Created attachment 222193 patch 972025 2 222193 commit-queue 2014-01-25 13:21:28 -0800 Comment on attachment 222193 patch Clearing flags on attachment: 222193 Committed r162779: <http://trac.webkit.org/changeset/162779> 972026 3 commit-queue 2014-01-25 13:21:30 -0800 All reviewed patches have been landed. Closing bug. 222193 2014-01-24 23:20:54 -0800 2014-01-25 13:21:28 -0800 patch solidcolor.diff text/plain 3674 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1YzRmYzRmLi5kZDUyNGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTQtMDEtMjQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIGFuIHVubmVjZXNzYXJ5IHBsYXRmb3JtICNpZiBpbiBCaXRtYXBJbWFn ZShDRyk6OmNoZWNrRm9yU29saWRDb2xvcigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc2MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0JpdG1hcEltYWdlQ0cu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwSW1hZ2U6OmNoZWNrRm9yU29saWRDb2xvcik6 CisgICAgICAgIE92ZXIgdGltZSwgdGhlIHR3byBzaWRlcyBvZiB0aGlzICNpZiAhUExBVEZPUk0o SU9TKSBjb252ZXJnZWQuIFJlbW92ZSB0aGUgI2lmCisgICAgICAgIGFuZCBtZXJnZSB0aGUgY29k ZS4gV2UgZXhwbGljaXRseSB1c2Uga0NHQml0bWFwQnl0ZU9yZGVyMzJCaWcgdG8gYmUgY29ycmVj dCBldmVyeXdoZXJlLgorCiAyMDE0LTAxLTIzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBKYXZhU2NyaXB0Q2FsbEZyYW1lIGFuZCBTY3JpcHRE ZWJ1Z1NlcnZlciBpbnRvIEphdmFTY3JpcHRDb3JlIGZvciBpbnNwZWN0b3IKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0JpdG1hcEltYWdlQ0cuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvQml0bWFwSW1hZ2VDRy5jcHAKaW5k ZXggYzgzMTAxOC4uY2ViYzE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2cvQml0bWFwSW1hZ2VDRy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2cvQml0bWFwSW1hZ2VDRy5jcHAKQEAgLTE0NCwzNiArMTQ0LDE5IEBAIHZv aWQgQml0bWFwSW1hZ2U6OmNoZWNrRm9yU29saWRDb2xvcigpCiAKICAgICAvLyBDdXJyZW50bHkg d2Ugb25seSBjaGVjayBmb3Igc29saWQgY29sb3IgaW4gdGhlIGltcG9ydGFudCBzcGVjaWFsIGNh c2Ugb2YgYSAxeDEgaW1hZ2UuCiAgICAgaWYgKGltYWdlICYmIENHSW1hZ2VHZXRXaWR0aChpbWFn ZSkgPT0gMSAmJiBDR0ltYWdlR2V0SGVpZ2h0KGltYWdlKSA9PSAxKSB7Ci0jaWYgIVBMQVRGT1JN KElPUykKICAgICAgICAgdW5zaWduZWQgY2hhciBwaXhlbFs0XTsgLy8gUkdCQQotICAgICAgICBS ZXRhaW5QdHI8Q0dDb250ZXh0UmVmPiBibWFwID0gYWRvcHRDRihDR0JpdG1hcENvbnRleHRDcmVh dGUocGl4ZWwsIDEsIDEsIDgsIHNpemVvZihwaXhlbCksIGRldmljZVJHQkNvbG9yU3BhY2VSZWYo KSwKKyAgICAgICAgUmV0YWluUHRyPENHQ29udGV4dFJlZj4gYml0bWFwQ29udGV4dCA9IGFkb3B0 Q0YoQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKHBpeGVsLCAxLCAxLCA4LCBzaXplb2YocGl4ZWwpLCBk ZXZpY2VSR0JDb2xvclNwYWNlUmVmKCksCiAgICAgICAgICAgICBrQ0dJbWFnZUFscGhhUHJlbXVs dGlwbGllZExhc3QgfCBrQ0dCaXRtYXBCeXRlT3JkZXIzMkJpZykpOwotICAgICAgICBpZiAoIWJt YXApCisgICAgICAgIGlmICghYml0bWFwQ29udGV4dCkKICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgR3JhcGhpY3NDb250ZXh0KGJtYXAuZ2V0KCkpLnNldENvbXBvc2l0ZU9wZXJhdGlvbihD b21wb3NpdGVDb3B5KTsKLSAgICAgICAgQ0dSZWN0IGRzdCA9IHsgezAsIDB9LCB7MSwgMX0gfTsK LSAgICAgICAgQ0dDb250ZXh0RHJhd0ltYWdlKGJtYXAuZ2V0KCksIGRzdCwgaW1hZ2UpOwotICAg ICAgICBpZiAocGl4ZWxbM10gPT0gMCkKLSAgICAgICAgICAgIG1fc29saWRDb2xvciA9IENvbG9y KDAsIDAsIDAsIDApOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3NvbGlkQ29sb3IgPSBD b2xvcihwaXhlbFswXSAqIDI1NSAvIHBpeGVsWzNdLCBwaXhlbFsxXSAqIDI1NSAvIHBpeGVsWzNd LCBwaXhlbFsyXSAqIDI1NSAvIHBpeGVsWzNdLCBwaXhlbFszXSk7Ci0jZWxzZQotICAgICAgICAv LyBGSVhNRTogQ2FuIHdlIHNoYXJlIG1vcmUgY29kZSB3aXRoIHRoZSBNYWMgcG9ydD8gRm9ybWVy bHkgdGhlIE1hYyBwb3J0IGNyZWF0ZWQgYSBmbG9hdGluZyBwb2ludCBiaXRtYXAgY29udGV4dCwK LSAgICAgICAgLy8gYnV0IHN1Y2ggYSBjb250ZXh0IHdhc24ndCBzdXBwb3J0IG9uIGlPUyAocmRh cjovL3Byb2JsZW0vNTEwNjUxNCkuIFNvLCBvbiBpT1Mgd2UgY3JlYXRlZCBhbiBpbnRlZ3JhbCBi aXRtYXAKLSAgICAgICAgLy8gY29udGV4dC4gU2luY2UgPGh0dHBzOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8yMzkzOT4gdGhlIE1hYyBwb3J0IGNyZWF0ZXMgYW4gaW50ZWdyYWwgYml0bWFw IGNvbnRleHQuCi0gICAgICAgIHVuc2lnbmVkIGNoYXIgcGl4ZWxbNF0gPSB7MCwgMCwgMCwgMH07 IC8vIFJHQkEKLSAgICAgICAgUmV0YWluUHRyPENHQ29udGV4dFJlZj4gYml0bWFwID0gYWRvcHRD RihDR0JpdG1hcENvbnRleHRDcmVhdGUocGl4ZWwsIDEsIDEsIDgsIHNpemVvZihwaXhlbCksIGRl dmljZVJHQkNvbG9yU3BhY2VSZWYoKSwKLSAgICAgICAgICAgIGtDR0ltYWdlQWxwaGFQcmVtdWx0 aXBsaWVkTGFzdCkpOwotICAgICAgICBpZiAoIWJpdG1hcCkKLSAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgR3JhcGhpY3NDb250ZXh0KGJpdG1hcC5nZXQoKSkuc2V0Q29tcG9zaXRlT3BlcmF0 aW9uKENvbXBvc2l0ZUNvcHkpOwotICAgICAgICBDR1JlY3QgZGVzdGluYXRpb25SZWN0ID0geyB7 MCwgMH0sIHsxLCAxfSB9OwotICAgICAgICBDR0NvbnRleHREcmF3SW1hZ2UoYml0bWFwLmdldCgp LCBkZXN0aW5hdGlvblJlY3QsIGltYWdlKTsKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0KGJpdG1h cENvbnRleHQuZ2V0KCkpLnNldENvbXBvc2l0ZU9wZXJhdGlvbihDb21wb3NpdGVDb3B5KTsKKyAg ICAgICAgQ0dSZWN0IGRlc3RpbmF0aW9uUmVjdCA9IENHUmVjdE1ha2UoMCwgMCwgMSwgMSk7Cisg ICAgICAgIENHQ29udGV4dERyYXdJbWFnZShiaXRtYXBDb250ZXh0LmdldCgpLCBkZXN0aW5hdGlv blJlY3QsIGltYWdlKTsKICAgICAgICAgaWYgKCFwaXhlbFszXSkKICAgICAgICAgICAgIG1fc29s aWRDb2xvciA9IENvbG9yKDAsIDAsIDAsIDApOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBt X3NvbGlkQ29sb3IgPSBDb2xvcihzdGF0aWNfY2FzdDxpbnQ+KHBpeGVsWzBdKSwgc3RhdGljX2Nh c3Q8aW50PihwaXhlbFsxXSksIHN0YXRpY19jYXN0PGludD4ocGl4ZWxbMl0pLCBzdGF0aWNfY2Fz dDxpbnQ+KHBpeGVsWzNdKSk7Ci0jZW5kaWYKKyAgICAgICAgICAgIG1fc29saWRDb2xvciA9IENv bG9yKHBpeGVsWzBdICogMjU1IC8gcGl4ZWxbM10sIHBpeGVsWzFdICogMjU1IC8gcGl4ZWxbM10s IHBpeGVsWzJdICogMjU1IC8gcGl4ZWxbM10sIHBpeGVsWzNdKTsKKwogICAgICAgICBtX2lzU29s aWRDb2xvciA9IHRydWU7CiAgICAgfQogfQo=