114387 2013-04-10 15:24:42 -0700 [wk2] Un-pollute TCADA methods with "PageOverlayLayerMap::iterator end" 2013-04-10 15:34:49 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton simon.fraser oldest_to_newest 873267 0 thorton 2013-04-10 15:24:42 -0700 Tiny cleanup. 873268 1 197410 thorton 2013-04-10 15:25:27 -0700 Created attachment 197410 cleanup 873272 2 thorton 2013-04-10 15:34:49 -0700 http://trac.webkit.org/changeset/148143 197410 2013-04-10 15:25:27 -0700 2013-04-10 15:32:14 -0700 cleanup cleanup.diff text/plain 6008 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3NjQzN2E4Li5jNTJlNGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTMtMDQtMTAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gVW4tcG9sbHV0ZSBUQ0FEQSBtZXRob2RzIHdpdGggIlBhZ2VPdmVybGF5 TGF5ZXJNYXA6Oml0ZXJhdG9yIGVuZCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDM4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWE6OnVwZGF0ZVByZWZlcmVuY2VzKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWE6OnBhaW50Q29udGVudHMpOgorICAgICAgICAoV2ViS2l0OjpU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6Zmx1c2hMYXllcnMpOgorICAgICAgICAoV2Vi S2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0RXhwb3NlZFJlY3QpOgorICAg ICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6bWFpbkZyYW1lU2Ny b2xsYWJpbGl0eUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYTo6dXBkYXRlR2VvbWV0cnkpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIpOgorCiAyMDEzLTA0 LTEwICBBbnRvbiBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CiAKICAgICAgICAg W0dUS10gQWRkIHN1cHBvcnQgZm9yIFBhZ2UgVmlzaWJpbGl0eQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggY2Q5YjJlMy4uY2NiNDIxZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC0yMjksOCArMjI5LDcgQEAg dm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlUHJlZmVyZW5jZXMoY29u c3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYKICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tp bmcgPSBtYWluRnJhbWVUaWxlZEJhY2tpbmcoKSkKICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRB Z2dyZXNzaXZlbHlSZXRhaW5zVGlsZXMoc2V0dGluZ3MtPmFnZ3Jlc3NpdmVUaWxlUmV0ZW50aW9u RW5hYmxlZCgpKTsKIAotICAgIFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGVuZCA9IG1f cGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7Ci0gICAgZm9yIChQYWdlT3ZlcmxheUxheWVyTWFwOjpp dGVyYXRvciBpdCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0 KSB7CisgICAgZm9yIChQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBpdCA9IG1fcGFnZU92 ZXJsYXlMYXllcnMuYmVnaW4oKSwgZW5kID0gbV9wYWdlT3ZlcmxheUxheWVycy5lbmQoKTsgaXQg IT0gZW5kOyArK2l0KSB7CiAgICAgICAgIGl0LT52YWx1ZS0+c2V0QWNjZWxlcmF0ZXNEcmF3aW5n KHNldHRpbmdzLT5hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKCkpOwogICAgICAgICBpdC0+dmFs dWUtPnNldFNob3dEZWJ1Z0JvcmRlcihzZXR0aW5ncy0+c2hvd0RlYnVnQm9yZGVycygpKTsKICAg ICAgICAgaXQtPnZhbHVlLT5zZXRTaG93UmVwYWludENvdW50ZXIoc2V0dGluZ3MtPnNob3dSZXBh aW50Q291bnRlcigpKTsKQEAgLTMxOSw4ICszMTgsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhOjpub3RpZnlGbHVzaFJlcXVpcmVkKGNvbnN0IEdyYXBoaWNzTGF5ZXIqKQog CiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpwYWludENvbnRlbnRzKGNvbnN0 IEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIsIEdyYXBoaWNzQ29udGV4dCYgZ3JhcGhpY3ND b250ZXh0LCBHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFzZSwgY29uc3QgSW50UmVjdCYgY2xpcFJl Y3QpCiB7Ci0gICAgUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgZW5kID0gbV9wYWdlT3Zl cmxheUxheWVycy5lbmQoKTsKLSAgICBmb3IgKFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9y IGl0ID0gbV9wYWdlT3ZlcmxheUxheWVycy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAg ICBmb3IgKFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wYWdlT3ZlcmxheUxh eWVycy5iZWdpbigpLCBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKICAgICAgICAgaWYgKGl0LT52YWx1ZSA9PSBncmFwaGljc0xheWVyKSB7CiAgICAg ICAgICAgICBtX3dlYlBhZ2UtPmRyYXdQYWdlT3ZlcmxheShpdC0+a2V5LCBncmFwaGljc0NvbnRl eHQsIGNsaXBSZWN0KTsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtMzQ3LDExICszNDUsMTAgQEAg Ym9vbCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6Zmx1c2hMYXllcnMoKQogICAgICAg ICBtX3BlbmRpbmdSb290Q29tcG9zaXRpbmdMYXllciA9IG51bGxwdHI7CiAgICAgfQogCi0gICAg UGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgZW5kID0gbV9wYWdlT3ZlcmxheUxheWVycy5l bmQoKTsKICAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChtX3Jvb3RM YXllci5nZXQoKS5mcmFtZSk7CiAgICAgaWYgKG1fY2xpcHNUb0V4cG9zZWRSZWN0KQogICAgICAg ICB2aXNpYmxlUmVjdC5pbnRlcnNlY3QoZW5jbG9zaW5nSW50UmVjdChtX2V4cG9zZWRSZWN0KSk7 Ci0gICAgZm9yIChQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBpdCA9IG1fcGFnZU92ZXJs YXlMYXllcnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgZm9yIChQYWdlT3Zlcmxh eUxheWVyTWFwOjppdGVyYXRvciBpdCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuYmVnaW4oKSwgZW5k ID0gbV9wYWdlT3ZlcmxheUxheWVycy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAg IEdyYXBoaWNzTGF5ZXIqIGxheWVyID0gaXQtPnZhbHVlLmdldCgpOwogICAgICAgICBsYXllci0+ Zmx1c2hDb21wb3NpdGluZ1N0YXRlKHZpc2libGVSZWN0KTsKICAgICB9CkBAIC0zOTYsOCArMzkz LDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0RXhwb3NlZFJlY3Qo Y29uc3QgRmxvYXRSZWN0JiBleHBvc2VkUmVjdCkKIAogICAgIG1haW5GcmFtZVRpbGVkQmFja2lu ZygpLT5zZXRFeHBvc2VkUmVjdChleHBvc2VkUmVjdCk7CiAKLSAgICBQYWdlT3ZlcmxheUxheWVy TWFwOjppdGVyYXRvciBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOwotICAgIGZvciAo UGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJl Z2luKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICBmb3IgKFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0 ZXJhdG9yIGl0ID0gbV9wYWdlT3ZlcmxheUxheWVycy5iZWdpbigpLCBlbmQgPSBtX3BhZ2VPdmVy bGF5TGF5ZXJzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgIGlmIChUaWxlZEJhY2tp bmcqIHRpbGVkQmFja2luZyA9IGl0LT52YWx1ZS0+dGlsZWRCYWNraW5nKCkpCiAgICAgICAgICAg ICB0aWxlZEJhY2tpbmctPnNldEV4cG9zZWRSZWN0KGV4cG9zZWRSZWN0KTsKIH0KQEAgLTQwNyw4 ICs0MDMsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjptYWluRnJhbWVT Y3JvbGxhYmlsaXR5Q2hhbmdlZChib29sIGlzU2Nyb2xsYQogICAgIG1fY2xpcHNUb0V4cG9zZWRS ZWN0ID0gIWlzU2Nyb2xsYWJsZTsKICAgICBtYWluRnJhbWVUaWxlZEJhY2tpbmcoKS0+c2V0Q2xp cHNUb0V4cG9zZWRSZWN0KCFpc1Njcm9sbGFibGUpOwogCi0gICAgUGFnZU92ZXJsYXlMYXllck1h cDo6aXRlcmF0b3IgZW5kID0gbV9wYWdlT3ZlcmxheUxheWVycy5lbmQoKTsKLSAgICBmb3IgKFBh Z2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wYWdlT3ZlcmxheUxheWVycy5iZWdp bigpOyBpdCAhPSBlbmQ7ICsraXQpCisgICAgZm9yIChQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVy YXRvciBpdCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuYmVnaW4oKSwgZW5kID0gbV9wYWdlT3Zlcmxh eUxheWVycy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQogICAgICAgICBpZiAoVGlsZWRCYWNraW5n KiB0aWxlZEJhY2tpbmcgPSBpdC0+dmFsdWUtPnRpbGVkQmFja2luZygpKQogICAgICAgICAgICAg dGlsZWRCYWNraW5nLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QoIWlzU2Nyb2xsYWJsZSk7CiB9CkBA IC00MzAsOCArNDI1LDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBk YXRlR2VvbWV0cnkoY29uc3QgSW50U2l6ZSYgdmlld1NpemUpCiAgICAgICAgIHNpemUgPSBjb250 ZW50U2l6ZTsKICAgICB9CiAKLSAgICBQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBlbmQg PSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOwotICAgIGZvciAoUGFnZU92ZXJsYXlMYXllck1h cDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsg KytpdCkgeworICAgIGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3Bh Z2VPdmVybGF5TGF5ZXJzLmJlZ2luKCksIGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7 IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICBHcmFwaGljc0xheWVyKiBsYXllciA9IGl0LT52 YWx1ZS5nZXQoKTsKICAgICAgICAgaWYgKGxheWVyLT5kcmF3c0NvbnRlbnQoKSkKICAgICAgICAg ICAgIGxheWVyLT5zZXRTaXplKHZpZXdTaXplKTsKQEAgLTUyNyw4ICs1MjEsNyBAQCB2b2lkIFRp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihDQUxh eWVyICpsYXllcikKICAgICBpZiAoaGFkUm9vdENvbXBvc2l0aW5nTGF5ZXIgIT0gbV9oYXNSb290 Q29tcG9zaXRpbmdMYXllcikKICAgICAgICAgbV9sYXllckhvc3RpbmdDb250ZXh0LT5zZXRSb290 TGF5ZXIobV9oYXNSb290Q29tcG9zaXRpbmdMYXllciA/IG1fcm9vdExheWVyLmdldCgpIDogMCk7 CiAKLSAgICBQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBlbmQgPSBtX3BhZ2VPdmVybGF5 TGF5ZXJzLmVuZCgpOwotICAgIGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQg PSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICBmb3Ig KFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wYWdlT3ZlcmxheUxheWVycy5i ZWdpbigpLCBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQp CiAgICAgICAgIFttX3Jvb3RMYXllci5nZXQoKSBhZGRTdWJsYXllcjppdC0+dmFsdWUtPnBsYXRm b3JtTGF5ZXIoKV07CiAKICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBtYWlu RnJhbWVUaWxlZEJhY2tpbmcoKSkgewo=