27863 2009-07-30 17:45:35 -0700 Consolidate GeoLocation code to send positions and errors 2009-07-31 10:04:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 bolsinga bolsinga sam oldest_to_newest 136074 0 bolsinga 2009-07-30 17:45:35 -0700 There is some redundancy in this code that can be cleaned up. 136075 1 33850 bolsinga 2009-07-30 17:48:43 -0700 Created attachment 33850 Patch implementing the change 136159 2 33850 staikos 2009-07-31 07:31:22 -0700 Comment on attachment 33850 Patch implementing the change Nice cleanup! 136189 3 bolsinga 2009-07-31 10:04:33 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/page/Geolocation.cpp M WebCore/page/Geolocation.h Committed r46633 33850 2009-07-30 17:48:43 -0700 2009-07-31 07:31:22 -0700 Patch implementing the change 0001-2009-07-30-Greg-Bolsinga-bolsinga-apple.com.patch text/plain 6322 bolsinga RnJvbSBlOGYxNmU5MjJlOGJmMTM0MjIxZTZmZTNmYWYyMGExZWZmZjAxZDYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEJvbHNpbmdhIDxib2xzaW5nYUBhcHBsZS5jb20+CkRh dGU6IFRodSwgMzAgSnVsIDIwMDkgMTc6NDc6MjkgLTA3MDAKU3ViamVjdDogW1BBVENIXSAyMDA5 LTA3LTMwICBHcmVnIEJvbHNpbmdhICA8Ym9sc2luZ2FAYXBwbGUuY29tPgoKICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgQ29uc29saWRhdGUgR2VvTG9jYXRpb24g Y29kZSB0byBzZW5kIHBvc2l0aW9ucyBhbmQgZXJyb3JzCiAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3ODYzCgogICAgICAgIENyZWF0ZSBoZWxwZXIgbWV0 aG9kcyB0aGF0IHdpbGwgc2VuZCBwb3NpdGlvbnMgYW5kIGVycm9ycyB0byBlaXRoZXIKICAgICAg ICBvbmUgc2hvdHMgb3Igd2F0Y2hlcnMuCgogICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5jcHA6 CiAgICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpzZW5kRXJyb3IpOgogICAgICAgIChXZWJD b3JlOjpHZW9sb2NhdGlvbjo6c2VuZEVycm9yVG9PbmVTaG90cyk6CiAgICAgICAgKFdlYkNvcmU6 Okdlb2xvY2F0aW9uOjpzZW5kRXJyb3JUb1dhdGNoZXJzKToKICAgICAgICAoV2ViQ29yZTo6R2Vv bG9jYXRpb246OnNlbmRQb3NpdGlvbik6CiAgICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpz ZW5kUG9zaXRpb25Ub09uZVNob3RzKToKICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnNl bmRQb3NpdGlvblRvV2F0Y2hlcnMpOgogICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5oOgotLS0K IFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgfCAgIDE5ICsrKysrKysrKysrKysKIFdlYkNv cmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAgfCAgIDU4ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmggICB8ICAgIDMgKysK IDMgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NjUx ZWNmLi5lYTg1OWUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDA5LTA3LTMwICBHcmVnIEJvbHNpbmdhICA8 Ym9sc2luZ2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENvbnNvbGlkYXRlIEdlb0xvY2F0aW9uIGNvZGUgdG8gc2VuZCBwb3NpdGlv bnMgYW5kIGVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Mjc4NjMKKyAgICAgICAgCisgICAgICAgIENyZWF0ZSBoZWxwZXIgbWV0aG9kcyB0aGF0 IHdpbGwgc2VuZCBwb3NpdGlvbnMgYW5kIGVycm9ycyB0byBlaXRoZXIKKyAgICAgICAgb25lIHNo b3RzIG9yIHdhdGNoZXJzLgorCisgICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6c2VuZEVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6 Okdlb2xvY2F0aW9uOjpzZW5kRXJyb3JUb09uZVNob3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okdl b2xvY2F0aW9uOjpzZW5kRXJyb3JUb1dhdGNoZXJzKToKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xv Y2F0aW9uOjpzZW5kUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnNl bmRQb3NpdGlvblRvT25lU2hvdHMpOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnNl bmRQb3NpdGlvblRvV2F0Y2hlcnMpOgorICAgICAgICAqIHBhZ2UvR2VvbG9jYXRpb24uaDoKKwog MjAwOS0wNy0zMCAgWGlhb21laSBKaSAgPHhqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9HZW9sb2Nh dGlvbi5jcHAgYi9XZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwCmluZGV4IDhhYmU4YTYuLjFi Y2I2MjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAKKysrIGIvV2Vi Q29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcApAQCAtMTQzLDE4ICsxNDMsMjMgQEAgdm9pZCBHZW9s b2NhdGlvbjo6c2V0SXNBbGxvd2VkKGJvb2wgYWxsb3dlZCkKICAgICB9CiB9CiAKK3ZvaWQgR2Vv bG9jYXRpb246OnNlbmRFcnJvcihWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+JiBub3RpZmll cnMsIFBvc2l0aW9uRXJyb3IqIGVycm9yKQoreworICAgICBWZWN0b3I8UmVmUHRyPEdlb05vdGlm aWVyPiA+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBub3RpZmllcnMuZW5kKCk7CisgICAgIGZvciAo VmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBub3RpZmll cnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgICBSZWZQdHI8R2VvTm90aWZp ZXI+IG5vdGlmaWVyID0gKml0OworICAgICAgICAgCisgICAgICAgICBpZiAobm90aWZpZXItPm1f ZXJyb3JDYWxsYmFjaykKKyAgICAgICAgICAgICBub3RpZmllci0+bV9lcnJvckNhbGxiYWNrLT5o YW5kbGVFdmVudChlcnJvcik7CisgICAgIH0KK30KKwogdm9pZCBHZW9sb2NhdGlvbjo6c2VuZEVy cm9yVG9PbmVTaG90cyhQb3NpdGlvbkVycm9yKiBlcnJvcikKIHsKICAgICBWZWN0b3I8UmVmUHRy PEdlb05vdGlmaWVyPiA+IGNvcHk7CiAgICAgY29weVRvVmVjdG9yKG1fb25lU2hvdHMsIGNvcHkp OwogCi0gICAgVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPjo6Y29uc3RfaXRlcmF0b3IgZW5k ID0gY29weS5lbmQoKTsKLSAgICBmb3IgKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID46OmNv bnN0X2l0ZXJhdG9yIGl0ID0gY29weS5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAg ICAgUmVmUHRyPEdlb05vdGlmaWVyPiBub3RpZmllciA9ICppdDsKLSAgICAgICAgCi0gICAgICAg IGlmIChub3RpZmllci0+bV9lcnJvckNhbGxiYWNrKQotICAgICAgICAgICAgbm90aWZpZXItPm1f ZXJyb3JDYWxsYmFjay0+aGFuZGxlRXZlbnQoZXJyb3IpOwotICAgIH0KKyAgICBzZW5kRXJyb3Io Y29weSwgZXJyb3IpOwogfQogCiB2b2lkIEdlb2xvY2F0aW9uOjpzZW5kRXJyb3JUb1dhdGNoZXJz KFBvc2l0aW9uRXJyb3IqIGVycm9yKQpAQCAtMTYyLDIyICsxNjcsMTMgQEAgdm9pZCBHZW9sb2Nh dGlvbjo6c2VuZEVycm9yVG9XYXRjaGVycyhQb3NpdGlvbkVycm9yKiBlcnJvcikKICAgICBWZWN0 b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+IGNvcHk7CiAgICAgY29weVZhbHVlc1RvVmVjdG9yKG1f d2F0Y2hlcnMsIGNvcHkpOwogCi0gICAgVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPjo6Y29u c3RfaXRlcmF0b3IgZW5kID0gY29weS5lbmQoKTsKLSAgICBmb3IgKFZlY3RvcjxSZWZQdHI8R2Vv Tm90aWZpZXI+ID46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY29weS5iZWdpbigpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKLSAgICAgICAgUmVmUHRyPEdlb05vdGlmaWVyPiBub3RpZmllciA9ICppdDsKLSAg ICAgICAgCi0gICAgICAgIGlmIChub3RpZmllci0+bV9lcnJvckNhbGxiYWNrKQotICAgICAgICAg ICAgbm90aWZpZXItPm1fZXJyb3JDYWxsYmFjay0+aGFuZGxlRXZlbnQoZXJyb3IpOwotICAgIH0K KyAgICBzZW5kRXJyb3IoY29weSwgZXJyb3IpOwogfQogCi12b2lkIEdlb2xvY2F0aW9uOjpzZW5k UG9zaXRpb25Ub09uZVNob3RzKEdlb3Bvc2l0aW9uKiBwb3NpdGlvbikKK3ZvaWQgR2VvbG9jYXRp b246OnNlbmRQb3NpdGlvbihWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+JiBub3RpZmllcnMs IEdlb3Bvc2l0aW9uKiBwb3NpdGlvbikKIHsKLSAgICBWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVy PiA+IGNvcHk7Ci0gICAgY29weVRvVmVjdG9yKG1fb25lU2hvdHMsIGNvcHkpOwotICAgIAotICAg IFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IGNvcHku ZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+Ojpjb25zdF9pdGVy YXRvciBpdCA9IGNvcHkuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgVmVjdG9yPFJl ZlB0cjxHZW9Ob3RpZmllcj4gPjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbm90aWZpZXJzLmVuZCgp OworICAgIGZvciAoVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPjo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBub3RpZmllcnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIFJlZlB0 cjxHZW9Ob3RpZmllcj4gbm90aWZpZXIgPSAqaXQ7CiAgICAgICAgIEFTU0VSVChub3RpZmllci0+ bV9zdWNjZXNzQ2FsbGJhY2spOwogICAgICAgICAKQEAgLTE5MSwyNCArMTg3LDIwIEBAIHZvaWQg R2VvbG9jYXRpb246OnNlbmRQb3NpdGlvblRvT25lU2hvdHMoR2VvcG9zaXRpb24qIHBvc2l0aW9u KQogICAgIH0KIH0KIAordm9pZCBHZW9sb2NhdGlvbjo6c2VuZFBvc2l0aW9uVG9PbmVTaG90cyhH ZW9wb3NpdGlvbiogcG9zaXRpb24pCit7CisgICAgVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4g PiBjb3B5OworICAgIGNvcHlUb1ZlY3RvcihtX29uZVNob3RzLCBjb3B5KTsKKyAgICAKKyAgICBz ZW5kUG9zaXRpb24oY29weSwgcG9zaXRpb24pOworfQorCiB2b2lkIEdlb2xvY2F0aW9uOjpzZW5k UG9zaXRpb25Ub1dhdGNoZXJzKEdlb3Bvc2l0aW9uKiBwb3NpdGlvbikKIHsKICAgICBWZWN0b3I8 UmVmUHRyPEdlb05vdGlmaWVyPiA+IGNvcHk7CiAgICAgY29weVZhbHVlc1RvVmVjdG9yKG1fd2F0 Y2hlcnMsIGNvcHkpOwogICAgIAotICAgIFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID46OmNv bnN0X2l0ZXJhdG9yIGVuZCA9IGNvcHkuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8UmVmUHRyPEdl b05vdGlmaWVyPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IGNvcHkuYmVnaW4oKTsgaXQgIT0gZW5k OyArK2l0KSB7Ci0gICAgICAgIFJlZlB0cjxHZW9Ob3RpZmllcj4gbm90aWZpZXIgPSAqaXQ7Ci0g ICAgICAgIEFTU0VSVChub3RpZmllci0+bV9zdWNjZXNzQ2FsbGJhY2spOwotICAgICAgICAKLSAg ICAgICAgbm90aWZpZXItPm1fdGltZXIuc3RvcCgpOwotICAgICAgICBib29sIHNob3VsZENhbGxF cnJvckNhbGxiYWNrID0gZmFsc2U7Ci0gICAgICAgIG5vdGlmaWVyLT5tX3N1Y2Nlc3NDYWxsYmFj ay0+aGFuZGxlRXZlbnQocG9zaXRpb24sIHNob3VsZENhbGxFcnJvckNhbGxiYWNrKTsKLSAgICAg ICAgaWYgKHNob3VsZENhbGxFcnJvckNhbGxiYWNrKSB7Ci0gICAgICAgICAgICBSZWZQdHI8UG9z aXRpb25FcnJvcj4gZXJyb3IgPSBQb3NpdGlvbkVycm9yOjpjcmVhdGUoUG9zaXRpb25FcnJvcjo6 VU5LTk9XTl9FUlJPUiwgIkFuIGV4Y2VwdGlvbiB3YXMgdGhyb3duIik7Ci0gICAgICAgICAgICBo YW5kbGVFcnJvcihlcnJvci5nZXQoKSk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgc2VuZFBvc2l0 aW9uKGNvcHksIHBvc2l0aW9uKTsKIH0KIAogdm9pZCBHZW9sb2NhdGlvbjo6c3RhcnRUaW1lcihW ZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+JiBub3RpZmllcnMpCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvR2VvbG9jYXRpb24uaCBiL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5oCmluZGV4 IGFlMjRiZGQuLmYyOTQ4MTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5o CisrKyBiL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5oCkBAIC04OSw4ICs4OSwxMSBAQCBwcml2 YXRlOgogCiAgICAgYm9vbCBoYXNMaXN0ZW5lcnMoKSBjb25zdCB7IHJldHVybiAhbV9vbmVTaG90 cy5pc0VtcHR5KCkgfHwgIW1fd2F0Y2hlcnMuaXNFbXB0eSgpOyB9CiAKKyAgICB2b2lkIHNlbmRF cnJvcihWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+JiwgUG9zaXRpb25FcnJvciopOwogICAg IHZvaWQgc2VuZEVycm9yVG9PbmVTaG90cyhQb3NpdGlvbkVycm9yKik7CiAgICAgdm9pZCBzZW5k RXJyb3JUb1dhdGNoZXJzKFBvc2l0aW9uRXJyb3IqKTsKKyAgICAKKyAgICB2b2lkIHNlbmRQb3Np dGlvbihWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+JiwgR2VvcG9zaXRpb24qKTsKICAgICB2 b2lkIHNlbmRQb3NpdGlvblRvT25lU2hvdHMoR2VvcG9zaXRpb24qKTsKICAgICB2b2lkIHNlbmRQ b3NpdGlvblRvV2F0Y2hlcnMoR2VvcG9zaXRpb24qKTsKICAgICAKLS0gCjEuNi4zLjMKCg==