62864 2011-06-17 07:51:29 -0700 [V8] Fix WebGL bindings for subarrays 2011-06-20 02:36:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ager ager oldest_to_newest 422616 0 ager 2011-06-17 07:51:29 -0700 [V8] Fix WebGL bindings for subarrays 422618 1 97601 ager 2011-06-17 07:53:01 -0700 Created attachment 97601 Patch 422652 2 97601 antonm 2011-06-17 09:08:12 -0700 Comment on attachment 97601 Patch Nice and neat! LGTM 422653 3 97601 antonm 2011-06-17 09:09:49 -0700 Comment on attachment 97601 Patch One question though: do this objects go to some maps? To phrase differently: is toV8Independent equal to toV8 modulo MarkIndependent? And if yes, can we express it in more concise manner? 423063 4 97688 ager 2011-06-18 00:23:41 -0700 Created attachment 97688 Patch 423067 5 ager 2011-06-18 00:26:26 -0700 (In reply to comment #3) > (From update of attachment 97601 [details]) > One question though: do this objects go to some maps? To phrase differently: is toV8Independent equal to toV8 modulo MarkIndependent? And if yes, can we express it in more concise manner? Yeah, toV8Independent is the same as toV8 modulo the MarkIndependent call. Refactored. Looking forward to getting this in. Reduced pause times in WebGL demoes from nearly one second to 30ms. :-) 423522 6 97688 antonm 2011-06-20 01:03:32 -0700 Comment on attachment 97688 Patch Nice! LGTM 423553 7 97688 abarth 2011-06-20 02:04:36 -0700 Comment on attachment 97688 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97688&action=review > Source/WebCore/bindings/v8/V8Proxy.h:423 > + v8::Persistent<v8::Object> handle = v8::Persistent<v8::Object>::New(holder); Where is the Dispose that balances this New ? 423557 8 97766 ager 2011-06-20 02:13:10 -0700 Created attachment 97766 Patch 423558 9 ager 2011-06-20 02:14:18 -0700 (In reply to comment #7) > (From update of attachment 97688 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97688&action=review > > > Source/WebCore/bindings/v8/V8Proxy.h:423 > > + v8::Persistent<v8::Object> handle = v8::Persistent<v8::Object>::New(holder); > > Where is the Dispose that balances this New ? Urgh. You are right, I introduced that bug when going from patch 1 to patch 2. Thank you Adam! 423565 10 97766 abarth 2011-06-20 02:30:55 -0700 Comment on attachment 97766 Patch Aside from the fact that this patch adds code to V8Proxy (which needs to die), this looks good. (I don't fully understand what MarkIndependent does, but I assume you do.) 423567 11 ager 2011-06-20 02:36:45 -0700 Committed r89236: <http://trac.webkit.org/changeset/89236> 97601 2011-06-17 07:53:01 -0700 2011-06-18 00:23:34 -0700 Patch bug-62864-20110617165259.patch text/plain 3609 ager U3VidmVyc2lvbiBSZXZpc2lvbjogODkxMzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYzIxMWJjNGVkZWY5Nzhl ZDc4MzVmNzU0YzU2MDMyYTM3YTNlNjc4Li5iZjE1ZDY5Y2Y5MzU5NmE5NTM2YzU3OTA2ZjZlMmE5 YTEzYzBjYzI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTcgIE1hZHMg QWdlciAgPGFnZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtWOF0gRml4IFdlYkdMIGJpbmRpbmdzIGZvciBzdWJhcnJheXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyODY0CisK KyAgICAgICAgTWFyayBXZWJHTCBzdWJhcnJheXMgYXMgaW5kZXBlbmRlbnQgb2Ygb3RoZXIgRE9N IG9iamVjdHMgaW4gdGhlCisgICAgICAgIFY4IGJpbmRpbmdzLiBUaGlzIGFsbG93cyB1cyB0byBj bGVhbiB0aGVtIHVwIGluZGVwZW5kZW50bHkgd2hpY2gKKyAgICAgICAgZ3JlYXRseSBpbXByb3Zl cyBwZXJmb3JtYW5jZS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKyAgICAg ICAgKFdlYkNvcmU6OnRvVjhJbmRlcGVuZGVudCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1 Y3RXZWJHTEFycmF5V2l0aEFycmF5QnVmZmVyQXJndW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 Y29uc3RydWN0V2ViR0xBcnJheSk6CisKIDIwMTEtMDYtMTYgIFBhdmVsIFBvZGl2aWxvdiAgPHBv ZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hh dHNreS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaAppbmRleCA3NDNiZTk4MDNiZTdj Yzk3Mzg2YzY3MDY0NjI3Y2UyY2JlZmIwN2M0Li4yNGJiMTY2YzAwMDgwNTQwZWI5YmY1NzJmMjNl ZTg3NDJhMjk5ZThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFBy b3h5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCkBAIC00MTks NiArNDE5LDE2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgcmV0dXJuIGhvbGRlcjsK ICAgICB9CiAKKyAgICB0ZW1wbGF0ZSA8Y2xhc3MgVD4gaW5saW5lIHY4OjpIYW5kbGU8djg6Ok9i amVjdD4gdG9WOEluZGVwZW5kZW50KFBhc3NSZWZQdHI8VD4gb2JqZWN0LCB2ODo6TG9jYWw8djg6 Ok9iamVjdD4gaG9sZGVyKQorICAgIHsKKyAgICAgICAgb2JqZWN0LT5yZWYoKTsKKyAgICAgICAg djg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4gcmVzdWx0ID0gdjg6OlBlcnNpc3RlbnQ8djg6Ok9i amVjdD46Ok5ldyhob2xkZXIpOworICAgICAgICByZXN1bHQuTWFya0luZGVwZW5kZW50KCk7Cisg ICAgICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9yRE9NT2JqZWN0KG9iamVjdC5nZXQo KSwgcmVzdWx0KTsKKyAgICAgICAgcmV0dXJuIGhvbGRlcjsKKyAgICB9CisKKwogfQogCiAjZW5k aWYgLy8gVjhQcm94eV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCmluZGV4IGMzMTgzZmM2OTc3OWYw Njk2MGQ4ZjA3MjZmNGQ4MjNiOWViYzVlZjguLjgyZDhhMjNlNGM3OTIwNjc3NmJhMmM4YmI3ZDAz Yjg1Zjg3NGNiNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCkBAIC03Miw3ICs3Miw3IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBjb25zdHJ1Y3RXZWJHTEFycmF5V2l0aEFycmF5QnVmZmVyQXJn dW1lbnQoY29uc3Qgdjg6OkFyZ3VtCiAgICAgVjhET01XcmFwcGVyOjpzZXRET01XcmFwcGVyKGFy Z3MuSG9sZGVyKCksIHR5cGUsIGFycmF5LmdldCgpKTsKICAgICBpZiAoaGFzSW5kZXhlcikKICAg ICAgICAgYXJncy5Ib2xkZXIoKS0+U2V0SW5kZXhlZFByb3BlcnRpZXNUb0V4dGVybmFsQXJyYXlE YXRhKGFycmF5LmdldCgpLT5iYXNlQWRkcmVzcygpLCBhcnJheVR5cGUsIGFycmF5LmdldCgpLT5s ZW5ndGgoKSk7Ci0gICAgcmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhvbGRlcigp KTsKKyAgICByZXR1cm4gdG9WOEluZGVwZW5kZW50KGFycmF5LnJlbGVhc2UoKSwgYXJncy5Ib2xk ZXIoKSk7CiB9CiAKIC8vIFRlbXBsYXRlIGZ1bmN0aW9uIHVzZWQgYnkgdGhlIEFycmF5QnVmZmVy VmlldypDb25zdHJ1Y3RvciBjYWxsYmFja3MuCkBAIC05OCw3ICs5OCw3IEBAIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBjb25zdHJ1Y3RXZWJHTEFycmF5KGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3Ms IFdyYXBwZXJUeXBlCiAgICAgICAgIC8vIERvIG5vdCBjYWxsIFNldEluZGV4ZWRQcm9wZXJ0aWVz VG9FeHRlcm5hbEFycmF5RGF0YSBvbiB0aGlzCiAgICAgICAgIC8vIG9iamVjdC4gTm90IG9ubHkg aXMgdGhlcmUgbm8gcG9pbnQgZnJvbSBhIHBlcmZvcm1hbmNlCiAgICAgICAgIC8vIHBlcnNwZWN0 aXZlLCBidXQgZG9pbmcgc28gY2F1c2VzIGVycm9ycyBpbiB0aGUgc3Vic2V0KCkgY2FzZS4KLSAg ICAgICAgcmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhvbGRlcigpKTsKKyAgICAg ICAgcmV0dXJuIHRvVjhJbmRlcGVuZGVudChhcnJheS5yZWxlYXNlKCksIGFyZ3MuSG9sZGVyKCkp OwogICAgIH0KIAogICAgIC8vIFN1cHBvcnRlZCBjb25zdHJ1Y3RvcnM6CkBAIC0xNTcsNyArMTU3 LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNvbnN0cnVjdFdlYkdMQXJyYXkoY29uc3Qgdjg6 OkFyZ3VtZW50cyYgYXJncywgV3JhcHBlclR5cGUKICAgICAvLyBUcmFuc2Zvcm0gdGhlIGhvbGRl ciBpbnRvIGEgd3JhcHBlciBvYmplY3QgZm9yIHRoZSBhcnJheS4KICAgICBWOERPTVdyYXBwZXI6 OnNldERPTVdyYXBwZXIoYXJncy5Ib2xkZXIoKSwgdHlwZSwgYXJyYXkuZ2V0KCkpOwogICAgIGFy Z3MuSG9sZGVyKCktPlNldEluZGV4ZWRQcm9wZXJ0aWVzVG9FeHRlcm5hbEFycmF5RGF0YShhcnJh eS5nZXQoKS0+YmFzZUFkZHJlc3MoKSwgYXJyYXlUeXBlLCBhcnJheS5nZXQoKS0+bGVuZ3RoKCkp OwotICAgIHJldHVybiB0b1Y4KGFycmF5LnJlbGVhc2UoKSwgYXJncy5Ib2xkZXIoKSk7CisgICAg cmV0dXJuIHRvVjhJbmRlcGVuZGVudChhcnJheS5yZWxlYXNlKCksIGFyZ3MuSG9sZGVyKCkpOwog fQogCiB0ZW1wbGF0ZSA8Y2xhc3MgQ1BsdXNQbHVzQXJyYXlUeXBlLCBjbGFzcyBKYXZhU2NyaXB0 V3JhcHBlckFycmF5VHlwZT4K 97688 2011-06-18 00:23:41 -0700 2011-06-20 02:13:03 -0700 Patch bug-62864-20110618092338.patch text/plain 3924 ager U3VidmVyc2lvbiBSZXZpc2lvbjogODkxODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzZDJjZTU5NDA5YWY2MWI1 MGIzMjBkN2UyOGUxOTdlYjQxY2Q4OTZjLi5hZmE0NDMxN2I3NzU4Mjk1MDkzYzQ3YzcyODg5ZjQ4 Y2Y5YWFhNDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTcgIE1hZHMg QWdlciAgPGFnZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtWOF0gRml4IFdlYkdMIGJpbmRpbmdzIGZvciBzdWJhcnJheXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyODY0CisK KyAgICAgICAgTWFyayBXZWJHTCBzdWJhcnJheXMgYXMgaW5kZXBlbmRlbnQgb2Ygb3RoZXIgRE9N IG9iamVjdHMgaW4gdGhlCisgICAgICAgIFY4IGJpbmRpbmdzLiBUaGlzIGFsbG93cyB1cyB0byBj bGVhbiB0aGVtIHVwIGluZGVwZW5kZW50bHkgd2hpY2gKKyAgICAgICAgZ3JlYXRseSBpbXByb3Zl cyBwZXJmb3JtYW5jZS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKyAgICAg ICAgKFdlYkNvcmU6OnRvVjhJbmRlcGVuZGVudCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1 Y3RXZWJHTEFycmF5V2l0aEFycmF5QnVmZmVyQXJndW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 Y29uc3RydWN0V2ViR0xBcnJheSk6CisKIDIwMTEtMDYtMTcgIE1hcmsgUGlsZ3JpbSAgPHBpbGdy aW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCmluZGV4IDc0M2JlOTgwM2JlN2NjOTczODZjNjcw NjQ2MjdjZTJjYmVmYjA3YzQuLmU3OTdiZjFjNTM1MmNhZGYzYjYxZDQxZDU3NDViZjIyYTYwYWI2 N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKQEAgLTQxMiw5ICs0MTIsMTcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwog ICAgIH0KIAotICAgIHRlbXBsYXRlIDxjbGFzcyBUPiBpbmxpbmUgdjg6OkhhbmRsZTx2ODo6T2Jq ZWN0PiB0b1Y4KFBhc3NSZWZQdHI8VD4gb2JqZWN0LCB2ODo6TG9jYWw8djg6Ok9iamVjdD4gaG9s ZGVyKQorICAgIGVudW0gSW5kZXBlbmRlbnRNb2RlIHsKKyAgICAgICAgTWFya0luZGVwZW5kZW50 LAorICAgICAgICBEb05vdE1hcmtJbmRlcGVuZGVudAorICAgIH07CisKKyAgICB0ZW1wbGF0ZSA8 Y2xhc3MgVD4gaW5saW5lIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gdG9WOChQYXNzUmVmUHRyPFQ+ IG9iamVjdCwgdjg6OkxvY2FsPHY4OjpPYmplY3Q+IGhvbGRlciwgSW5kZXBlbmRlbnRNb2RlIGlu ZGVwZW5kZW50ID0gRG9Ob3RNYXJrSW5kZXBlbmRlbnQpCiAgICAgewogICAgICAgICBvYmplY3Qt PnJlZigpOworICAgICAgICB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiBoYW5kbGUgPSB2ODo6 UGVyc2lzdGVudDx2ODo6T2JqZWN0Pjo6TmV3KGhvbGRlcik7CisgICAgICAgIGlmIChpbmRlcGVu ZGVudCA9PSBNYXJrSW5kZXBlbmRlbnQpCisgICAgICAgICAgICBoYW5kbGUuTWFya0luZGVwZW5k ZW50KCk7CiAgICAgICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9yRE9NT2JqZWN0KG9i amVjdC5nZXQoKSwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhob2xkZXIpKTsKICAg ICAgICAgcmV0dXJuIGhvbGRlcjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b20uaCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCmluZGV4IGMz MTgzZmM2OTc3OWYwNjk2MGQ4ZjA3MjZmNGQ4MjNiOWViYzVlZjguLmMyZWU1Y2Q5ZDU3ZjlmM2Q1 MzU2ZGUzOTc2MTEwMDFjNDEzOWRmNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCkBAIC03Miw3 ICs3Miw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjb25zdHJ1Y3RXZWJHTEFycmF5V2l0aEFy cmF5QnVmZmVyQXJndW1lbnQoY29uc3Qgdjg6OkFyZ3VtCiAgICAgVjhET01XcmFwcGVyOjpzZXRE T01XcmFwcGVyKGFyZ3MuSG9sZGVyKCksIHR5cGUsIGFycmF5LmdldCgpKTsKICAgICBpZiAoaGFz SW5kZXhlcikKICAgICAgICAgYXJncy5Ib2xkZXIoKS0+U2V0SW5kZXhlZFByb3BlcnRpZXNUb0V4 dGVybmFsQXJyYXlEYXRhKGFycmF5LmdldCgpLT5iYXNlQWRkcmVzcygpLCBhcnJheVR5cGUsIGFy cmF5LmdldCgpLT5sZW5ndGgoKSk7Ci0gICAgcmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBh cmdzLkhvbGRlcigpKTsKKyAgICByZXR1cm4gdG9WOChhcnJheS5yZWxlYXNlKCksIGFyZ3MuSG9s ZGVyKCksIE1hcmtJbmRlcGVuZGVudCk7CiB9CiAKIC8vIFRlbXBsYXRlIGZ1bmN0aW9uIHVzZWQg YnkgdGhlIEFycmF5QnVmZmVyVmlldypDb25zdHJ1Y3RvciBjYWxsYmFja3MuCkBAIC05OCw3ICs5 OCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjb25zdHJ1Y3RXZWJHTEFycmF5KGNvbnN0IHY4 OjpBcmd1bWVudHMmIGFyZ3MsIFdyYXBwZXJUeXBlCiAgICAgICAgIC8vIERvIG5vdCBjYWxsIFNl dEluZGV4ZWRQcm9wZXJ0aWVzVG9FeHRlcm5hbEFycmF5RGF0YSBvbiB0aGlzCiAgICAgICAgIC8v IG9iamVjdC4gTm90IG9ubHkgaXMgdGhlcmUgbm8gcG9pbnQgZnJvbSBhIHBlcmZvcm1hbmNlCiAg ICAgICAgIC8vIHBlcnNwZWN0aXZlLCBidXQgZG9pbmcgc28gY2F1c2VzIGVycm9ycyBpbiB0aGUg c3Vic2V0KCkgY2FzZS4KLSAgICAgICAgcmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdz LkhvbGRlcigpKTsKKyAgICAgICAgcmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhv bGRlcigpLCBNYXJrSW5kZXBlbmRlbnQpOwogICAgIH0KIAogICAgIC8vIFN1cHBvcnRlZCBjb25z dHJ1Y3RvcnM6CkBAIC0xNTcsNyArMTU3LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNvbnN0 cnVjdFdlYkdMQXJyYXkoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncywgV3JhcHBlclR5cGUKICAg ICAvLyBUcmFuc2Zvcm0gdGhlIGhvbGRlciBpbnRvIGEgd3JhcHBlciBvYmplY3QgZm9yIHRoZSBh cnJheS4KICAgICBWOERPTVdyYXBwZXI6OnNldERPTVdyYXBwZXIoYXJncy5Ib2xkZXIoKSwgdHlw ZSwgYXJyYXkuZ2V0KCkpOwogICAgIGFyZ3MuSG9sZGVyKCktPlNldEluZGV4ZWRQcm9wZXJ0aWVz VG9FeHRlcm5hbEFycmF5RGF0YShhcnJheS5nZXQoKS0+YmFzZUFkZHJlc3MoKSwgYXJyYXlUeXBl LCBhcnJheS5nZXQoKS0+bGVuZ3RoKCkpOwotICAgIHJldHVybiB0b1Y4KGFycmF5LnJlbGVhc2Uo KSwgYXJncy5Ib2xkZXIoKSk7CisgICAgcmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdz LkhvbGRlcigpLCBNYXJrSW5kZXBlbmRlbnQpOwogfQogCiB0ZW1wbGF0ZSA8Y2xhc3MgQ1BsdXNQ bHVzQXJyYXlUeXBlLCBjbGFzcyBKYXZhU2NyaXB0V3JhcHBlckFycmF5VHlwZT4K 97766 2011-06-20 02:13:10 -0700 2011-06-20 02:30:54 -0700 Patch bug-62864-20110620111307.patch text/plain 4011 ager U3VidmVyc2lvbiBSZXZpc2lvbjogODkyMjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYzZhOTQzYzdiZGQxMTJh YmU0M2U4ZTBiOTdiMTZhYjhjMjM5ZTFlLi41NGIzZjdjNjFjMGFiNDc4NTQ3OTJhZmEyOTE4MGNk NTg2ZTdjYTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTkgIE1hZHMg QWdlciAgPGFnZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtWOF0gRml4IFdlYkdMIGJpbmRpbmdzIGZvciBzdWJhcnJheXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyODY0CisK KyAgICAgICAgTWFyayBXZWJHTCBzdWJhcnJheXMgYXMgaW5kZXBlbmRlbnQgb2Ygb3RoZXIgRE9N IG9iamVjdHMgaW4gdGhlCisgICAgICAgIFY4IGJpbmRpbmdzLiBUaGlzIGFsbG93cyB1cyB0byBj bGVhbiB0aGVtIHVwIGluZGVwZW5kZW50bHkgd2hpY2gKKyAgICAgICAgZ3JlYXRseSBpbXByb3Zl cyBwZXJmb3JtYW5jZS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKyAgICAg ICAgKFdlYkNvcmU6OnRvVjhJbmRlcGVuZGVudCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1 Y3RXZWJHTEFycmF5V2l0aEFycmF5QnVmZmVyQXJndW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 Y29uc3RydWN0V2ViR0xBcnJheSk6CisKIDIwMTEtMDYtMTkgIEFkYW0gQmVyZ2t2aXN0ICA8YWRh bS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBS b2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHku aCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaAppbmRleCA3NDNiZTk4MDNi ZTdjYzk3Mzg2YzY3MDY0NjI3Y2UyY2JlZmIwN2M0Li4xY2YzY2I2MzNkZjIyNmFjOWVkNDVmM2Ni ZWViODYxZGEwZGYwOWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OFByb3h5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCkBAIC00 MTIsMTAgKzQxMiwxOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHJldHVybiB2ODo6 VW5kZWZpbmVkKCk7CiAgICAgfQogCi0gICAgdGVtcGxhdGUgPGNsYXNzIFQ+IGlubGluZSB2ODo6 SGFuZGxlPHY4OjpPYmplY3Q+IHRvVjgoUGFzc1JlZlB0cjxUPiBvYmplY3QsIHY4OjpMb2NhbDx2 ODo6T2JqZWN0PiBob2xkZXIpCisgICAgZW51bSBJbmRlcGVuZGVudE1vZGUgeworICAgICAgICBN YXJrSW5kZXBlbmRlbnQsCisgICAgICAgIERvTm90TWFya0luZGVwZW5kZW50CisgICAgfTsKKwor ICAgIHRlbXBsYXRlIDxjbGFzcyBUPiBpbmxpbmUgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB0b1Y4 KFBhc3NSZWZQdHI8VD4gb2JqZWN0LCB2ODo6TG9jYWw8djg6Ok9iamVjdD4gaG9sZGVyLCBJbmRl cGVuZGVudE1vZGUgaW5kZXBlbmRlbnQgPSBEb05vdE1hcmtJbmRlcGVuZGVudCkKICAgICB7CiAg ICAgICAgIG9iamVjdC0+cmVmKCk7Ci0gICAgICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVy Rm9yRE9NT2JqZWN0KG9iamVjdC5nZXQoKSwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5l dyhob2xkZXIpKTsKKyAgICAgICAgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4gaGFuZGxlID0g djg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhob2xkZXIpOworICAgICAgICBpZiAoaW5k ZXBlbmRlbnQgPT0gTWFya0luZGVwZW5kZW50KQorICAgICAgICAgICAgaGFuZGxlLk1hcmtJbmRl cGVuZGVudCgpOworICAgICAgICBWOERPTVdyYXBwZXI6OnNldEpTV3JhcHBlckZvckRPTU9iamVj dChvYmplY3QuZ2V0KCksIGhhbmRsZSk7CiAgICAgICAgIHJldHVybiBob2xkZXI7CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1 ZmZlclZpZXdDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFy cmF5QnVmZmVyVmlld0N1c3RvbS5oCmluZGV4IGMzMTgzZmM2OTc3OWYwNjk2MGQ4ZjA3MjZmNGQ4 MjNiOWViYzVlZjguLmMyZWU1Y2Q5ZDU3ZjlmM2Q1MzU2ZGUzOTc2MTEwMDFjNDEzOWRmNDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVy Vmlld0N1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFy cmF5QnVmZmVyVmlld0N1c3RvbS5oCkBAIC03Miw3ICs3Miw3IEBAIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBjb25zdHJ1Y3RXZWJHTEFycmF5V2l0aEFycmF5QnVmZmVyQXJndW1lbnQoY29uc3Qgdjg6 OkFyZ3VtCiAgICAgVjhET01XcmFwcGVyOjpzZXRET01XcmFwcGVyKGFyZ3MuSG9sZGVyKCksIHR5 cGUsIGFycmF5LmdldCgpKTsKICAgICBpZiAoaGFzSW5kZXhlcikKICAgICAgICAgYXJncy5Ib2xk ZXIoKS0+U2V0SW5kZXhlZFByb3BlcnRpZXNUb0V4dGVybmFsQXJyYXlEYXRhKGFycmF5LmdldCgp LT5iYXNlQWRkcmVzcygpLCBhcnJheVR5cGUsIGFycmF5LmdldCgpLT5sZW5ndGgoKSk7Ci0gICAg cmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhvbGRlcigpKTsKKyAgICByZXR1cm4g dG9WOChhcnJheS5yZWxlYXNlKCksIGFyZ3MuSG9sZGVyKCksIE1hcmtJbmRlcGVuZGVudCk7CiB9 CiAKIC8vIFRlbXBsYXRlIGZ1bmN0aW9uIHVzZWQgYnkgdGhlIEFycmF5QnVmZmVyVmlldypDb25z dHJ1Y3RvciBjYWxsYmFja3MuCkBAIC05OCw3ICs5OCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBjb25zdHJ1Y3RXZWJHTEFycmF5KGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MsIFdyYXBwZXJU eXBlCiAgICAgICAgIC8vIERvIG5vdCBjYWxsIFNldEluZGV4ZWRQcm9wZXJ0aWVzVG9FeHRlcm5h bEFycmF5RGF0YSBvbiB0aGlzCiAgICAgICAgIC8vIG9iamVjdC4gTm90IG9ubHkgaXMgdGhlcmUg bm8gcG9pbnQgZnJvbSBhIHBlcmZvcm1hbmNlCiAgICAgICAgIC8vIHBlcnNwZWN0aXZlLCBidXQg ZG9pbmcgc28gY2F1c2VzIGVycm9ycyBpbiB0aGUgc3Vic2V0KCkgY2FzZS4KLSAgICAgICAgcmV0 dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhvbGRlcigpKTsKKyAgICAgICAgcmV0dXJu IHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhvbGRlcigpLCBNYXJrSW5kZXBlbmRlbnQpOwog ICAgIH0KIAogICAgIC8vIFN1cHBvcnRlZCBjb25zdHJ1Y3RvcnM6CkBAIC0xNTcsNyArMTU3LDcg QEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNvbnN0cnVjdFdlYkdMQXJyYXkoY29uc3Qgdjg6OkFy Z3VtZW50cyYgYXJncywgV3JhcHBlclR5cGUKICAgICAvLyBUcmFuc2Zvcm0gdGhlIGhvbGRlciBp bnRvIGEgd3JhcHBlciBvYmplY3QgZm9yIHRoZSBhcnJheS4KICAgICBWOERPTVdyYXBwZXI6OnNl dERPTVdyYXBwZXIoYXJncy5Ib2xkZXIoKSwgdHlwZSwgYXJyYXkuZ2V0KCkpOwogICAgIGFyZ3Mu SG9sZGVyKCktPlNldEluZGV4ZWRQcm9wZXJ0aWVzVG9FeHRlcm5hbEFycmF5RGF0YShhcnJheS5n ZXQoKS0+YmFzZUFkZHJlc3MoKSwgYXJyYXlUeXBlLCBhcnJheS5nZXQoKS0+bGVuZ3RoKCkpOwot ICAgIHJldHVybiB0b1Y4KGFycmF5LnJlbGVhc2UoKSwgYXJncy5Ib2xkZXIoKSk7CisgICAgcmV0 dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhvbGRlcigpLCBNYXJrSW5kZXBlbmRlbnQp OwogfQogCiB0ZW1wbGF0ZSA8Y2xhc3MgQ1BsdXNQbHVzQXJyYXlUeXBlLCBjbGFzcyBKYXZhU2Ny aXB0V3JhcHBlckFycmF5VHlwZT4K