117171 2013-06-03 15:22:28 -0700 Reduce indentation in Widget::paint in WidgetMac.mm 2013-06-03 15:29:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 896642 0 andersca 2013-06-03 15:22:28 -0700 Reduce indentation in Widget::paint in WidgetMac.mm 896643 1 203632 andersca 2013-06-03 15:23:10 -0700 Created attachment 203632 Patch 896647 2 andersca 2013-06-03 15:29:10 -0700 Committed r151138: <http://trac.webkit.org/changeset/151138> 203632 2013-06-03 15:23:10 -0700 2013-06-03 15:26:38 -0700 Patch bug-117171-20130603152141.patch text/plain 6502 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UxOGRlNDQyMzc3NzQ0 MTIwOTU2YjI3OGZjZmUyMTFiOWVlMDAwMC4uOWQ4YjU3MDE5YTg2OWU0YjliYzcxNWJjODg0YWFj NDQ4NzkwOTUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA2LTAzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVkdWNlIGluZGVu dGF0aW9uIGluIFdpZGdldDo6cGFpbnQgaW4gV2lkZ2V0TWFjLm1tCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcxNzEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgYW4gZWFybHkgcmV0dXJuIGZvciB0 aGUgY29tbW9uIGNhc2UgdG8gcmVkdWNlIGluZGVudGF0aW9uIGluIHRoZSBjb21wbGV4IGNhc2Uu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2lkZ2V0TWFjLm1tOgorICAgICAgICAoV2ViQ29y ZTo6V2lkZ2V0OjpwYWludCk6CisKIDIwMTMtMDYtMDMgIEJlbSBKb25lcy1CZXkgIDxiam9uZXNi ZUBhZG9iZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbm9kZS0+cGFyZW50Tm9k ZSgpLCBIZWFwLXVzZS1hZnRlci1mcmVlIGluIFdlYkNvcmU6OlJlbmRlckJveDo6ZXhjbHVzaW9u U2hhcGVPdXRzaWRlSW5mbwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1dpZGdldE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XaWRnZXRNYWMubW0K aW5kZXggODBmMjExZjRjOWQ3OTJkOGM1MGJiNDgxODIzOWI4NTljZmZjYjM5MC4uNTk4MDI5MGYz ODdkYzc0YjVjMmMzY2MxZTA0YjMxNTUyMmVjOTkwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL1dpZGdldE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvV2lkZ2V0TWFjLm1tCkBAIC0yMjIsNTUgKzIyMiw1NiBAQCB2b2lkIFdpZGdldDo6cGFp bnQoR3JhcGhpY3NDb250ZXh0KiBwLCBjb25zdCBJbnRSZWN0JiByKQogICAgICAgICBCRUdJTl9C TE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgICAgIFt2aWV3IGRpc3BsYXlSZWN0SWdub3JpbmdP cGFjaXR5Olt2aWV3IGNvbnZlcnRSZWN0OnIgZnJvbVZpZXc6W3ZpZXcgc3VwZXJ2aWV3XV1dOwog ICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotICAgIH0gZWxzZSB7Ci0gICAgICAg IC8vIFRoaXMgaXMgdGhlIGNhc2Ugb2YgZHJhd2luZyBpbnRvIGEgYml0bWFwIGNvbnRleHQgb3Ro ZXIgdGhhbiBhIHdpbmRvdyBiYWNraW5nIHN0b3JlLiBJdCBnZXRzIGhpdCBiZW5lYXRoCi0gICAg ICAgIC8vIC1jYWNoZURpc3BsYXlJblJlY3Q6dG9CaXRtYXBJbWFnZVJlcDosIGFuZCB3aGVuIHBh aW50aW5nIGludG8gY29tcG9zaXRpbmcgbGF5ZXJzLgotCi0gICAgICAgIC8vIFRyYW5zcGFyZW50 IHN1YmZyYW1lcyBhcmUgaW4gZmFjdCBpbXBsZW1lbnRlZCB3aXRoIHNjcm9sbCB2aWV3cyB0aGF0 IHJldHVybiBZRVMgZnJvbSAtZHJhd3NCYWNrZ3JvdW5kICh3aGVuZXZlciB0aGUgV2ViVmlldwot ICAgICAgICAvLyBpdHNlbGYgaXMgaW4gZHJhd3NCYWNrZ3JvdW5kIG1vZGUpLiBJbiB0aGUgbm9y bWFsIGRyYXdpbmcgY29kZSBwYXRoLCB0aGUgc2Nyb2xsIHZpZXdzIGFyZSBuZXZlciBhc2tlZCB0 byBkcmF3IHRoZSBiYWNrZ3JvdW5kLAotICAgICAgICAvLyBzbyB0aGlzIGlzIG5vdCBhbiBpc3N1 ZSwgYnV0IGluIHRoaXMgY29kZSBwYXRoIHRoZXkgYXJlLCBzbyB0aGUgZm9sbG93aW5nIGNvZGUg dGVtcG9yYXJpbHkgdHVybnMgYmFja2dyb3VuZCBkcndhaW5nIG9mZi4KLSAgICAgICAgTlNWaWV3 ICppbm5lclZpZXcgPSBwbGF0Zm9ybVdpZGdldCgpOwotICAgICAgICBOU1Njcm9sbFZpZXcgKnNj cm9sbFZpZXcgPSAwOwotICAgICAgICBpZiAoW2lubmVyVmlldyBjb25mb3Jtc1RvUHJvdG9jb2w6 QHByb3RvY29sKFdlYkNvcmVGcmFtZVNjcm9sbFZpZXcpXSkgewotICAgICAgICAgICAgQVNTRVJU KFtpbm5lclZpZXcgaXNLaW5kT2ZDbGFzczpbTlNTY3JvbGxWaWV3IGNsYXNzXV0pOwotICAgICAg ICAgICAgTlNTY3JvbGxWaWV3ICpzY3JvbGxWaWV3ID0gc3RhdGljX2Nhc3Q8TlNTY3JvbGxWaWV3 ICo+KGlubmVyVmlldyk7Ci0gICAgICAgICAgICAvLyAtY29waWVzT25TY3JvbGwgd2lsbCByZXR1 cm4gTk8gd2hlbmV2ZXIgdGhlIGNvbnRlbnQgdmlldyBpcyBub3QgZnVsbHkgb3BhcXVlLgotICAg ICAgICAgICAgaWYgKFtzY3JvbGxWaWV3IGRyYXdzQmFja2dyb3VuZF0gJiYgIVtbc2Nyb2xsVmll dyBjb250ZW50Vmlld10gY29waWVzT25TY3JvbGxdKQotICAgICAgICAgICAgICAgIFtzY3JvbGxW aWV3IHNldERyYXdzQmFja2dyb3VuZDpOT107Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgc2Nyb2xsVmlldyA9IDA7Ci0gICAgICAgIH0KLQotICAgICAgICBDR0NvbnRleHRSZWYg Y2dDb250ZXh0ID0gcC0+cGxhdGZvcm1Db250ZXh0KCk7Ci0gICAgICAgIEFTU0VSVChjZ0NvbnRl eHQgPT0gW2N1cnJlbnRDb250ZXh0IGdyYXBoaWNzUG9ydF0pOwotICAgICAgICBDR0NvbnRleHRT YXZlR1N0YXRlKGNnQ29udGV4dCk7Ci0KLSAgICAgICAgTlNSZWN0IHZpZXdGcmFtZSA9IFt2aWV3 IGZyYW1lXTsKLSAgICAgICAgTlNSZWN0IHZpZXdCb3VuZHMgPSBbdmlldyBib3VuZHNdOwotICAg ICAgICAvLyBTZXQgdXAgdGhlIHRyYW5zbGF0aW9uIGFuZCAoZmxpcHBlZCkgb3JpZW50YXRpb24g b2YgdGhlIGdyYXBoaWNzIGNvbnRleHQuIEluIG5vcm1hbCBkcmF3aW5nLCBBcHBLaXQgZG9lcyBp dCBhcyBpdCBkZXNjZW5kcyBkb3duCi0gICAgICAgIC8vIHRoZSB2aWV3IGhpZXJhcmNoeS4KLSAg ICAgICAgYm9vbCBzaG91bGRGbGlwQ29udGV4dCA9IHRydWU7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICAvLyBUaGlzIGlzIHRoZSBjYXNlIG9mIGRyYXdpbmcgaW50byBhIGJpdG1hcCBj b250ZXh0IG90aGVyIHRoYW4gYSB3aW5kb3cgYmFja2luZyBzdG9yZS4gSXQgZ2V0cyBoaXQgYmVu ZWF0aAorICAgIC8vIC1jYWNoZURpc3BsYXlJblJlY3Q6dG9CaXRtYXBJbWFnZVJlcDosIGFuZCB3 aGVuIHBhaW50aW5nIGludG8gY29tcG9zaXRpbmcgbGF5ZXJzLgorCisgICAgLy8gVHJhbnNwYXJl bnQgc3ViZnJhbWVzIGFyZSBpbiBmYWN0IGltcGxlbWVudGVkIHdpdGggc2Nyb2xsIHZpZXdzIHRo YXQgcmV0dXJuIFlFUyBmcm9tIC1kcmF3c0JhY2tncm91bmQgKHdoZW5ldmVyIHRoZSBXZWJWaWV3 CisgICAgLy8gaXRzZWxmIGlzIGluIGRyYXdzQmFja2dyb3VuZCBtb2RlKS4gSW4gdGhlIG5vcm1h bCBkcmF3aW5nIGNvZGUgcGF0aCwgdGhlIHNjcm9sbCB2aWV3cyBhcmUgbmV2ZXIgYXNrZWQgdG8g ZHJhdyB0aGUgYmFja2dyb3VuZCwKKyAgICAvLyBzbyB0aGlzIGlzIG5vdCBhbiBpc3N1ZSwgYnV0 IGluIHRoaXMgY29kZSBwYXRoIHRoZXkgYXJlLCBzbyB0aGUgZm9sbG93aW5nIGNvZGUgdGVtcG9y YXJpbHkgdHVybnMgYmFja2dyb3VuZCBkcndhaW5nIG9mZi4KKyAgICBOU1ZpZXcgKmlubmVyVmll dyA9IHBsYXRmb3JtV2lkZ2V0KCk7CisgICAgTlNTY3JvbGxWaWV3ICpzY3JvbGxWaWV3ID0gMDsK KyAgICBpZiAoW2lubmVyVmlldyBjb25mb3Jtc1RvUHJvdG9jb2w6QHByb3RvY29sKFdlYkNvcmVG cmFtZVNjcm9sbFZpZXcpXSkgeworICAgICAgICBBU1NFUlQoW2lubmVyVmlldyBpc0tpbmRPZkNs YXNzOltOU1Njcm9sbFZpZXcgY2xhc3NdXSk7CisgICAgICAgIE5TU2Nyb2xsVmlldyAqc2Nyb2xs VmlldyA9IHN0YXRpY19jYXN0PE5TU2Nyb2xsVmlldyAqPihpbm5lclZpZXcpOworICAgICAgICAv LyAtY29waWVzT25TY3JvbGwgd2lsbCByZXR1cm4gTk8gd2hlbmV2ZXIgdGhlIGNvbnRlbnQgdmll dyBpcyBub3QgZnVsbHkgb3BhcXVlLgorICAgICAgICBpZiAoW3Njcm9sbFZpZXcgZHJhd3NCYWNr Z3JvdW5kXSAmJiAhW1tzY3JvbGxWaWV3IGNvbnRlbnRWaWV3XSBjb3BpZXNPblNjcm9sbF0pCisg ICAgICAgICAgICBbc2Nyb2xsVmlldyBzZXREcmF3c0JhY2tncm91bmQ6Tk9dOworICAgICAgICBl bHNlCisgICAgICAgICAgICBzY3JvbGxWaWV3ID0gMDsKKyAgICB9CisKKyAgICBDR0NvbnRleHRS ZWYgY2dDb250ZXh0ID0gcC0+cGxhdGZvcm1Db250ZXh0KCk7CisgICAgQVNTRVJUKGNnQ29udGV4 dCA9PSBbY3VycmVudENvbnRleHQgZ3JhcGhpY3NQb3J0XSk7CisgICAgQ0dDb250ZXh0U2F2ZUdT dGF0ZShjZ0NvbnRleHQpOworCisgICAgTlNSZWN0IHZpZXdGcmFtZSA9IFt2aWV3IGZyYW1lXTsK KyAgICBOU1JlY3Qgdmlld0JvdW5kcyA9IFt2aWV3IGJvdW5kc107CisgICAgLy8gU2V0IHVwIHRo ZSB0cmFuc2xhdGlvbiBhbmQgKGZsaXBwZWQpIG9yaWVudGF0aW9uIG9mIHRoZSBncmFwaGljcyBj b250ZXh0LiBJbiBub3JtYWwgZHJhd2luZywgQXBwS2l0IGRvZXMgaXQgYXMgaXQgZGVzY2VuZHMg ZG93bgorICAgIC8vIHRoZSB2aWV3IGhpZXJhcmNoeS4KKyAgICBib29sIHNob3VsZEZsaXBDb250 ZXh0ID0gdHJ1ZTsKICNpZiAhUExBVEZPUk0oSU9TKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlO X1JFUVVJUkVEID49IDEwOTAKLSAgICAgICAgc2hvdWxkRmxpcENvbnRleHQgPSBmYWxzZTsKKyAg ICBzaG91bGRGbGlwQ29udGV4dCA9IGZhbHNlOwogI2VuZGlmCi0gICAgICAgIGlmIChzaG91bGRG bGlwQ29udGV4dCkgewotICAgICAgICAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKGNnQ29udGV4 dCwgdmlld0ZyYW1lLm9yaWdpbi54IC0gdmlld0JvdW5kcy5vcmlnaW4ueCwgdmlld0ZyYW1lLm9y aWdpbi55ICsgdmlld0ZyYW1lLnNpemUuaGVpZ2h0ICsgdmlld0JvdW5kcy5vcmlnaW4ueSk7Ci0g ICAgICAgICAgICBDR0NvbnRleHRTY2FsZUNUTShjZ0NvbnRleHQsIDEsIC0xKTsKLSAgICAgICAg fSBlbHNlCi0gICAgICAgICAgICBDR0NvbnRleHRUcmFuc2xhdGVDVE0oY2dDb250ZXh0LCB2aWV3 RnJhbWUub3JpZ2luLnggLSB2aWV3Qm91bmRzLm9yaWdpbi54LCB2aWV3RnJhbWUub3JpZ2luLnkg KyB2aWV3Qm91bmRzLm9yaWdpbi55KTsKKyAgICBpZiAoc2hvdWxkRmxpcENvbnRleHQpIHsKKyAg ICAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKGNnQ29udGV4dCwgdmlld0ZyYW1lLm9yaWdpbi54 IC0gdmlld0JvdW5kcy5vcmlnaW4ueCwgdmlld0ZyYW1lLm9yaWdpbi55ICsgdmlld0ZyYW1lLnNp emUuaGVpZ2h0ICsgdmlld0JvdW5kcy5vcmlnaW4ueSk7CisgICAgICAgIENHQ29udGV4dFNjYWxl Q1RNKGNnQ29udGV4dCwgMSwgLTEpOworICAgIH0gZWxzZQorICAgICAgICBDR0NvbnRleHRUcmFu c2xhdGVDVE0oY2dDb250ZXh0LCB2aWV3RnJhbWUub3JpZ2luLnggLSB2aWV3Qm91bmRzLm9yaWdp bi54LCB2aWV3RnJhbWUub3JpZ2luLnkgKyB2aWV3Qm91bmRzLm9yaWdpbi55KTsKIAotICAgICAg ICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7Ci0gICAgICAgIHsKLSAgICAgICAgICAgIE5T R3JhcGhpY3NDb250ZXh0ICpuc0NvbnRleHQgPSBbTlNHcmFwaGljc0NvbnRleHQgZ3JhcGhpY3ND b250ZXh0V2l0aEdyYXBoaWNzUG9ydDpjZ0NvbnRleHQgZmxpcHBlZDpZRVNdOwotICAgICAgICAg ICAgW3ZpZXcgZGlzcGxheVJlY3RJZ25vcmluZ09wYWNpdHk6W3ZpZXcgY29udmVydFJlY3Q6ciBm cm9tVmlldzpbdmlldyBzdXBlcnZpZXddXSBpbkNvbnRleHQ6bnNDb250ZXh0XTsKLSAgICAgICAg fQotICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOworICAgIEJFR0lOX0JMT0NLX09C SkNfRVhDRVBUSU9OUzsKKyAgICB7CisgICAgICAgIE5TR3JhcGhpY3NDb250ZXh0ICpuc0NvbnRl eHQgPSBbTlNHcmFwaGljc0NvbnRleHQgZ3JhcGhpY3NDb250ZXh0V2l0aEdyYXBoaWNzUG9ydDpj Z0NvbnRleHQgZmxpcHBlZDpZRVNdOworICAgICAgICBbdmlldyBkaXNwbGF5UmVjdElnbm9yaW5n T3BhY2l0eTpbdmlldyBjb252ZXJ0UmVjdDpyIGZyb21WaWV3Olt2aWV3IHN1cGVydmlld11dIGlu Q29udGV4dDpuc0NvbnRleHRdOworICAgIH0KKyAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05T OwogCi0gICAgICAgIENHQ29udGV4dFJlc3RvcmVHU3RhdGUoY2dDb250ZXh0KTsKKyAgICBDR0Nv bnRleHRSZXN0b3JlR1N0YXRlKGNnQ29udGV4dCk7CiAKLSAgICAgICAgaWYgKHNjcm9sbFZpZXcp Ci0gICAgICAgICAgICBbc2Nyb2xsVmlldyBzZXREcmF3c0JhY2tncm91bmQ6WUVTXTsKLSAgICB9 CisgICAgaWYgKHNjcm9sbFZpZXcpCisgICAgICAgIFtzY3JvbGxWaWV3IHNldERyYXdzQmFja2dy b3VuZDpZRVNdOwogfQogCiB2b2lkIFdpZGdldDo6c2V0SXNTZWxlY3RlZChib29sIGlzU2VsZWN0 ZWQpCg==