81754 2012-03-21 03:41:54 -0700 Update LayoutUnit usage in FrameSelection 2012-03-22 07:14:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric jchaffraix webkit.review.bot oldest_to_newest 583960 0 leviw 2012-03-21 03:41:54 -0700 FrameSelection has several methods that operate on absolute coordinates, which we continue to express using integers. 583973 1 133007 leviw 2012-03-21 04:12:10 -0700 Created attachment 133007 Patch 584387 2 133007 eric 2012-03-21 11:16:17 -0700 Comment on attachment 133007 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133007&action=review > Source/WebCore/editing/FrameSelection.h:298 > + IntRect m_absCaretBounds; // absolute bounding rect for the caret This comment doesn't help much, but could be made to. :) 585173 3 133236 leviw 2012-03-22 05:52:48 -0700 Created attachment 133236 Patch for landing 585231 4 133236 webkit.review.bot 2012-03-22 07:14:29 -0700 Comment on attachment 133236 Patch for landing Clearing flags on attachment: 133236 Committed r111689: <http://trac.webkit.org/changeset/111689> 585232 5 webkit.review.bot 2012-03-22 07:14:33 -0700 All reviewed patches have been landed. Closing bug. 133007 2012-03-21 04:12:10 -0700 2012-03-22 05:52:40 -0700 Patch bug-81754-20120321041209.patch text/plain 7755 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTUxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTAzLTIxICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGUgTGF5b3V0VW5p dCB1c2FnZSBpbiBGcmFtZVNlbGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODE3NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGcmFtZVNlbGVjdGlvbiBzdG9yZXMgaXRzIGNhcmV0IGFuZCByZXBh aW50IGJvdW5kcyBpbiBhYnNvbHV0ZSBjb29yZGluYXRlcy4gQWJzb2x1dGUgY29vcmRpbmF0ZXMK KyAgICAgICAgd2UgdHJlYXQgYXMgcGl4ZWwgdmFsdWVzLCBzbyB0aGlzIHBhdGNoIGNoYW5nZXMg dGhlc2UgdmFsdWVzIHRvIGludGVnZXJzLiBTdWItcGl4ZWwgcHJlY2lzaW9uCisgICAgICAgIHdp bGwgc3RpbGwgYmUgdXNlZCB3aGVuIHRoZXNlIGNvb3JkaW5hdGVzIGFyZSBwYXNzZWQgZG93biBh bmQgdXNlZCBsb2NhbGx5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJl aGF2aW9yLgorCisgICAgICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjphYnNvbHV0ZUNhcmV0WSk6IFVzZXMgYWJzb2x1dGUgY29vcmRpbmF0ZXMsIHdo aWNoIGFyZSBpbnRzLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246Om1vZGlmeSk6 IFVzZXMgYWJzb2x1dGUgY29vcmRpbmF0ZXMgdG8gaGFuZGxlIHZlcnRpY2FsIHNlbGVjdGlvbgor ICAgICAgICBtb2RpZmljYXRpb24uIFN1Yi1waXhlbCBwcmVjaXNpb24gd2lsbCBiZSB1c2VkIHdo ZW4gdGhlc2UgdmFsdWVzIGFyZSBjb252ZXJ0ZWQgdG8gbG9jYWwgb25lcy4KKyAgICAgICAgKFdl YkNvcmU6OkNhcmV0QmFzZTo6YWJzb2x1dGVCb3VuZHNGb3JMb2NhbFJlY3QpOiBBYnNvbHV0ZSBj b29yZGluYXRlcyAtPiBpbnRzLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OmFi c29sdXRlQ2FyZXRCb3VuZHMpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNhcmV0QmFzZTo6 Y2FyZXRSZXBhaW50UmVjdCk6IFRoZSBjYXJldCByZXBhaW50IHJlY3QgaXMgc3RvcmVkIGluIGFi c29sdXRlIGNvb3JkaW5hdGVzLgorICAgICAgICBSZXZlcnRpbmcgdGhlIHZhbHVlcyB0byBpbnRz LgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OnJlY29tcHV0ZUNhcmV0UmVjdCk6 IERpdHRvLgorICAgICAgICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaDoKKyAgICAgICAgKEZy YW1lU2VsZWN0aW9uKToKKyAgICAgICAgKiBlZGl0aW5nL21hYy9GcmFtZVNlbGVjdGlvbk1hYy5t bToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjpub3RpZnlBY2Nlc3NpYmlsaXR5 Rm9yU2VsZWN0aW9uQ2hhbmdlKTogU3dpdGNoaW5nIHRvIHN0b3JlIGFic29sdXRlCisgICAgICAg IGNvb3JkaW5hdGVzIGFzIGludGVnZXJzLgorCiAyMDEyLTAzLTIxICBKb25hdGhhbiBEb25nICA8 am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnld IFVwc3RyZWFtaW5nIGJsYWNrYmVycnkgc3BlY2lmaWMgY3NzIGZpbGUKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCShyZXZpc2lvbiAxMTE1MTgpCisrKyBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpA QCAtOTg3LDkgKzk4Nyw5IEBAIGJvb2wgRnJhbWVTZWxlY3Rpb246Om1vZGlmeShFQWx0ZXJhdGlv biAKIH0KIAogLy8gRklYTUU6IE1heWJlIGJhc2VsaW5lIHdvdWxkIGJlIGJldHRlcj8KLXN0YXRp YyBib29sIGFic29sdXRlQ2FyZXRZKGNvbnN0IFZpc2libGVQb3NpdGlvbiAmYywgTGF5b3V0VW5p dCAmeSkKK3N0YXRpYyBib29sIGFic29sdXRlQ2FyZXRZKGNvbnN0IFZpc2libGVQb3NpdGlvbiAm YywgaW50ICZ5KQogewotICAgIExheW91dFJlY3QgcmVjdCA9IGMuYWJzb2x1dGVDYXJldEJvdW5k cygpOworICAgIEludFJlY3QgcmVjdCA9IGMuYWJzb2x1dGVDYXJldEJvdW5kcygpOwogICAgIGlm IChyZWN0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHkgPSByZWN0Lnko KSArIHJlY3QuaGVpZ2h0KCkgLyAyOwpAQCAtMTAyOCwxMiArMTAyOCwxMiBAQCBib29sIEZyYW1l U2VsZWN0aW9uOjptb2RpZnkoRUFsdGVyYXRpb24gCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAot ICAgIExheW91dFVuaXQgc3RhcnRZOworICAgIGludCBzdGFydFk7CiAgICAgaWYgKCFhYnNvbHV0 ZUNhcmV0WShwb3MsIHN0YXJ0WSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoZGly ZWN0aW9uID09IERpcmVjdGlvblVwKQogICAgICAgICBzdGFydFkgPSAtc3RhcnRZOwotICAgIExh eW91dFVuaXQgbGFzdFkgPSBzdGFydFk7CisgICAgaW50IGxhc3RZID0gc3RhcnRZOwogCiAgICAg VmlzaWJsZVBvc2l0aW9uIHJlc3VsdDsKICAgICBWaXNpYmxlUG9zaXRpb24gbmV4dDsKQEAgLTEw NDUsMTIgKzEwNDUsMTIgQEAgYm9vbCBGcmFtZVNlbGVjdGlvbjo6bW9kaWZ5KEVBbHRlcmF0aW9u IAogCiAgICAgICAgIGlmIChuZXh0LmlzTnVsbCgpIHx8IG5leHQgPT0gcCkKICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICBMYXlvdXRVbml0IG5leHRZOworICAgICAgICBpbnQgbmV4dFk7CiAg ICAgICAgIGlmICghYWJzb2x1dGVDYXJldFkobmV4dCwgbmV4dFkpKQogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGlmIChkaXJlY3Rpb24gPT0gRGlyZWN0aW9uVXApCiAgICAgICAgICAgICBu ZXh0WSA9IC1uZXh0WTsKLSAgICAgICAgaWYgKG5leHRZIC0gc3RhcnRZID4gc3RhdGljX2Nhc3Q8 TGF5b3V0VW5pdD4odmVydGljYWxEaXN0YW5jZSkpCisgICAgICAgIGlmIChuZXh0WSAtIHN0YXJ0 WSA+IHN0YXRpY19jYXN0PGludD4odmVydGljYWxEaXN0YW5jZSkpCiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgaWYgKG5leHRZID49IGxhc3RZKSB7CiAgICAgICAgICAgICBsYXN0WSA9IG5l eHRZOwpAQCAtMTI0NywxMSArMTI0NywxMSBAQCBMYXlvdXRSZWN0IEZyYW1lU2VsZWN0aW9uOjps b2NhbENhcmV0UmVjCiAgICAgcmV0dXJuIGxvY2FsQ2FyZXRSZWN0V2l0aG91dFVwZGF0ZSgpOwog fQogCi1MYXlvdXRSZWN0IENhcmV0QmFzZTo6YWJzb2x1dGVCb3VuZHNGb3JMb2NhbFJlY3QoTm9k ZSogbm9kZSwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkgY29uc3QKK0ludFJlY3QgQ2FyZXRCYXNl OjphYnNvbHV0ZUJvdW5kc0ZvckxvY2FsUmVjdChOb2RlKiBub2RlLCBjb25zdCBMYXlvdXRSZWN0 JiByZWN0KSBjb25zdAogewogICAgIFJlbmRlck9iamVjdCogY2FyZXRQYWludGVyID0gY2FyZXRS ZW5kZXJlcihub2RlKTsKICAgICBpZiAoIWNhcmV0UGFpbnRlcikKLSAgICAgICAgcmV0dXJuIExh eW91dFJlY3QoKTsKKyAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKICAgICAKICAgICBMYXlvdXRS ZWN0IGxvY2FsUmVjdChyZWN0KTsKICAgICBpZiAoY2FyZXRQYWludGVyLT5pc0JveCgpKQpAQCAt MTI1OSw3ICsxMjU5LDcgQEAgTGF5b3V0UmVjdCBDYXJldEJhc2U6OmFic29sdXRlQm91bmRzRm9y TAogICAgIHJldHVybiBjYXJldFBhaW50ZXItPmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRSZWN0 KGxvY2FsUmVjdCkpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7CiB9CiAKLUxheW91dFJlY3QgRnJh bWVTZWxlY3Rpb246OmFic29sdXRlQ2FyZXRCb3VuZHMoKQorSW50UmVjdCBGcmFtZVNlbGVjdGlv bjo6YWJzb2x1dGVDYXJldEJvdW5kcygpCiB7CiAgICAgcmVjb21wdXRlQ2FyZXRSZWN0KCk7CiAg ICAgcmV0dXJuIG1fYWJzQ2FyZXRCb3VuZHM7CkBAIC0xMjc1LDcgKzEyNzUsNyBAQCBzdGF0aWMg TGF5b3V0UmVjdCByZXBhaW50UmVjdEZvckNhcmV0KExhCiAgICAgcmV0dXJuIGNhcmV0OwogfQog Ci1MYXlvdXRSZWN0IENhcmV0QmFzZTo6Y2FyZXRSZXBhaW50UmVjdChOb2RlKiBub2RlKSBjb25z dAorSW50UmVjdCBDYXJldEJhc2U6OmNhcmV0UmVwYWludFJlY3QoTm9kZSogbm9kZSkgY29uc3QK IHsKICAgICByZXR1cm4gYWJzb2x1dGVCb3VuZHNGb3JMb2NhbFJlY3Qobm9kZSwgcmVwYWludFJl Y3RGb3JDYXJldChsb2NhbENhcmV0UmVjdFdpdGhvdXRVcGRhdGUoKSkpOwogfQpAQCAtMTI5Nyw3 ICsxMjk3LDcgQEAgYm9vbCBGcmFtZVNlbGVjdGlvbjo6cmVjb21wdXRlQ2FyZXRSZWN0KAogICAg IGlmIChvbGRSZWN0ID09IG5ld1JlY3QgJiYgIW1fYWJzQ2FyZXRCb3VuZHNEaXJ0eSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgTGF5b3V0UmVjdCBvbGRBYnNDYXJldEJvdW5kcyA9IG1f YWJzQ2FyZXRCb3VuZHM7CisgICAgSW50UmVjdCBvbGRBYnNDYXJldEJvdW5kcyA9IG1fYWJzQ2Fy ZXRCb3VuZHM7CiAgICAgLy8gRklYTUU6IFJlbmFtZSBtX2NhcmV0UmVjdCB0byBtX2xvY2FsQ2Fy ZXRSZWN0LgogICAgIG1fYWJzQ2FyZXRCb3VuZHMgPSBhYnNvbHV0ZUJvdW5kc0ZvckxvY2FsUmVj dChtX3NlbGVjdGlvbi5zdGFydCgpLmRlcHJlY2F0ZWROb2RlKCksIGxvY2FsQ2FyZXRSZWN0V2l0 aG91dFVwZGF0ZSgpKTsKICAgICBtX2Fic0NhcmV0Qm91bmRzRGlydHkgPSBmYWxzZTsKQEAgLTEz MDYsNyArMTMwNiw3IEBAIGJvb2wgRnJhbWVTZWxlY3Rpb246OnJlY29tcHV0ZUNhcmV0UmVjdCgK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAjaWYgRU5BQkxFKFRFWFRfQ0FSRVQpCi0gICAgTGF5 b3V0UmVjdCBvbGRBYnNvbHV0ZUNhcmV0UmVwYWludEJvdW5kcyA9IG1fYWJzb2x1dGVDYXJldFJl cGFpbnRCb3VuZHM7CisgICAgSW50UmVjdCBvbGRBYnNvbHV0ZUNhcmV0UmVwYWludEJvdW5kcyA9 IG1fYWJzb2x1dGVDYXJldFJlcGFpbnRCb3VuZHM7CiAjZW5kaWYKIAogICAgIC8vIFdlIGJlbGll dmUgdGhhdCB3ZSBuZWVkIHRvIGluZmxhdGUgdGhlIGxvY2FsIHJlY3QgYmVmb3JlIHRyYW5zZm9y bWluZyBpdCB0byBvYnRhaW4gdGhlIHJlcGFpbnQgYm91bmRzLgpJbmRleDogU291cmNlL1dlYkNv cmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAkocmV2aXNpb24gMTExNTE4KQorKysgU291cmNlL1dl YkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01OSw4ICs1 OSw4IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIGludmFsaWRhdGVDYXJldFJlY3QoTm9kZSosIGJv b2wgY2FyZXRSZWN0Q2hhbmdlZCA9IGZhbHNlKTsKICAgICB2b2lkIGNsZWFyQ2FyZXRSZWN0KCk7 CiAgICAgYm9vbCB1cGRhdGVDYXJldFJlY3QoRG9jdW1lbnQqLCBjb25zdCBWaXNpYmxlUG9zaXRp b24mIGNhcmV0UG9zaXRpb24pOwotICAgIExheW91dFJlY3QgYWJzb2x1dGVCb3VuZHNGb3JMb2Nh bFJlY3QoTm9kZSosIGNvbnN0IExheW91dFJlY3QmKSBjb25zdDsKLSAgICBMYXlvdXRSZWN0IGNh cmV0UmVwYWludFJlY3QoTm9kZSopIGNvbnN0OworICAgIEludFJlY3QgYWJzb2x1dGVCb3VuZHNG b3JMb2NhbFJlY3QoTm9kZSosIGNvbnN0IExheW91dFJlY3QmKSBjb25zdDsKKyAgICBJbnRSZWN0 IGNhcmV0UmVwYWludFJlY3QoTm9kZSopIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkUmVwYWludENh cmV0KGNvbnN0IFJlbmRlclZpZXcqLCBib29sIGlzQ29udGVudEVkaXRhYmxlKSBjb25zdDsKICAg ICB2b2lkIHBhaW50Q2FyZXQoTm9kZSosIEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IExheW91dFBv aW50JiwgY29uc3QgTGF5b3V0UmVjdCYgY2xpcFJlY3QpIGNvbnN0OwogICAgIFJlbmRlck9iamVj dCogY2FyZXRSZW5kZXJlcihOb2RlKikgY29uc3Q7CkBAIC0xODAsNyArMTgwLDcgQEAgcHVibGlj OgogICAgIExheW91dFJlY3QgbG9jYWxDYXJldFJlY3QoKTsKIAogICAgIC8vIEJvdW5kcyBvZiAo cG9zc2libHkgdHJhbnNmb3JtZWQpIGNhcmV0IGluIGFic29sdXRlIGNvb3JkcwotICAgIExheW91 dFJlY3QgYWJzb2x1dGVDYXJldEJvdW5kcygpOworICAgIEludFJlY3QgYWJzb2x1dGVDYXJldEJv dW5kcygpOwogICAgIHZvaWQgc2V0Q2FyZXRSZWN0TmVlZHNVcGRhdGUoKSB7IENhcmV0QmFzZTo6 c2V0Q2FyZXRSZWN0TmVlZHNVcGRhdGUoKTsgfQogCiAgICAgdm9pZCB3aWxsQmVNb2RpZmllZChF QWx0ZXJhdGlvbiwgU2VsZWN0aW9uRGlyZWN0aW9uKTsKQEAgLTI5NSw4ICsyOTUsOCBAQCBwcml2 YXRlOgogICAgIFJlZlB0cjxFZGl0aW5nU3R5bGU+IG1fdHlwaW5nU3R5bGU7CiAKICAgICBUaW1l cjxGcmFtZVNlbGVjdGlvbj4gbV9jYXJldEJsaW5rVGltZXI7Ci0gICAgTGF5b3V0UmVjdCBtX2Fi c0NhcmV0Qm91bmRzOyAvLyBhYnNvbHV0ZSBib3VuZGluZyByZWN0IGZvciB0aGUgY2FyZXQKLSAg ICBMYXlvdXRSZWN0IG1fYWJzb2x1dGVDYXJldFJlcGFpbnRCb3VuZHM7CisgICAgSW50UmVjdCBt X2Fic0NhcmV0Qm91bmRzOyAvLyBhYnNvbHV0ZSBib3VuZGluZyByZWN0IGZvciB0aGUgY2FyZXQK KyAgICBJbnRSZWN0IG1fYWJzb2x1dGVDYXJldFJlcGFpbnRCb3VuZHM7CiAgICAgYm9vbCBtX2Fi c0NhcmV0Qm91bmRzRGlydHkgOiAxOwogICAgIGJvb2wgbV9jYXJldFBhaW50IDogMTsKICAgICBi b29sIG1faXNDYXJldEJsaW5raW5nU3VzcGVuZGVkIDogMTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvbWFjL0ZyYW1lU2VsZWN0aW9uTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvbWFjL0ZyYW1lU2VsZWN0aW9uTWFjLm1tCShyZXZpc2lvbiAxMTE1MTgp CisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9GcmFtZVNlbGVjdGlvbk1hYy5tbQkod29y a2luZyBjb3B5KQpAQCAtNjMsOCArNjMsOCBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjpub3RpZnlB Y2Nlc3NpYmlsaXR5CiAgICAgaWYgKCFmcmFtZVZpZXcpCiAgICAgICAgIHJldHVybjsKIAotICAg IExheW91dFJlY3Qgc2VsZWN0aW9uUmVjdCA9IGFic29sdXRlQ2FyZXRCb3VuZHMoKTsKLSAgICBM YXlvdXRSZWN0IHZpZXdSZWN0ID0gcmVuZGVyVmlldy0+dmlld1JlY3QoKTsKKyAgICBJbnRSZWN0 IHNlbGVjdGlvblJlY3QgPSBhYnNvbHV0ZUNhcmV0Qm91bmRzKCk7CisgICAgSW50UmVjdCB2aWV3 UmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3QocmVuZGVyVmlldy0+dmlld1JlY3QoKSk7CiAKICAg ICBzZWxlY3Rpb25SZWN0ID0gZnJhbWVWaWV3LT5jb250ZW50c1RvU2NyZWVuKHNlbGVjdGlvblJl Y3QpOwogICAgIHZpZXdSZWN0ID0gZnJhbWVWaWV3LT5jb250ZW50c1RvU2NyZWVuKHZpZXdSZWN0 KTsK 133236 2012-03-22 05:52:48 -0700 2012-03-22 07:14:29 -0700 Patch for landing bug-81754-20120322135246.patch text/plain 7903 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTY2OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTAzLTIyICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGUgTGF5b3V0VW5p dCB1c2FnZSBpbiBGcmFtZVNlbGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODE3NTQKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl bC4KKworICAgICAgICBGcmFtZVNlbGVjdGlvbiBzdG9yZXMgaXRzIGNhcmV0IGFuZCByZXBhaW50 IGJvdW5kcyBpbiBhYnNvbHV0ZSBjb29yZGluYXRlcy4gQWJzb2x1dGUgY29vcmRpbmF0ZXMKKyAg ICAgICAgd2UgdHJlYXQgYXMgcGl4ZWwgdmFsdWVzLCBzbyB0aGlzIHBhdGNoIGNoYW5nZXMgdGhl c2UgdmFsdWVzIHRvIGludGVnZXJzLiBTdWItcGl4ZWwgcHJlY2lzaW9uCisgICAgICAgIHdpbGwg c3RpbGwgYmUgdXNlZCB3aGVuIHRoZXNlIGNvb3JkaW5hdGVzIGFyZSBwYXNzZWQgZG93biBhbmQg dXNlZCBsb2NhbGx5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2 aW9yLgorCisgICAgICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjphYnNvbHV0ZUNhcmV0WSk6IFVzZXMgYWJzb2x1dGUgY29vcmRpbmF0ZXMsIHdoaWNo IGFyZSBpbnRzLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246Om1vZGlmeSk6IFVz ZXMgYWJzb2x1dGUgY29vcmRpbmF0ZXMgdG8gaGFuZGxlIHZlcnRpY2FsIHNlbGVjdGlvbgorICAg ICAgICBtb2RpZmljYXRpb24uIFN1Yi1waXhlbCBwcmVjaXNpb24gd2lsbCBiZSB1c2VkIHdoZW4g dGhlc2UgdmFsdWVzIGFyZSBjb252ZXJ0ZWQgdG8gbG9jYWwgb25lcy4KKyAgICAgICAgKFdlYkNv cmU6OkNhcmV0QmFzZTo6YWJzb2x1dGVCb3VuZHNGb3JMb2NhbFJlY3QpOiBBYnNvbHV0ZSBjb29y ZGluYXRlcyAtPiBpbnRzLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OmFic29s dXRlQ2FyZXRCb3VuZHMpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNhcmV0QmFzZTo6Y2Fy ZXRSZXBhaW50UmVjdCk6IFRoZSBjYXJldCByZXBhaW50IHJlY3QgaXMgc3RvcmVkIGluIGFic29s dXRlIGNvb3JkaW5hdGVzLgorICAgICAgICBSZXZlcnRpbmcgdGhlIHZhbHVlcyB0byBpbnRzLgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OnJlY29tcHV0ZUNhcmV0UmVjdCk6IERp dHRvLgorICAgICAgICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaDoKKyAgICAgICAgKEZyYW1l U2VsZWN0aW9uKToKKyAgICAgICAgKiBlZGl0aW5nL21hYy9GcmFtZVNlbGVjdGlvbk1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjpub3RpZnlBY2Nlc3NpYmlsaXR5Rm9y U2VsZWN0aW9uQ2hhbmdlKTogU3dpdGNoaW5nIHRvIHN0b3JlIGFic29sdXRlCisgICAgICAgIGNv b3JkaW5hdGVzIGFzIGludGVnZXJzLgorCiAyMDEyLTAzLTIyICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBFeHBhbmQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lOjpjb250cm9sQ2xpcFJlY3QoKSB0byBjb250YWluIGNvbnRlbnRSZWN0KCkuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAkocmV2aXNpb24gMTExNjY4 KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTk4Nyw5ICs5ODcsOSBAQCBib29sIEZyYW1lU2VsZWN0aW9uOjptb2RpZnkoRUFs dGVyYXRpb24gCiB9CiAKIC8vIEZJWE1FOiBNYXliZSBiYXNlbGluZSB3b3VsZCBiZSBiZXR0ZXI/ Ci1zdGF0aWMgYm9vbCBhYnNvbHV0ZUNhcmV0WShjb25zdCBWaXNpYmxlUG9zaXRpb24gJmMsIExh eW91dFVuaXQgJnkpCitzdGF0aWMgYm9vbCBhYnNvbHV0ZUNhcmV0WShjb25zdCBWaXNpYmxlUG9z aXRpb24gJmMsIGludCAmeSkKIHsKLSAgICBMYXlvdXRSZWN0IHJlY3QgPSBjLmFic29sdXRlQ2Fy ZXRCb3VuZHMoKTsKKyAgICBJbnRSZWN0IHJlY3QgPSBjLmFic29sdXRlQ2FyZXRCb3VuZHMoKTsK ICAgICBpZiAocmVjdC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB5ID0g cmVjdC55KCkgKyByZWN0LmhlaWdodCgpIC8gMjsKQEAgLTEwMjgsMTIgKzEwMjgsMTIgQEAgYm9v bCBGcmFtZVNlbGVjdGlvbjo6bW9kaWZ5KEVBbHRlcmF0aW9uIAogICAgICAgICBicmVhazsKICAg ICB9CiAKLSAgICBMYXlvdXRVbml0IHN0YXJ0WTsKKyAgICBpbnQgc3RhcnRZOwogICAgIGlmICgh YWJzb2x1dGVDYXJldFkocG9zLCBzdGFydFkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg aWYgKGRpcmVjdGlvbiA9PSBEaXJlY3Rpb25VcCkKICAgICAgICAgc3RhcnRZID0gLXN0YXJ0WTsK LSAgICBMYXlvdXRVbml0IGxhc3RZID0gc3RhcnRZOworICAgIGludCBsYXN0WSA9IHN0YXJ0WTsK IAogICAgIFZpc2libGVQb3NpdGlvbiByZXN1bHQ7CiAgICAgVmlzaWJsZVBvc2l0aW9uIG5leHQ7 CkBAIC0xMDQ1LDEyICsxMDQ1LDEyIEBAIGJvb2wgRnJhbWVTZWxlY3Rpb246Om1vZGlmeShFQWx0 ZXJhdGlvbiAKIAogICAgICAgICBpZiAobmV4dC5pc051bGwoKSB8fCBuZXh0ID09IHApCiAgICAg ICAgICAgICBicmVhazsKLSAgICAgICAgTGF5b3V0VW5pdCBuZXh0WTsKKyAgICAgICAgaW50IG5l eHRZOwogICAgICAgICBpZiAoIWFic29sdXRlQ2FyZXRZKG5leHQsIG5leHRZKSkKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBpZiAoZGlyZWN0aW9uID09IERpcmVjdGlvblVwKQogICAgICAg ICAgICAgbmV4dFkgPSAtbmV4dFk7Ci0gICAgICAgIGlmIChuZXh0WSAtIHN0YXJ0WSA+IHN0YXRp Y19jYXN0PExheW91dFVuaXQ+KHZlcnRpY2FsRGlzdGFuY2UpKQorICAgICAgICBpZiAobmV4dFkg LSBzdGFydFkgPiBzdGF0aWNfY2FzdDxpbnQ+KHZlcnRpY2FsRGlzdGFuY2UpKQogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGlmIChuZXh0WSA+PSBsYXN0WSkgewogICAgICAgICAgICAgbGFz dFkgPSBuZXh0WTsKQEAgLTEyNDcsMTEgKzEyNDcsMTEgQEAgTGF5b3V0UmVjdCBGcmFtZVNlbGVj dGlvbjo6bG9jYWxDYXJldFJlYwogICAgIHJldHVybiBsb2NhbENhcmV0UmVjdFdpdGhvdXRVcGRh dGUoKTsKIH0KIAotTGF5b3V0UmVjdCBDYXJldEJhc2U6OmFic29sdXRlQm91bmRzRm9yTG9jYWxS ZWN0KE5vZGUqIG5vZGUsIGNvbnN0IExheW91dFJlY3QmIHJlY3QpIGNvbnN0CitJbnRSZWN0IENh cmV0QmFzZTo6YWJzb2x1dGVCb3VuZHNGb3JMb2NhbFJlY3QoTm9kZSogbm9kZSwgY29uc3QgTGF5 b3V0UmVjdCYgcmVjdCkgY29uc3QKIHsKICAgICBSZW5kZXJPYmplY3QqIGNhcmV0UGFpbnRlciA9 IGNhcmV0UmVuZGVyZXIobm9kZSk7CiAgICAgaWYgKCFjYXJldFBhaW50ZXIpCi0gICAgICAgIHJl dHVybiBMYXlvdXRSZWN0KCk7CisgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CiAgICAgCiAgICAg TGF5b3V0UmVjdCBsb2NhbFJlY3QocmVjdCk7CiAgICAgaWYgKGNhcmV0UGFpbnRlci0+aXNCb3go KSkKQEAgLTEyNTksNyArMTI1OSw3IEBAIExheW91dFJlY3QgQ2FyZXRCYXNlOjphYnNvbHV0ZUJv dW5kc0ZvckwKICAgICByZXR1cm4gY2FyZXRQYWludGVyLT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZs b2F0UmVjdChsb2NhbFJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwogfQogCi1MYXlvdXRS ZWN0IEZyYW1lU2VsZWN0aW9uOjphYnNvbHV0ZUNhcmV0Qm91bmRzKCkKK0ludFJlY3QgRnJhbWVT ZWxlY3Rpb246OmFic29sdXRlQ2FyZXRCb3VuZHMoKQogewogICAgIHJlY29tcHV0ZUNhcmV0UmVj dCgpOwogICAgIHJldHVybiBtX2Fic0NhcmV0Qm91bmRzOwpAQCAtMTI3NSw3ICsxMjc1LDcgQEAg c3RhdGljIExheW91dFJlY3QgcmVwYWludFJlY3RGb3JDYXJldChMYQogICAgIHJldHVybiBjYXJl dDsKIH0KIAotTGF5b3V0UmVjdCBDYXJldEJhc2U6OmNhcmV0UmVwYWludFJlY3QoTm9kZSogbm9k ZSkgY29uc3QKK0ludFJlY3QgQ2FyZXRCYXNlOjpjYXJldFJlcGFpbnRSZWN0KE5vZGUqIG5vZGUp IGNvbnN0CiB7CiAgICAgcmV0dXJuIGFic29sdXRlQm91bmRzRm9yTG9jYWxSZWN0KG5vZGUsIHJl cGFpbnRSZWN0Rm9yQ2FyZXQobG9jYWxDYXJldFJlY3RXaXRob3V0VXBkYXRlKCkpKTsKIH0KQEAg LTEyOTcsNyArMTI5Nyw3IEBAIGJvb2wgRnJhbWVTZWxlY3Rpb246OnJlY29tcHV0ZUNhcmV0UmVj dCgKICAgICBpZiAob2xkUmVjdCA9PSBuZXdSZWN0ICYmICFtX2Fic0NhcmV0Qm91bmRzRGlydHkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIExheW91dFJlY3Qgb2xkQWJzQ2FyZXRCb3Vu ZHMgPSBtX2Fic0NhcmV0Qm91bmRzOworICAgIEludFJlY3Qgb2xkQWJzQ2FyZXRCb3VuZHMgPSBt X2Fic0NhcmV0Qm91bmRzOwogICAgIC8vIEZJWE1FOiBSZW5hbWUgbV9jYXJldFJlY3QgdG8gbV9s b2NhbENhcmV0UmVjdC4KICAgICBtX2Fic0NhcmV0Qm91bmRzID0gYWJzb2x1dGVCb3VuZHNGb3JM b2NhbFJlY3QobV9zZWxlY3Rpb24uc3RhcnQoKS5kZXByZWNhdGVkTm9kZSgpLCBsb2NhbENhcmV0 UmVjdFdpdGhvdXRVcGRhdGUoKSk7CiAgICAgbV9hYnNDYXJldEJvdW5kc0RpcnR5ID0gZmFsc2U7 CkBAIC0xMzA2LDcgKzEzMDYsNyBAQCBib29sIEZyYW1lU2VsZWN0aW9uOjpyZWNvbXB1dGVDYXJl dFJlY3QoCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogI2lmIEVOQUJMRShURVhUX0NBUkVUKQot ICAgIExheW91dFJlY3Qgb2xkQWJzb2x1dGVDYXJldFJlcGFpbnRCb3VuZHMgPSBtX2Fic29sdXRl Q2FyZXRSZXBhaW50Qm91bmRzOworICAgIEludFJlY3Qgb2xkQWJzb2x1dGVDYXJldFJlcGFpbnRC b3VuZHMgPSBtX2Fic29sdXRlQ2FyZXRSZXBhaW50Qm91bmRzOwogI2VuZGlmCiAKICAgICAvLyBX ZSBiZWxpZXZlIHRoYXQgd2UgbmVlZCB0byBpbmZsYXRlIHRoZSBsb2NhbCByZWN0IGJlZm9yZSB0 cmFuc2Zvcm1pbmcgaXQgdG8gb2J0YWluIHRoZSByZXBhaW50IGJvdW5kcy4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgJKHJldmlzaW9uIDExMTY2OCkKKysrIFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAt NTksOCArNTksOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBpbnZhbGlkYXRlQ2FyZXRSZWN0KE5v ZGUqLCBib29sIGNhcmV0UmVjdENoYW5nZWQgPSBmYWxzZSk7CiAgICAgdm9pZCBjbGVhckNhcmV0 UmVjdCgpOwogICAgIGJvb2wgdXBkYXRlQ2FyZXRSZWN0KERvY3VtZW50KiwgY29uc3QgVmlzaWJs ZVBvc2l0aW9uJiBjYXJldFBvc2l0aW9uKTsKLSAgICBMYXlvdXRSZWN0IGFic29sdXRlQm91bmRz Rm9yTG9jYWxSZWN0KE5vZGUqLCBjb25zdCBMYXlvdXRSZWN0JikgY29uc3Q7Ci0gICAgTGF5b3V0 UmVjdCBjYXJldFJlcGFpbnRSZWN0KE5vZGUqKSBjb25zdDsKKyAgICBJbnRSZWN0IGFic29sdXRl Qm91bmRzRm9yTG9jYWxSZWN0KE5vZGUqLCBjb25zdCBMYXlvdXRSZWN0JikgY29uc3Q7CisgICAg SW50UmVjdCBjYXJldFJlcGFpbnRSZWN0KE5vZGUqKSBjb25zdDsKICAgICBib29sIHNob3VsZFJl cGFpbnRDYXJldChjb25zdCBSZW5kZXJWaWV3KiwgYm9vbCBpc0NvbnRlbnRFZGl0YWJsZSkgY29u c3Q7CiAgICAgdm9pZCBwYWludENhcmV0KE5vZGUqLCBHcmFwaGljc0NvbnRleHQqLCBjb25zdCBM YXlvdXRQb2ludCYsIGNvbnN0IExheW91dFJlY3QmIGNsaXBSZWN0KSBjb25zdDsKICAgICBSZW5k ZXJPYmplY3QqIGNhcmV0UmVuZGVyZXIoTm9kZSopIGNvbnN0OwpAQCAtMTgwLDcgKzE4MCw3IEBA IHB1YmxpYzoKICAgICBMYXlvdXRSZWN0IGxvY2FsQ2FyZXRSZWN0KCk7CiAKICAgICAvLyBCb3Vu ZHMgb2YgKHBvc3NpYmx5IHRyYW5zZm9ybWVkKSBjYXJldCBpbiBhYnNvbHV0ZSBjb29yZHMKLSAg ICBMYXlvdXRSZWN0IGFic29sdXRlQ2FyZXRCb3VuZHMoKTsKKyAgICBJbnRSZWN0IGFic29sdXRl Q2FyZXRCb3VuZHMoKTsKICAgICB2b2lkIHNldENhcmV0UmVjdE5lZWRzVXBkYXRlKCkgeyBDYXJl dEJhc2U6OnNldENhcmV0UmVjdE5lZWRzVXBkYXRlKCk7IH0KIAogICAgIHZvaWQgd2lsbEJlTW9k aWZpZWQoRUFsdGVyYXRpb24sIFNlbGVjdGlvbkRpcmVjdGlvbik7CkBAIC0yOTUsOCArMjk1LDEw IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPEVkaXRpbmdTdHlsZT4gbV90eXBpbmdTdHlsZTsKIAog ICAgIFRpbWVyPEZyYW1lU2VsZWN0aW9uPiBtX2NhcmV0QmxpbmtUaW1lcjsKLSAgICBMYXlvdXRS ZWN0IG1fYWJzQ2FyZXRCb3VuZHM7IC8vIGFic29sdXRlIGJvdW5kaW5nIHJlY3QgZm9yIHRoZSBj YXJldAotICAgIExheW91dFJlY3QgbV9hYnNvbHV0ZUNhcmV0UmVwYWludEJvdW5kczsKKyAgICAv LyBUaGUgcGFpbnRlZCBib3VuZHMgb2YgdGhlIGNhcmV0IGluIGFic29sdXRlIGNvb3JkaW5hdGVz CisgICAgSW50UmVjdCBtX2Fic0NhcmV0Qm91bmRzOworICAgIC8vIFNpbWlsYXIgdG8gYWJvdmUs IGJ1dCBpbmZsYXRlZCB0byBlbnN1cmUgcHJvcGVyIHJlcGFpbnQgKHNlZSBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwODYpCisgICAgSW50UmVjdCBtX2Fic29sdXRl Q2FyZXRSZXBhaW50Qm91bmRzOwogICAgIGJvb2wgbV9hYnNDYXJldEJvdW5kc0RpcnR5IDogMTsK ICAgICBib29sIG1fY2FyZXRQYWludCA6IDE7CiAgICAgYm9vbCBtX2lzQ2FyZXRCbGlua2luZ1N1 c3BlbmRlZCA6IDE7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9GcmFtZVNlbGVj dGlvbk1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9GcmFt ZVNlbGVjdGlvbk1hYy5tbQkocmV2aXNpb24gMTExNjY4KQorKysgU291cmNlL1dlYkNvcmUvZWRp dGluZy9tYWMvRnJhbWVTZWxlY3Rpb25NYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTYzLDggKzYz LDggQEAgdm9pZCBGcmFtZVNlbGVjdGlvbjo6bm90aWZ5QWNjZXNzaWJpbGl0eQogICAgIGlmICgh ZnJhbWVWaWV3KQogICAgICAgICByZXR1cm47CiAKLSAgICBMYXlvdXRSZWN0IHNlbGVjdGlvblJl Y3QgPSBhYnNvbHV0ZUNhcmV0Qm91bmRzKCk7Ci0gICAgTGF5b3V0UmVjdCB2aWV3UmVjdCA9IHJl bmRlclZpZXctPnZpZXdSZWN0KCk7CisgICAgSW50UmVjdCBzZWxlY3Rpb25SZWN0ID0gYWJzb2x1 dGVDYXJldEJvdW5kcygpOworICAgIEludFJlY3Qgdmlld1JlY3QgPSBwaXhlbFNuYXBwZWRJbnRS ZWN0KHJlbmRlclZpZXctPnZpZXdSZWN0KCkpOwogCiAgICAgc2VsZWN0aW9uUmVjdCA9IGZyYW1l Vmlldy0+Y29udGVudHNUb1NjcmVlbihzZWxlY3Rpb25SZWN0KTsKICAgICB2aWV3UmVjdCA9IGZy YW1lVmlldy0+Y29udGVudHNUb1NjcmVlbih2aWV3UmVjdCk7Cg==