71389 2011-11-02 13:08:32 -0700 Switch RenderText to new layout types 2011-11-02 15:54:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae eric leviw webkit.review.bot oldest_to_newest 494839 0 eae 2011-11-02 13:08:32 -0700 Switch RenderText to layout abstraction. 494848 1 113359 eae 2011-11-02 13:17:17 -0700 Created attachment 113359 Patch 494879 2 113372 eae 2011-11-02 13:53:42 -0700 Created attachment 113372 Patch 494917 3 113380 eae 2011-11-02 14:35:06 -0700 Created attachment 113380 Patch 494918 4 eae 2011-11-02 14:35:23 -0700 Updated ChangeLog post-merge. 494995 5 113380 webkit.review.bot 2011-11-02 15:53:56 -0700 Comment on attachment 113380 Patch Clearing flags on attachment: 113380 Committed r99113: <http://trac.webkit.org/changeset/99113> 494996 6 webkit.review.bot 2011-11-02 15:54:00 -0700 All reviewed patches have been landed. Closing bug. 113359 2011-11-02 13:17:17 -0700 2011-11-02 13:37:07 -0700 Patch bug-71389-20111102131716.patch text/plain 11411 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MDg5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMTEtMDIgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJUZXh0IHRv IG5ldyBsYXlvdXQgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTcxMzg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU3dpdGNoIFJlbmRlclRleHQgbWV0aG9kcyAoYW5kIG92ZXJyaWRlbiBtZXRob2Rz IGluIHJlbGF0ZWQgY2xhc3NlcykgdG8KKyAgICAgICAgTGF5b3V0UmVjdC9MYXlvdXRVbml0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojpsb2NhbENhcmV0UmVjdCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICBDaGFuZ2UgbG9j YWxDYXJldFJlY3QgdG8gcmV0dXJuIGEgTGF5b3V0UmVjdC4KKyAgICAgICAgCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6 YWJzb2x1dGVSZWN0c0ZvclJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6Omxv Y2FsQ2FyZXRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmxpbmVzQm91bmRp bmdCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6bGluZXNWaXN1YWxPdmVyZmxv d0JvdW5kaW5nQm94KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5oOgorICAgICAg ICBDaGFuZ2UgUmVuZGVyVGV4dCB0byBleHBvc2UgaXRzIGJvdW5kaW5nIGJveCwgc2VsZWN0aW9u IGFuZCBjYXJldCByZWN0cworICAgICAgICBhcyBMYXlvdXRSZWN0cy4KKyAgICAgICAgCisgICAg ICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclNWR0lubGluZVRleHQ6OmxvY2FsQ2FyZXRSZWN0KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZVRleHQuaDoKKyAgICAgICAgQ2hhbmdlIGxvY2Fs Q2FyZXRSZWN0IHRvIHJldHVybiBhIExheW91dFJlY3QuCisKIDIwMTEtMTEtMDIgIFRvbW15IFdp ZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAgTWVkaWFTdHJlYW1SZWdp c3RyeSBzaG91bGQgaG9sZCByZWZlcmVuY2VzIHRvIE1lZGlhU3RyZWFtRGVzY3JpcHRvciByYXRo ZXIgdGhhbiBNZWRpYVN0cmVhbQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAJKHJldmlzaW9uIDk4ODYxKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwODEsMTIgKzIwODEsMTIgQEAg TGF5b3V0U2l6ZSBSZW5kZXJPYmplY3Q6Om9mZnNldEZyb21BbmNlcwogICAgIHJldHVybiBvZmZz ZXQ7CiB9CiAKLUludFJlY3QgUmVuZGVyT2JqZWN0Ojpsb2NhbENhcmV0UmVjdChJbmxpbmVCb3gq LCBpbnQsIGludCogZXh0cmFXaWR0aFRvRW5kT2ZMaW5lKQorTGF5b3V0UmVjdCBSZW5kZXJPYmpl Y3Q6OmxvY2FsQ2FyZXRSZWN0KElubGluZUJveCosIGludCwgTGF5b3V0VW5pdCogZXh0cmFXaWR0 aFRvRW5kT2ZMaW5lKQogewogICAgIGlmIChleHRyYVdpZHRoVG9FbmRPZkxpbmUpCiAgICAgICAg ICpleHRyYVdpZHRoVG9FbmRPZkxpbmUgPSAwOwogCi0gICAgcmV0dXJuIEludFJlY3QoKTsKKyAg ICByZXR1cm4gTGF5b3V0UmVjdCgpOwogfQogCiBSZW5kZXJWaWV3KiBSZW5kZXJPYmplY3Q6OnZp ZXcoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAko cmV2aXNpb24gOTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmgJKHdvcmtpbmcgY29weSkKQEAgLTc4MCw3ICs3ODAsNyBAQCBwdWJsaWM6CiAgICAgICogQHBh cmFtIGV4dHJhV2lkdGhUb0VuZE9mTGluZSBvcHRpb25hbCBvdXQgYXJnIHRvIGdpdmUgZXh0cmEg d2lkdGggdG8gZW5kIG9mIGxpbmUgLQogICAgICAqIHVzZWZ1bCBmb3IgY2hhcmFjdGVyIHJhbmdl IHJlY3QgY29tcHV0YXRpb25zCiAgICAgICovCi0gICAgdmlydHVhbCBJbnRSZWN0IGxvY2FsQ2Fy ZXRSZWN0KElubGluZUJveCosIGludCBjYXJldE9mZnNldCwgaW50KiBleHRyYVdpZHRoVG9FbmRP ZkxpbmUgPSAwKTsKKyAgICB2aXJ0dWFsIExheW91dFJlY3QgbG9jYWxDYXJldFJlY3QoSW5saW5l Qm94KiwgaW50IGNhcmV0T2Zmc2V0LCBMYXlvdXRVbml0KiBleHRyYVdpZHRoVG9FbmRPZkxpbmUg PSAwKTsKIAogICAgIGJvb2wgaXNNYXJnaW5CZWZvcmVRdWlyaygpIGNvbnN0IHsgcmV0dXJuIG1f bWFyZ2luQmVmb3JlUXVpcms7IH0KICAgICBib29sIGlzTWFyZ2luQWZ0ZXJRdWlyaygpIGNvbnN0 IHsgcmV0dXJuIG1fbWFyZ2luQWZ0ZXJRdWlyazsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUZXh0LmNwcAkocmV2aXNpb24gOTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyOCw3ICszMjgsNyBA QCBzdGF0aWMgRmxvYXRSZWN0IGxvY2FsUXVhZEZvclRleHRCb3goSW5sCiAgICAgcmV0dXJuIEZs b2F0UmVjdCgpOwogfQogCi12b2lkIFJlbmRlclRleHQ6OmFic29sdXRlUmVjdHNGb3JSYW5nZShW ZWN0b3I8SW50UmVjdD4mIHJlY3RzLCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kLCBib29s IHVzZVNlbGVjdGlvbkhlaWdodCwgYm9vbCogd2FzRml4ZWQpCit2b2lkIFJlbmRlclRleHQ6OmFi c29sdXRlUmVjdHNGb3JSYW5nZShWZWN0b3I8TGF5b3V0UmVjdD4mIHJlY3RzLCB1bnNpZ25lZCBz dGFydCwgdW5zaWduZWQgZW5kLCBib29sIHVzZVNlbGVjdGlvbkhlaWdodCwgYm9vbCogd2FzRml4 ZWQpCiB7CiAgICAgLy8gV29yayBhcm91bmQgc2lnbmVkL3Vuc2lnbmVkIGlzc3Vlcy4gVGhpcyBm dW5jdGlvbiB0YWtlcyB1bnNpZ25lZHMsIGFuZCBpcyBvZnRlbiBwYXNzZWQgVUlOVF9NQVgKICAg ICAvLyB0byBtZWFuICJhbGwgdGhlIHdheSB0byB0aGUgZW5kIi4gSW5saW5lVGV4dEJveCBjb29y ZGluYXRlcyBhcmUgdW5zaWduZWRzLCBzbyBjaGFuZ2luZyB0aGlzIApAQCAtNjM3LDE0ICs2Mzcs MTQgQEAgVmlzaWJsZVBvc2l0aW9uIFJlbmRlclRleHQ6OnBvc2l0aW9uRm9yUAogICAgIHJldHVy biBjcmVhdGVWaXNpYmxlUG9zaXRpb24obGFzdEJveEFib3ZlID8gbGFzdEJveEFib3ZlLT5zdGFy dCgpICsgbGFzdEJveEFib3ZlLT5sZW4oKSA6IDAsIERPV05TVFJFQU0pOwogfQogCi1JbnRSZWN0 IFJlbmRlclRleHQ6OmxvY2FsQ2FyZXRSZWN0KElubGluZUJveCogaW5saW5lQm94LCBpbnQgY2Fy ZXRPZmZzZXQsIGludCogZXh0cmFXaWR0aFRvRW5kT2ZMaW5lKQorTGF5b3V0UmVjdCBSZW5kZXJU ZXh0Ojpsb2NhbENhcmV0UmVjdChJbmxpbmVCb3gqIGlubGluZUJveCwgaW50IGNhcmV0T2Zmc2V0 LCBMYXlvdXRVbml0KiBleHRyYVdpZHRoVG9FbmRPZkxpbmUpCiB7CiAgICAgaWYgKCFpbmxpbmVC b3gpCi0gICAgICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgICAgIHJldHVybiBMYXlvdXRSZWN0 KCk7CiAKICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGluZVRleHRCb3goKSk7CiAgICAgaWYg KCFpbmxpbmVCb3gtPmlzSW5saW5lVGV4dEJveCgpKQotICAgICAgICByZXR1cm4gSW50UmVjdCgp OworICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOwogCiAgICAgSW5saW5lVGV4dEJveCogYm94 ID0gdG9JbmxpbmVUZXh0Qm94KGlubGluZUJveCk7CiAKQEAgLTE0NjksOSArMTQ2OSw5IEBAIGZs b2F0IFJlbmRlclRleHQ6OndpZHRoKHVuc2lnbmVkIGZyb20sIHUKICAgICByZXR1cm4gdzsKIH0K IAotSW50UmVjdCBSZW5kZXJUZXh0OjpsaW5lc0JvdW5kaW5nQm94KCkgY29uc3QKK0xheW91dFJl Y3QgUmVuZGVyVGV4dDo6bGluZXNCb3VuZGluZ0JveCgpIGNvbnN0CiB7Ci0gICAgSW50UmVjdCBy ZXN1bHQ7CisgICAgTGF5b3V0UmVjdCByZXN1bHQ7CiAgICAgCiAgICAgQVNTRVJUKCFmaXJzdFRl eHRCb3goKSA9PSAhbGFzdFRleHRCb3goKSk7ICAvLyBFaXRoZXIgYm90aCBhcmUgbnVsbCBvciBi b3RoIGV4aXN0LgogICAgIGlmIChmaXJzdFRleHRCb3goKSAmJiBsYXN0VGV4dEJveCgpKSB7CkBA IC0xNDk3LDI0ICsxNDk3LDI0IEBAIEludFJlY3QgUmVuZGVyVGV4dDo6bGluZXNCb3VuZGluZ0Jv eCgpIGMKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1JbnRSZWN0IFJlbmRlclRleHQ6OmxpbmVz VmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0JveCgpIGNvbnN0CitMYXlvdXRSZWN0IFJlbmRlclRleHQ6 OmxpbmVzVmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0JveCgpIGNvbnN0CiB7CiAgICAgaWYgKCFmaXJz dFRleHRCb3goKSkKLSAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICAgICAgcmV0dXJuIExh eW91dFJlY3QoKTsKIAogICAgIC8vIFJldHVybiB0aGUgd2lkdGggb2YgdGhlIG1pbmltYWwgbGVm dCBzaWRlIGFuZCB0aGUgbWF4aW1hbCByaWdodCBzaWRlLgotICAgIGludCBsb2dpY2FsTGVmdFNp ZGUgPSBudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKTsKLSAgICBpbnQgbG9naWNhbFJpZ2h0U2lk ZSA9IG51bWVyaWNfbGltaXRzPGludD46Om1pbigpOworICAgIExheW91dFVuaXQgbG9naWNhbExl ZnRTaWRlID0gbnVtZXJpY19saW1pdHM8TGF5b3V0VW5pdD46Om1heCgpOworICAgIExheW91dFVu aXQgbG9naWNhbFJpZ2h0U2lkZSA9IG51bWVyaWNfbGltaXRzPExheW91dFVuaXQ+OjptaW4oKTsK ICAgICBmb3IgKElubGluZVRleHRCb3gqIGN1cnIgPSBmaXJzdFRleHRCb3goKTsgY3VycjsgY3Vy ciA9IGN1cnItPm5leHRUZXh0Qm94KCkpIHsKICAgICAgICAgbG9naWNhbExlZnRTaWRlID0gbWlu KGxvZ2ljYWxMZWZ0U2lkZSwgY3Vyci0+bG9naWNhbExlZnRWaXN1YWxPdmVyZmxvdygpKTsKICAg ICAgICAgbG9naWNhbFJpZ2h0U2lkZSA9IG1heChsb2dpY2FsUmlnaHRTaWRlLCBjdXJyLT5sb2dp Y2FsUmlnaHRWaXN1YWxPdmVyZmxvdygpKTsKICAgICB9CiAgICAgCi0gICAgaW50IGxvZ2ljYWxU b3AgPSBmaXJzdFRleHRCb3goKS0+bG9naWNhbFRvcFZpc3VhbE92ZXJmbG93KCk7Ci0gICAgaW50 IGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxSaWdodFNpZGUgLSBsb2dpY2FsTGVmdFNpZGU7Ci0gICAg aW50IGxvZ2ljYWxIZWlnaHQgPSBsYXN0VGV4dEJveCgpLT5sb2dpY2FsQm90dG9tVmlzdWFsT3Zl cmZsb3coKSAtIGxvZ2ljYWxUb3A7CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wID0gZmlyc3RU ZXh0Qm94KCktPmxvZ2ljYWxUb3BWaXN1YWxPdmVyZmxvdygpOworICAgIExheW91dFVuaXQgbG9n aWNhbFdpZHRoID0gbG9naWNhbFJpZ2h0U2lkZSAtIGxvZ2ljYWxMZWZ0U2lkZTsKKyAgICBMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBsYXN0VGV4dEJveCgpLT5sb2dpY2FsQm90dG9tVmlzdWFs T3ZlcmZsb3coKSAtIGxvZ2ljYWxUb3A7CiAgICAgCi0gICAgSW50UmVjdCByZWN0KGxvZ2ljYWxM ZWZ0U2lkZSwgbG9naWNhbFRvcCwgbG9naWNhbFdpZHRoLCBsb2dpY2FsSGVpZ2h0KTsKKyAgICBM YXlvdXRSZWN0IHJlY3QobG9naWNhbExlZnRTaWRlLCBsb2dpY2FsVG9wLCBsb2dpY2FsV2lkdGgs IGxvZ2ljYWxIZWlnaHQpOwogICAgIGlmICghc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKSkKICAgICAgICAgcmVjdCA9IHJlY3QudHJhbnNwb3NlZFJlY3QoKTsKICAgICByZXR1cm4g cmVjdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAkocmV2aXNpb24g OTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCSh3b3JraW5n IGNvcHkpCkBAIC01NSw3ICs1NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpcnR5TGluZUJveGVz KGJvb2wgZnVsbExheW91dCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgYWJzb2x1dGVSZWN0cyhWZWN0 b3I8TGF5b3V0UmVjdD4mLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpIGNv bnN0OwotICAgIHZvaWQgYWJzb2x1dGVSZWN0c0ZvclJhbmdlKFZlY3RvcjxJbnRSZWN0PiYsIHVu c2lnbmVkIHN0YXJ0T2Zmc2V0ID0gMCwgdW5zaWduZWQgZW5kT2Zmc2V0ID0gVUlOVF9NQVgsIGJv b2wgdXNlU2VsZWN0aW9uSGVpZ2h0ID0gZmFsc2UsIGJvb2wqIHdhc0ZpeGVkID0gMCk7CisgICAg dm9pZCBhYnNvbHV0ZVJlY3RzRm9yUmFuZ2UoVmVjdG9yPExheW91dFJlY3Q+JiwgdW5zaWduZWQg c3RhcnRPZmZzZXQgPSAwLCB1bnNpZ25lZCBlbmRPZmZzZXQgPSBVSU5UX01BWCwgYm9vbCB1c2VT ZWxlY3Rpb25IZWlnaHQgPSBmYWxzZSwgYm9vbCogd2FzRml4ZWQgPSAwKTsKIAogICAgIHZpcnR1 YWwgdm9pZCBhYnNvbHV0ZVF1YWRzKFZlY3RvcjxGbG9hdFF1YWQ+JiwgYm9vbCogd2FzRml4ZWQp IGNvbnN0OwogICAgIHZvaWQgYWJzb2x1dGVRdWFkc0ZvclJhbmdlKFZlY3RvcjxGbG9hdFF1YWQ+ JiwgdW5zaWduZWQgc3RhcnRPZmZzZXQgPSAwLCB1bnNpZ25lZCBlbmRPZmZzZXQgPSBVSU5UX01B WCwgYm9vbCB1c2VTZWxlY3Rpb25IZWlnaHQgPSBmYWxzZSwgYm9vbCogd2FzRml4ZWQgPSAwKTsK QEAgLTgyLDggKzgyLDggQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxv YXQmIGJlZ2luTWF4VywgZmxvYXQmIGVuZE1heFcsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICBmbG9hdCYgbWluVywgZmxvYXQmIG1heFcsIGJvb2wmIHN0cmlwRnJvbnRTcGFjZXMpOwogCi0g ICAgdmlydHVhbCBJbnRSZWN0IGxpbmVzQm91bmRpbmdCb3goKSBjb25zdDsKLSAgICBJbnRSZWN0 IGxpbmVzVmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0JveCgpIGNvbnN0OworICAgIHZpcnR1YWwgTGF5 b3V0UmVjdCBsaW5lc0JvdW5kaW5nQm94KCkgY29uc3Q7CisgICAgTGF5b3V0UmVjdCBsaW5lc1Zp c3VhbE92ZXJmbG93Qm91bmRpbmdCb3goKSBjb25zdDsKIAogICAgIEZsb2F0UG9pbnQgZmlyc3RS dW5PcmlnaW4oKSBjb25zdDsKICAgICBmbG9hdCBmaXJzdFJ1blgoKSBjb25zdDsKQEAgLTk1LDcg Kzk1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBjYW5CZVNlbGVjdGlvbkxlYWYoKSBj b25zdCB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCB2b2lkIHNldFNlbGVjdGlvblN0YXRl KFNlbGVjdGlvblN0YXRlIHMpOwogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0 Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgYm9vbCBj bGlwVG9WaXNpYmxlQ29udGVudCA9IHRydWUpOwotICAgIHZpcnR1YWwgSW50UmVjdCBsb2NhbENh cmV0UmVjdChJbmxpbmVCb3gqLCBpbnQgY2FyZXRPZmZzZXQsIGludCogZXh0cmFXaWR0aFRvRW5k T2ZMaW5lID0gMCk7CisgICAgdmlydHVhbCBMYXlvdXRSZWN0IGxvY2FsQ2FyZXRSZWN0KElubGlu ZUJveCosIGludCBjYXJldE9mZnNldCwgTGF5b3V0VW5pdCogZXh0cmFXaWR0aFRvRW5kT2ZMaW5l ID0gMCk7CiAKICAgICB2aXJ0dWFsIExheW91dFVuaXQgbWFyZ2luTGVmdCgpIGNvbnN0IHsgcmV0 dXJuIHN0eWxlKCktPm1hcmdpbkxlZnQoKS5jYWxjTWluVmFsdWUoMCk7IH0KICAgICB2aXJ0dWFs IExheW91dFVuaXQgbWFyZ2luUmlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5tYXJnaW5S aWdodCgpLmNhbGNNaW5WYWx1ZSgwKTsgfQpAQCAtMTUwLDcgKzE1MCw3IEBAIHByaXZhdGU6CiAg ICAgLy8gY2FsbGVycyB3aXRoIGEgUmVuZGVyT2JqZWN0KiBjYW4gY29udGludWUgdG8gdXNlIGxl bmd0aCgpLgogICAgIHZpcnR1YWwgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gdGV4 dExlbmd0aCgpOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoUGFpbnRJbmZvJiwgY29uc3Qg SW50UG9pbnQmKSB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CisgICAgdmlydHVhbCB2b2lkIHBh aW50KFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50JikgeyBBU1NFUlRfTk9UX1JFQUNIRUQo KTsgfQogICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQoKSB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9 CiAgICAgdmlydHVhbCBib29sIG5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0 VGVzdFJlc3VsdCYsIGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgTGF5b3V0UG9pbnQmLCBIaXRU ZXN0QWN0aW9uKSB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyByZXR1cm4gZmFsc2U7IH0KIApJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGlu ZVRleHQuY3BwCShyZXZpc2lvbiA5ODg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNCwyNSArMTA0 LDI1IEBAIElubGluZVRleHRCb3gqIFJlbmRlclNWR0lubGluZVRleHQ6OmNyZWEKICAgICByZXR1 cm4gYm94OwogfQogCi1JbnRSZWN0IFJlbmRlclNWR0lubGluZVRleHQ6OmxvY2FsQ2FyZXRSZWN0 KElubGluZUJveCogYm94LCBpbnQgY2FyZXRPZmZzZXQsIGludCopCitMYXlvdXRSZWN0IFJlbmRl clNWR0lubGluZVRleHQ6OmxvY2FsQ2FyZXRSZWN0KElubGluZUJveCogYm94LCBpbnQgY2FyZXRP ZmZzZXQsIExheW91dFVuaXQqKQogewogICAgIGlmICghYm94LT5pc0lubGluZVRleHRCb3goKSkK LSAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICAgICAgcmV0dXJuIExheW91dFJlY3QoKTsK IAogICAgIElubGluZVRleHRCb3gqIHRleHRCb3ggPSBzdGF0aWNfY2FzdDxJbmxpbmVUZXh0Qm94 Kj4oYm94KTsKICAgICBpZiAoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGNhcmV0T2Zmc2V0KSA8IHRl eHRCb3gtPnN0YXJ0KCkgfHwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGNhcmV0T2Zmc2V0KSA+IHRl eHRCb3gtPnN0YXJ0KCkgKyB0ZXh0Qm94LT5sZW4oKSkKLSAgICAgICAgcmV0dXJuIEludFJlY3Qo KTsKKyAgICAgICAgcmV0dXJuIExheW91dFJlY3QoKTsKIAogICAgIC8vIFVzZSB0aGUgZWRnZSBv ZiB0aGUgc2VsZWN0aW9uIHJlY3QgdG8gZGV0ZXJtaW5lIHRoZSBjYXJldCByZWN0LgogICAgIGlm IChzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY2FyZXRPZmZzZXQpIDwgdGV4dEJveC0+c3RhcnQoKSAr IHRleHRCb3gtPmxlbigpKSB7CiAgICAgICAgIEludFJlY3QgcmVjdCA9IHRleHRCb3gtPmxvY2Fs U2VsZWN0aW9uUmVjdChjYXJldE9mZnNldCwgY2FyZXRPZmZzZXQgKyAxKTsKICAgICAgICAgaW50 IHggPSBib3gtPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IHJlY3QueCgpIDogcmVjdC5tYXhY KCk7Ci0gICAgICAgIHJldHVybiBJbnRSZWN0KHgsIHJlY3QueSgpLCBjYXJldFdpZHRoLCByZWN0 LmhlaWdodCgpKTsKKyAgICAgICAgcmV0dXJuIExheW91dFJlY3QoeCwgcmVjdC55KCksIGNhcmV0 V2lkdGgsIHJlY3QuaGVpZ2h0KCkpOwogICAgIH0KIAogICAgIEludFJlY3QgcmVjdCA9IHRleHRC b3gtPmxvY2FsU2VsZWN0aW9uUmVjdChjYXJldE9mZnNldCAtIDEsIGNhcmV0T2Zmc2V0KTsKICAg ICBpbnQgeCA9IGJveC0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gcmVjdC5tYXhYKCkgOiBy ZWN0LngoKTsKLSAgICByZXR1cm4gSW50UmVjdCh4LCByZWN0LnkoKSwgY2FyZXRXaWR0aCwgcmVj dC5oZWlnaHQoKSk7CisgICAgcmV0dXJuIExheW91dFJlY3QoeCwgcmVjdC55KCksIGNhcmV0V2lk dGgsIHJlY3QuaGVpZ2h0KCkpOwogfQogCiBMYXlvdXRSZWN0IFJlbmRlclNWR0lubGluZVRleHQ6 OmxpbmVzQm91bmRpbmdCb3goKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmgJKHJldmlzaW9uIDk4ODYxKQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmgJKHdvcmtp bmcgY29weSkKQEAgLTYxLDcgKzYxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaXNT VkdJbmxpbmVUZXh0KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgdmlydHVhbCBWaXNp YmxlUG9zaXRpb24gcG9zaXRpb25Gb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYpOwotICAgIHZp cnR1YWwgSW50UmVjdCBsb2NhbENhcmV0UmVjdChJbmxpbmVCb3gqLCBpbnQgY2FyZXRPZmZzZXQs IGludCogZXh0cmFXaWR0aFRvRW5kT2ZMaW5lID0gMCk7CisgICAgdmlydHVhbCBMYXlvdXRSZWN0 IGxvY2FsQ2FyZXRSZWN0KElubGluZUJveCosIGludCBjYXJldE9mZnNldCwgTGF5b3V0VW5pdCog ZXh0cmFXaWR0aFRvRW5kT2ZMaW5lID0gMCk7CiAgICAgdmlydHVhbCBMYXlvdXRSZWN0IGxpbmVz Qm91bmRpbmdCb3goKSBjb25zdDsKICAgICB2aXJ0dWFsIElubGluZVRleHRCb3gqIGNyZWF0ZVRl eHRCb3goKTsKIAo= 113372 2011-11-02 13:53:42 -0700 2011-11-02 14:35:03 -0700 Patch bug-71389-20111102135341.patch text/plain 6359 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MDkyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMTEtMDIgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJUZXh0IHRv IG5ldyBsYXlvdXQgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTcxMzg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU3dpdGNoIFJlbmRlclRleHQgbWV0aG9kcyAoYW5kIG92ZXJyaWRlbiBtZXRob2Rz IGluIHJlbGF0ZWQgY2xhc3NlcykgdG8KKyAgICAgICAgTGF5b3V0UmVjdC9MYXlvdXRVbml0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojpsb2NhbENhcmV0UmVjdCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICBDaGFuZ2UgbG9j YWxDYXJldFJlY3QgdG8gcmV0dXJuIGEgTGF5b3V0UmVjdC4KKyAgICAgICAgCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6 YWJzb2x1dGVSZWN0c0ZvclJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6Omxv Y2FsQ2FyZXRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmxpbmVzQm91bmRp bmdCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6bGluZXNWaXN1YWxPdmVyZmxv d0JvdW5kaW5nQm94KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5oOgorICAgICAg ICBDaGFuZ2UgUmVuZGVyVGV4dCB0byBleHBvc2UgaXRzIGJvdW5kaW5nIGJveCwgc2VsZWN0aW9u IGFuZCBjYXJldCByZWN0cworICAgICAgICBhcyBMYXlvdXRSZWN0cy4KKyAgICAgICAgCisgICAg ICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclNWR0lubGluZVRleHQ6OmxvY2FsQ2FyZXRSZWN0KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZVRleHQuaDoKKyAgICAgICAgQ2hhbmdlIGxvY2Fs Q2FyZXRSZWN0IHRvIHJldHVybiBhIExheW91dFJlY3QuCisKIDIwMTEtMTEtMDIgIFRvbW15IFdp ZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAgTWVkaWFTdHJlYW1SZWdp c3RyeSBzaG91bGQgaG9sZCByZWZlcmVuY2VzIHRvIE1lZGlhU3RyZWFtRGVzY3JpcHRvciByYXRo ZXIgdGhhbiBNZWRpYVN0cmVhbQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcAkocmV2aXNpb24gOTkwOTIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyOCw3ICszMjgsNyBAQCBzdGF0aWMgRmxv YXRSZWN0IGxvY2FsUXVhZEZvclRleHRCb3goSW5sCiAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOwog fQogCi12b2lkIFJlbmRlclRleHQ6OmFic29sdXRlUmVjdHNGb3JSYW5nZShWZWN0b3I8SW50UmVj dD4mIHJlY3RzLCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kLCBib29sIHVzZVNlbGVjdGlv bkhlaWdodCwgYm9vbCogd2FzRml4ZWQpCit2b2lkIFJlbmRlclRleHQ6OmFic29sdXRlUmVjdHNG b3JSYW5nZShWZWN0b3I8TGF5b3V0UmVjdD4mIHJlY3RzLCB1bnNpZ25lZCBzdGFydCwgdW5zaWdu ZWQgZW5kLCBib29sIHVzZVNlbGVjdGlvbkhlaWdodCwgYm9vbCogd2FzRml4ZWQpCiB7CiAgICAg Ly8gV29yayBhcm91bmQgc2lnbmVkL3Vuc2lnbmVkIGlzc3Vlcy4gVGhpcyBmdW5jdGlvbiB0YWtl cyB1bnNpZ25lZHMsIGFuZCBpcyBvZnRlbiBwYXNzZWQgVUlOVF9NQVgKICAgICAvLyB0byBtZWFu ICJhbGwgdGhlIHdheSB0byB0aGUgZW5kIi4gSW5saW5lVGV4dEJveCBjb29yZGluYXRlcyBhcmUg dW5zaWduZWRzLCBzbyBjaGFuZ2luZyB0aGlzIApAQCAtMTQ5NywyNCArMTQ5NywyNCBAQCBMYXlv dXRSZWN0IFJlbmRlclRleHQ6OmxpbmVzQm91bmRpbmdCb3goCiAgICAgcmV0dXJuIHJlc3VsdDsK IH0KIAotSW50UmVjdCBSZW5kZXJUZXh0OjpsaW5lc1Zpc3VhbE92ZXJmbG93Qm91bmRpbmdCb3go KSBjb25zdAorTGF5b3V0UmVjdCBSZW5kZXJUZXh0OjpsaW5lc1Zpc3VhbE92ZXJmbG93Qm91bmRp bmdCb3goKSBjb25zdAogewogICAgIGlmICghZmlyc3RUZXh0Qm94KCkpCi0gICAgICAgIHJldHVy biBJbnRSZWN0KCk7CisgICAgICAgIHJldHVybiBMYXlvdXRSZWN0KCk7CiAKICAgICAvLyBSZXR1 cm4gdGhlIHdpZHRoIG9mIHRoZSBtaW5pbWFsIGxlZnQgc2lkZSBhbmQgdGhlIG1heGltYWwgcmln aHQgc2lkZS4KLSAgICBpbnQgbG9naWNhbExlZnRTaWRlID0gbnVtZXJpY19saW1pdHM8aW50Pjo6 bWF4KCk7Ci0gICAgaW50IGxvZ2ljYWxSaWdodFNpZGUgPSBudW1lcmljX2xpbWl0czxpbnQ+Ojpt aW4oKTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0U2lkZSA9IG51bWVyaWNfbGltaXRzPExh eW91dFVuaXQ+OjptYXgoKTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxSaWdodFNpZGUgPSBudW1l cmljX2xpbWl0czxMYXlvdXRVbml0Pjo6bWluKCk7CiAgICAgZm9yIChJbmxpbmVUZXh0Qm94KiBj dXJyID0gZmlyc3RUZXh0Qm94KCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5uZXh0VGV4dEJveCgpKSB7 CiAgICAgICAgIGxvZ2ljYWxMZWZ0U2lkZSA9IG1pbihsb2dpY2FsTGVmdFNpZGUsIGN1cnItPmxv Z2ljYWxMZWZ0VmlzdWFsT3ZlcmZsb3coKSk7CiAgICAgICAgIGxvZ2ljYWxSaWdodFNpZGUgPSBt YXgobG9naWNhbFJpZ2h0U2lkZSwgY3Vyci0+bG9naWNhbFJpZ2h0VmlzdWFsT3ZlcmZsb3coKSk7 CiAgICAgfQogICAgIAotICAgIGludCBsb2dpY2FsVG9wID0gZmlyc3RUZXh0Qm94KCktPmxvZ2lj YWxUb3BWaXN1YWxPdmVyZmxvdygpOwotICAgIGludCBsb2dpY2FsV2lkdGggPSBsb2dpY2FsUmln aHRTaWRlIC0gbG9naWNhbExlZnRTaWRlOwotICAgIGludCBsb2dpY2FsSGVpZ2h0ID0gbGFzdFRl eHRCb3goKS0+bG9naWNhbEJvdHRvbVZpc3VhbE92ZXJmbG93KCkgLSBsb2dpY2FsVG9wOworICAg IExheW91dFVuaXQgbG9naWNhbFRvcCA9IGZpcnN0VGV4dEJveCgpLT5sb2dpY2FsVG9wVmlzdWFs T3ZlcmZsb3coKTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxSaWdodFNp ZGUgLSBsb2dpY2FsTGVmdFNpZGU7CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gbGFz dFRleHRCb3goKS0+bG9naWNhbEJvdHRvbVZpc3VhbE92ZXJmbG93KCkgLSBsb2dpY2FsVG9wOwog ICAgIAotICAgIEludFJlY3QgcmVjdChsb2dpY2FsTGVmdFNpZGUsIGxvZ2ljYWxUb3AsIGxvZ2lj YWxXaWR0aCwgbG9naWNhbEhlaWdodCk7CisgICAgTGF5b3V0UmVjdCByZWN0KGxvZ2ljYWxMZWZ0 U2lkZSwgbG9naWNhbFRvcCwgbG9naWNhbFdpZHRoLCBsb2dpY2FsSGVpZ2h0KTsKICAgICBpZiAo IXN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCiAgICAgICAgIHJlY3QgPSByZWN0 LnRyYW5zcG9zZWRSZWN0KCk7CiAgICAgcmV0dXJuIHJlY3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0LmgJKHJldmlzaW9uIDk5MDkyKQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNyBAQCBw dWJsaWM6CiAgICAgdm9pZCBkaXJ0eUxpbmVCb3hlcyhib29sIGZ1bGxMYXlvdXQpOwogCiAgICAg dmlydHVhbCB2b2lkIGFic29sdXRlUmVjdHMoVmVjdG9yPExheW91dFJlY3Q+JiwgY29uc3QgTGF5 b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0KSBjb25zdDsKLSAgICB2b2lkIGFic29sdXRlUmVj dHNGb3JSYW5nZShWZWN0b3I8SW50UmVjdD4mLCB1bnNpZ25lZCBzdGFydE9mZnNldCA9IDAsIHVu c2lnbmVkIGVuZE9mZnNldCA9IFVJTlRfTUFYLCBib29sIHVzZVNlbGVjdGlvbkhlaWdodCA9IGZh bHNlLCBib29sKiB3YXNGaXhlZCA9IDApOworICAgIHZvaWQgYWJzb2x1dGVSZWN0c0ZvclJhbmdl KFZlY3RvcjxMYXlvdXRSZWN0PiYsIHVuc2lnbmVkIHN0YXJ0T2Zmc2V0ID0gMCwgdW5zaWduZWQg ZW5kT2Zmc2V0ID0gVUlOVF9NQVgsIGJvb2wgdXNlU2VsZWN0aW9uSGVpZ2h0ID0gZmFsc2UsIGJv b2wqIHdhc0ZpeGVkID0gMCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgYWJzb2x1dGVRdWFkcyhWZWN0 b3I8RmxvYXRRdWFkPiYsIGJvb2wqIHdhc0ZpeGVkKSBjb25zdDsKICAgICB2b2lkIGFic29sdXRl UXVhZHNGb3JSYW5nZShWZWN0b3I8RmxvYXRRdWFkPiYsIHVuc2lnbmVkIHN0YXJ0T2Zmc2V0ID0g MCwgdW5zaWduZWQgZW5kT2Zmc2V0ID0gVUlOVF9NQVgsIGJvb2wgdXNlU2VsZWN0aW9uSGVpZ2h0 ID0gZmFsc2UsIGJvb2wqIHdhc0ZpeGVkID0gMCk7CkBAIC04Myw3ICs4Myw3IEBAIHB1YmxpYzoK ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsb2F0JiBtaW5XLCBmbG9hdCYgbWF4VywgYm9v bCYgc3RyaXBGcm9udFNwYWNlcyk7CiAKICAgICB2aXJ0dWFsIExheW91dFJlY3QgbGluZXNCb3Vu ZGluZ0JveCgpIGNvbnN0OwotICAgIEludFJlY3QgbGluZXNWaXN1YWxPdmVyZmxvd0JvdW5kaW5n Qm94KCkgY29uc3Q7CisgICAgTGF5b3V0UmVjdCBsaW5lc1Zpc3VhbE92ZXJmbG93Qm91bmRpbmdC b3goKSBjb25zdDsKIAogICAgIEZsb2F0UG9pbnQgZmlyc3RSdW5PcmlnaW4oKSBjb25zdDsKICAg ICBmbG9hdCBmaXJzdFJ1blgoKSBjb25zdDsKQEAgLTE1MCw3ICsxNTAsNyBAQCBwcml2YXRlOgog ICAgIC8vIGNhbGxlcnMgd2l0aCBhIFJlbmRlck9iamVjdCogY2FuIGNvbnRpbnVlIHRvIHVzZSBs ZW5ndGgoKS4KICAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIHRl eHRMZW5ndGgoKTsgfQogCi0gICAgdmlydHVhbCB2b2lkIHBhaW50KFBhaW50SW5mbyYsIGNvbnN0 IEludFBvaW50JikgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQorICAgIHZpcnR1YWwgdm9pZCBw YWludChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYpIHsgQVNTRVJUX05PVF9SRUFDSEVE KCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCkgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsg fQogICAgIHZpcnR1YWwgYm9vbCBub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhp dFRlc3RSZXN1bHQmLCBjb25zdCBMYXlvdXRQb2ludCYsIGNvbnN0IExheW91dFBvaW50JiwgSGl0 VGVzdEFjdGlvbikgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0dXJuIGZhbHNlOyB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxp bmVUZXh0LmNwcAkocmV2aXNpb24gOTkwOTIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3ZnL1JlbmRlclNWR0lubGluZVRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDQsNyArMTA0 LDcgQEAgSW5saW5lVGV4dEJveCogUmVuZGVyU1ZHSW5saW5lVGV4dDo6Y3JlYQogICAgIHJldHVy biBib3g7CiB9CiAKLUxheW91dFJlY3QgUmVuZGVyU1ZHSW5saW5lVGV4dDo6bG9jYWxDYXJldFJl Y3QoSW5saW5lQm94KiBib3gsIGludCBjYXJldE9mZnNldCwgaW50KikKK0xheW91dFJlY3QgUmVu ZGVyU1ZHSW5saW5lVGV4dDo6bG9jYWxDYXJldFJlY3QoSW5saW5lQm94KiBib3gsIGludCBjYXJl dE9mZnNldCwgTGF5b3V0VW5pdCopCiB7CiAgICAgaWYgKCFib3gtPmlzSW5saW5lVGV4dEJveCgp KQogICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOwo= 113380 2011-11-02 14:35:06 -0700 2011-11-02 15:53:56 -0700 Patch bug-71389-20111102143505.patch text/plain 6043 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MDk2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMTEtMDIgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJUZXh0IHRv IG5ldyBsYXlvdXQgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTcxMzg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU3dpdGNoIFJlbmRlclRleHQgbWV0aG9kcyAoYW5kIG92ZXJyaWRlbiBtZXRob2Rz IGluIHJlbGF0ZWQgY2xhc3NlcykgdG8KKyAgICAgICAgTGF5b3V0UmVjdC9MYXlvdXRVbml0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmFic29sdXRlUmVjdHNGb3JSYW5n ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0OjpsaW5lc0JvdW5kaW5nQm94KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmxpbmVzVmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0Jv eCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHQuaDoKKyAgICAgICAgQ2hhbmdlIFJl bmRlclRleHQgdG8gZXhwb3NlIGl0cyBib3VuZGluZyBib3gsIHNlbGVjdGlvbiBhbmQgY2FyZXQg cmVjdHMKKyAgICAgICAgYXMgTGF5b3V0UmVjdHMuCisgICAgICAgIAorICAgICAgICAqIHJlbmRl cmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTVkdJbmxpbmVUZXh0Ojpsb2NhbENhcmV0UmVjdCk6CisgICAgICAgICogcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdJbmxpbmVUZXh0Lmg6CisgICAgICAgIENoYW5nZSBsb2NhbENhcmV0UmVjdCB0 byByZXR1cm4gYSBMYXlvdXRSZWN0LgorCiAyMDExLTExLTAyICBUb20gU2VwZXogIDx0c2VwZXpA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFhTU0F1ZGl0b3IgaXMgc2lsZW50CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCShyZXZpc2lvbiA5OTA5NikKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzI4LDcgKzMyOCw3IEBAIHN0YXRpYyBGbG9hdFJlY3QgbG9jYWxRdWFkRm9yVGV4dEJveChJbmwK ICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiB9CiAKLXZvaWQgUmVuZGVyVGV4dDo6YWJzb2x1dGVS ZWN0c0ZvclJhbmdlKFZlY3RvcjxJbnRSZWN0PiYgcmVjdHMsIHVuc2lnbmVkIHN0YXJ0LCB1bnNp Z25lZCBlbmQsIGJvb2wgdXNlU2VsZWN0aW9uSGVpZ2h0LCBib29sKiB3YXNGaXhlZCkKK3ZvaWQg UmVuZGVyVGV4dDo6YWJzb2x1dGVSZWN0c0ZvclJhbmdlKFZlY3RvcjxMYXlvdXRSZWN0PiYgcmVj dHMsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQsIGJvb2wgdXNlU2VsZWN0aW9uSGVpZ2h0 LCBib29sKiB3YXNGaXhlZCkKIHsKICAgICAvLyBXb3JrIGFyb3VuZCBzaWduZWQvdW5zaWduZWQg aXNzdWVzLiBUaGlzIGZ1bmN0aW9uIHRha2VzIHVuc2lnbmVkcywgYW5kIGlzIG9mdGVuIHBhc3Nl ZCBVSU5UX01BWAogICAgIC8vIHRvIG1lYW4gImFsbCB0aGUgd2F5IHRvIHRoZSBlbmQiLiBJbmxp bmVUZXh0Qm94IGNvb3JkaW5hdGVzIGFyZSB1bnNpZ25lZHMsIHNvIGNoYW5naW5nIHRoaXMgCkBA IC0xNDk3LDI0ICsxNDk3LDI0IEBAIExheW91dFJlY3QgUmVuZGVyVGV4dDo6bGluZXNCb3VuZGlu Z0JveCgKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1JbnRSZWN0IFJlbmRlclRleHQ6OmxpbmVz VmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0JveCgpIGNvbnN0CitMYXlvdXRSZWN0IFJlbmRlclRleHQ6 OmxpbmVzVmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0JveCgpIGNvbnN0CiB7CiAgICAgaWYgKCFmaXJz dFRleHRCb3goKSkKLSAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICAgICAgcmV0dXJuIExh eW91dFJlY3QoKTsKIAogICAgIC8vIFJldHVybiB0aGUgd2lkdGggb2YgdGhlIG1pbmltYWwgbGVm dCBzaWRlIGFuZCB0aGUgbWF4aW1hbCByaWdodCBzaWRlLgotICAgIGludCBsb2dpY2FsTGVmdFNp ZGUgPSBudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKTsKLSAgICBpbnQgbG9naWNhbFJpZ2h0U2lk ZSA9IG51bWVyaWNfbGltaXRzPGludD46Om1pbigpOworICAgIExheW91dFVuaXQgbG9naWNhbExl ZnRTaWRlID0gbnVtZXJpY19saW1pdHM8TGF5b3V0VW5pdD46Om1heCgpOworICAgIExheW91dFVu aXQgbG9naWNhbFJpZ2h0U2lkZSA9IG51bWVyaWNfbGltaXRzPExheW91dFVuaXQ+OjptaW4oKTsK ICAgICBmb3IgKElubGluZVRleHRCb3gqIGN1cnIgPSBmaXJzdFRleHRCb3goKTsgY3VycjsgY3Vy ciA9IGN1cnItPm5leHRUZXh0Qm94KCkpIHsKICAgICAgICAgbG9naWNhbExlZnRTaWRlID0gbWlu KGxvZ2ljYWxMZWZ0U2lkZSwgY3Vyci0+bG9naWNhbExlZnRWaXN1YWxPdmVyZmxvdygpKTsKICAg ICAgICAgbG9naWNhbFJpZ2h0U2lkZSA9IG1heChsb2dpY2FsUmlnaHRTaWRlLCBjdXJyLT5sb2dp Y2FsUmlnaHRWaXN1YWxPdmVyZmxvdygpKTsKICAgICB9CiAgICAgCi0gICAgaW50IGxvZ2ljYWxU b3AgPSBmaXJzdFRleHRCb3goKS0+bG9naWNhbFRvcFZpc3VhbE92ZXJmbG93KCk7Ci0gICAgaW50 IGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxSaWdodFNpZGUgLSBsb2dpY2FsTGVmdFNpZGU7Ci0gICAg aW50IGxvZ2ljYWxIZWlnaHQgPSBsYXN0VGV4dEJveCgpLT5sb2dpY2FsQm90dG9tVmlzdWFsT3Zl cmZsb3coKSAtIGxvZ2ljYWxUb3A7CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wID0gZmlyc3RU ZXh0Qm94KCktPmxvZ2ljYWxUb3BWaXN1YWxPdmVyZmxvdygpOworICAgIExheW91dFVuaXQgbG9n aWNhbFdpZHRoID0gbG9naWNhbFJpZ2h0U2lkZSAtIGxvZ2ljYWxMZWZ0U2lkZTsKKyAgICBMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBsYXN0VGV4dEJveCgpLT5sb2dpY2FsQm90dG9tVmlzdWFs T3ZlcmZsb3coKSAtIGxvZ2ljYWxUb3A7CiAgICAgCi0gICAgSW50UmVjdCByZWN0KGxvZ2ljYWxM ZWZ0U2lkZSwgbG9naWNhbFRvcCwgbG9naWNhbFdpZHRoLCBsb2dpY2FsSGVpZ2h0KTsKKyAgICBM YXlvdXRSZWN0IHJlY3QobG9naWNhbExlZnRTaWRlLCBsb2dpY2FsVG9wLCBsb2dpY2FsV2lkdGgs IGxvZ2ljYWxIZWlnaHQpOwogICAgIGlmICghc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKSkKICAgICAgICAgcmVjdCA9IHJlY3QudHJhbnNwb3NlZFJlY3QoKTsKICAgICByZXR1cm4g cmVjdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAkocmV2aXNpb24g OTkwOTYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCSh3b3JraW5n IGNvcHkpCkBAIC01NSw3ICs1NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpcnR5TGluZUJveGVz KGJvb2wgZnVsbExheW91dCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgYWJzb2x1dGVSZWN0cyhWZWN0 b3I8TGF5b3V0UmVjdD4mLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpIGNv bnN0OwotICAgIHZvaWQgYWJzb2x1dGVSZWN0c0ZvclJhbmdlKFZlY3RvcjxJbnRSZWN0PiYsIHVu c2lnbmVkIHN0YXJ0T2Zmc2V0ID0gMCwgdW5zaWduZWQgZW5kT2Zmc2V0ID0gVUlOVF9NQVgsIGJv b2wgdXNlU2VsZWN0aW9uSGVpZ2h0ID0gZmFsc2UsIGJvb2wqIHdhc0ZpeGVkID0gMCk7CisgICAg dm9pZCBhYnNvbHV0ZVJlY3RzRm9yUmFuZ2UoVmVjdG9yPExheW91dFJlY3Q+JiwgdW5zaWduZWQg c3RhcnRPZmZzZXQgPSAwLCB1bnNpZ25lZCBlbmRPZmZzZXQgPSBVSU5UX01BWCwgYm9vbCB1c2VT ZWxlY3Rpb25IZWlnaHQgPSBmYWxzZSwgYm9vbCogd2FzRml4ZWQgPSAwKTsKIAogICAgIHZpcnR1 YWwgdm9pZCBhYnNvbHV0ZVF1YWRzKFZlY3RvcjxGbG9hdFF1YWQ+JiwgYm9vbCogd2FzRml4ZWQp IGNvbnN0OwogICAgIHZvaWQgYWJzb2x1dGVRdWFkc0ZvclJhbmdlKFZlY3RvcjxGbG9hdFF1YWQ+ JiwgdW5zaWduZWQgc3RhcnRPZmZzZXQgPSAwLCB1bnNpZ25lZCBlbmRPZmZzZXQgPSBVSU5UX01B WCwgYm9vbCB1c2VTZWxlY3Rpb25IZWlnaHQgPSBmYWxzZSwgYm9vbCogd2FzRml4ZWQgPSAwKTsK QEAgLTgzLDcgKzgzLDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxv YXQmIG1pblcsIGZsb2F0JiBtYXhXLCBib29sJiBzdHJpcEZyb250U3BhY2VzKTsKIAogICAgIHZp cnR1YWwgTGF5b3V0UmVjdCBsaW5lc0JvdW5kaW5nQm94KCkgY29uc3Q7Ci0gICAgSW50UmVjdCBs aW5lc1Zpc3VhbE92ZXJmbG93Qm91bmRpbmdCb3goKSBjb25zdDsKKyAgICBMYXlvdXRSZWN0IGxp bmVzVmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0JveCgpIGNvbnN0OwogCiAgICAgRmxvYXRQb2ludCBm aXJzdFJ1bk9yaWdpbigpIGNvbnN0OwogICAgIGZsb2F0IGZpcnN0UnVuWCgpIGNvbnN0OwpAQCAt MTUwLDcgKzE1MCw3IEBAIHByaXZhdGU6CiAgICAgLy8gY2FsbGVycyB3aXRoIGEgUmVuZGVyT2Jq ZWN0KiBjYW4gY29udGludWUgdG8gdXNlIGxlbmd0aCgpLgogICAgIHZpcnR1YWwgdW5zaWduZWQg bGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gdGV4dExlbmd0aCgpOyB9CiAKLSAgICB2aXJ0dWFsIHZv aWQgcGFpbnQoUGFpbnRJbmZvJiwgY29uc3QgSW50UG9pbnQmKSB7IEFTU0VSVF9OT1RfUkVBQ0hF RCgpOyB9CisgICAgdmlydHVhbCB2b2lkIHBhaW50KFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBv aW50JikgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQo KSB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CiAgICAgdmlydHVhbCBib29sIG5vZGVBdFBvaW50 KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IExheW91dFBvaW50 JiwgY29uc3QgTGF5b3V0UG9pbnQmLCBIaXRUZXN0QWN0aW9uKSB7IEFTU0VSVF9OT1RfUkVBQ0hF RCgpOyByZXR1cm4gZmFsc2U7IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZVRleHQuY3BwCShyZXZpc2lvbiA5OTA5NikKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEwNCw3ICsxMDQsNyBAQCBJbmxpbmVUZXh0Qm94KiBSZW5kZXJTVkdJ bmxpbmVUZXh0OjpjcmVhCiAgICAgcmV0dXJuIGJveDsKIH0KIAotTGF5b3V0UmVjdCBSZW5kZXJT VkdJbmxpbmVUZXh0Ojpsb2NhbENhcmV0UmVjdChJbmxpbmVCb3gqIGJveCwgaW50IGNhcmV0T2Zm c2V0LCBpbnQqKQorTGF5b3V0UmVjdCBSZW5kZXJTVkdJbmxpbmVUZXh0Ojpsb2NhbENhcmV0UmVj dChJbmxpbmVCb3gqIGJveCwgaW50IGNhcmV0T2Zmc2V0LCBMYXlvdXRVbml0KikKIHsKICAgICBp ZiAoIWJveC0+aXNJbmxpbmVUZXh0Qm94KCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRSZWN0KCk7 Cg==