60593 2011-05-10 15:42:41 -0700 Flesh out RenderLayer's ScrollableArea implementation a little more 2011-05-11 13:55:42 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dglazkov eric gustavo.noronha gustavo jonlee sam simon.fraser webkit.review.bot xan.lopez oldest_to_newest 401584 0 simon.fraser 2011-05-10 15:42:41 -0700 RenderLayer needs to override a few more ScrollableArea methods. 401604 1 93033 simon.fraser 2011-05-10 16:05:23 -0700 Created attachment 93033 Patch 401616 2 93033 webkit-ews 2011-05-10 16:19:28 -0700 Comment on attachment 93033 Patch Attachment 93033 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/8687102 401621 3 93040 simon.fraser 2011-05-10 16:24:32 -0700 Created attachment 93040 Patch 401668 4 93040 webkit.review.bot 2011-05-10 17:33:55 -0700 Comment on attachment 93040 Patch Attachment 93040 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/8684186 401707 5 93040 webkit.review.bot 2011-05-10 18:56:49 -0700 Comment on attachment 93040 Patch Attachment 93040 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/8685193 401708 6 93040 webkit.review.bot 2011-05-10 18:59:57 -0700 Comment on attachment 93040 Patch Attachment 93040 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/8684225 401713 7 93040 webkit.review.bot 2011-05-10 19:27:36 -0700 Comment on attachment 93040 Patch Attachment 93040 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/8688148 401738 8 simon.fraser 2011-05-10 20:57:48 -0700 Another commit landed under this last patch, breaking it. 401745 9 93040 gyuyoung.kim 2011-05-10 21:21:48 -0700 Comment on attachment 93040 Patch Attachment 93040 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/8691102 401770 10 93040 eric 2011-05-10 22:25:41 -0700 Comment on attachment 93040 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93040&action=review > Source/WebCore/platform/ScrollableArea.h:124 > + virtual IntRect visibleContentRect(bool /*includeScrollbars*/ = false) const { ASSERT_NOT_REACHED(); return IntRect(); } We generally prefer enums over bools (I know this isn't your code, but eventually we should fix it.) 401771 11 eric 2011-05-10 22:26:28 -0700 We should teach the cr-linux-ews not to cq- a patch when it can't be applied. 401868 12 93040 gustavo.noronha 2011-05-11 02:17:22 -0700 Comment on attachment 93040 Patch Attachment 93040 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/8691173 402064 13 93138 simon.fraser 2011-05-11 10:00:17 -0700 Created attachment 93138 Patch 402246 14 simon.fraser 2011-05-11 13:55:42 -0700 http://trac.webkit.org/changeset/86262 93033 2011-05-10 16:05:23 -0700 2011-05-10 16:24:29 -0700 Patch bug-60593-20110510160522.patch text/plain 6074 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODYxMTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkOGFmZGI4MWIwMzliNWM5 NTMxY2M5MjIwN2I0MWU3NGRkNjAyOTliLi4yZTM4YWJjNmVkNjFmZDY5MzkzMTllZTEwY2ZhN2Mw MjAxMzNkOWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDUtMTAgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmxlc2ggb3V0IFJlbmRlckxheWVyJ3MgU2Nyb2xs YWJsZUFyZWEgaW1wbGVtZW50YXRpb24gYSBsaXR0bGUgbW9yZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA1OTMKKworICAgICAgICBPdmVycmlkZSBh IGZldyBtb3JlIFNjcm9sbGFibGVBcmVhIG1ldGhvZHMgb24gUmVuZGVyTGF5ZXIKKyAgICAgICAg YXMgYSBiYWJ5LXN0ZXAgdG93YXJkcyBhbmltYXRpbmcgb3ZlcmZsb3cgZGl2IHNjcm9sbGluZy4K KworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxhYmxlQXJlYTo6dmlzaWJsZUNvbnRlbnRSZWN0KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9s bFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjptaW5pbXVtU2Nyb2xs UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Om1heGltdW1TY3JvbGxQ b3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dmlzaWJsZUNvbnRlbnRS ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpvdmVyaGFuZ0Ftb3VudCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6ZGlkQ29tcGxldGVSdWJiZXJCYW5kKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyOjpzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucyk6CisKIDIwMTEtMDUtMDkgIFNp bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBJY29u VVJMLiogaW50byB0aGUgZG9tIGdyb3VwaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGFibGVBcmVhLmgKaW5kZXggZWYzMjNjNzAyMjQwOGM1NDVkMzgwNjJkZDliMThhYTMwNTgxZjk2 My4uNGJiZWQzZTVhY2Q1NzQ2ODYyNDNjMTU2ZTBjOTI3MGZhYjg2MTI2NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCkBAIC0xMjEsNyArMTIxLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgSW50UG9pbnQgc2Nyb2xsUG9zaXRpb24oKSBjb25zdCB7IEFTU0VSVF9O T1RfUkVBQ0hFRCgpOyByZXR1cm4gSW50UG9pbnQoKTsgfQogICAgIHZpcnR1YWwgSW50UG9pbnQg bWluaW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3QgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0 dXJuIEludFBvaW50KCk7IH0KICAgICB2aXJ0dWFsIEludFBvaW50IG1heGltdW1TY3JvbGxQb3Np dGlvbigpIGNvbnN0IHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBJbnRQb2ludCgpOyB9 Ci0gICAgdmlydHVhbCBJbnRSZWN0IHZpc2libGVDb250ZW50UmVjdChib29sID0gZmFsc2UpIGNv bnN0IHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBJbnRSZWN0KCk7IH0KKyAgICB2aXJ0 dWFsIEludFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0KGJvb2wgLyppbmNsdWRlU2Nyb2xsYmFycyov ID0gZmFsc2UpIGNvbnN0IHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBJbnRSZWN0KCk7 IH0KICAgICB2aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3QgeyBBU1NFUlRfTk9UX1JF QUNIRUQoKTsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCB2aXNpYmxlV2lkdGgoKSBjb25z dCB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgSW50U2l6 ZSBjb250ZW50c1NpemUoKSBjb25zdCB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyByZXR1cm4gSW50 U2l6ZSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA2 Yzc1ZjZjOGJjNGMxYTQ4NjY2NGM4NmU3ODFjMzhjZWE1Y2ZhNTQ2Li5jMGVjZTJmNzE5OTlkNDg3 N2UyZWQyYzFkZmM1N2RmM2Y3ZjM2NDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKQEAgLTE2NjQsNiArMTY2NCw0NSBAQCBpbnQgUmVuZGVyTGF5ZXI6OnNjcm9s bFBvc2l0aW9uKFNjcm9sbGJhciogc2Nyb2xsYmFyKSBjb25zdAogICAgIHJldHVybiAwOwogfQog CitJbnRQb2ludCBSZW5kZXJMYXllcjo6c2Nyb2xsUG9zaXRpb24oKSBjb25zdAoreworICAgIHJl dHVybiBJbnRQb2ludChzY3JvbGxYT2Zmc2V0KCksIHNjcm9sbFlPZmZzZXQoKSk7Cit9CisKK0lu dFBvaW50IFJlbmRlckxheWVyOjptaW5pbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdAoreworICAg IHJldHVybiBtX3Njcm9sbE9yaWdpbjsKK30KKworSW50UG9pbnQgUmVuZGVyTGF5ZXI6Om1heGlt dW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IHRoZXNlIG1heSBub3Qg YmUgdXAtdG8tZGF0ZSBpZiBtX3Njcm9sbERpbWVuc2lvbnNEaXJ0eSBpcyB0cnVlLgorICAgIHJl dHVybiBJbnRQb2ludChtX3Njcm9sbFdpZHRoLCBtX3Njcm9sbEhlaWdodCk7Cit9CisKK0ludFJl Y3QgUmVuZGVyTGF5ZXI6OnZpc2libGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3JvbGxiYXJz KSBjb25zdAoreworICAgIGludCB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoID0gMDsKKyAgICBpbnQg aG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCA9IDA7CisgICAgaWYgKGluY2x1ZGVTY3JvbGxiYXJz KSB7CisgICAgICAgIHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGggPSAodmVydGljYWxTY3JvbGxiYXIo KSAmJiAhdmVydGljYWxTY3JvbGxiYXIoKS0+aXNPdmVybGF5U2Nyb2xsYmFyKCkpID8gdmVydGlj YWxTY3JvbGxiYXIoKS0+d2lkdGgoKSA6IDA7CisgICAgICAgIGhvcml6b250YWxTY3JvbGxiYXJI ZWlnaHQgPSAoaG9yaXpvbnRhbFNjcm9sbGJhcigpICYmICFob3Jpem9udGFsU2Nyb2xsYmFyKCkt PmlzT3ZlcmxheVNjcm9sbGJhcigpKSA/IGhvcml6b250YWxTY3JvbGxiYXIoKS0+aGVpZ2h0KCkg OiAwOworICAgIH0KKyAgICAKKyAgICByZXR1cm4gSW50UmVjdChJbnRQb2ludChzY3JvbGxYT2Zm c2V0KCksIHNjcm9sbFlPZmZzZXQoKSksCisgICAgICAgICAgICAgICAgICAgSW50U2l6ZShtYXgo MCwgbV93aWR0aCAtIHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgpLCAKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1heCgwLCBtX2hlaWdodCAtIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQpKSk7 Cit9CisKK0ludFNpemUgUmVuZGVyTGF5ZXI6Om92ZXJoYW5nQW1vdW50KCkgY29uc3QKK3sKKyAg ICByZXR1cm4gSW50U2l6ZSgpOworfQorCit2b2lkIFJlbmRlckxheWVyOjpkaWRDb21wbGV0ZVJ1 YmJlckJhbmQoY29uc3QgSW50U2l6ZSYpIGNvbnN0Cit7Cit9CisKIGJvb2wgUmVuZGVyTGF5ZXI6 OmlzQWN0aXZlKCkgY29uc3QKIHsKICAgICBQYWdlKiBwYWdlID0gcmVuZGVyZXIoKS0+ZnJhbWUo KS0+cGFnZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCAxMTAy OWVkZjQ5MGRiMDdmMTIzYzYzMGRhZGIyNDI3MmU5NzQwOGVmLi4wZGY1ZjljYTU2MTY2NzI5NDc4 NmRhMGU2YjJmYjc4ZmRjNzBmMDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuaApAQCAtNTIxLDEwICs1MjEsOSBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBzaG91bGRCZU5v cm1hbEZsb3dPbmx5KCkgY29uc3Q7IAogCisgICAgaW50IHNjcm9sbFBvc2l0aW9uKFNjcm9sbGJh ciopIGNvbnN0OworICAgIAogICAgIC8vIFNjcm9sbGFibGVBcmVhIGludGVyZmFjZQotICAgIHZp cnR1YWwgaW50IHNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNv bnN0OwotICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxPZmZzZXQoY29uc3QgSW50UG9pbnQmKTsK LSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqKSBjb25zdDsKICAgICB2 aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZVNjcm9sbGJhclJlY3QoU2Nyb2xsYmFyKiwgY29uc3QgSW50 UmVjdCYpOwogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsQ29ybmVyUmVjdChjb25z dCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCBib29sIGlzQWN0aXZlKCkgY29uc3Q7CkBAIC01MzQs MTEgKzUzMywxOSBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSW50UmVjdCBjb252ZXJ0RnJvbUNv bnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYp IGNvbnN0OwogICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRh aW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAgICAg dmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29u c3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UG9pbnQmKSBjb25zdDsKLSAgICB2aXJ0dWFsIEludFNp emUgY29udGVudHNTaXplKCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgc2Nyb2xsU2l6ZShTY3Jv bGxiYXJPcmllbnRhdGlvbikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbE9mZnNl dChjb25zdCBJbnRQb2ludCYpOworICAgIHZpcnR1YWwgSW50UG9pbnQgc2Nyb2xsUG9zaXRpb24o KSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFBvaW50IG1pbmltdW1TY3JvbGxQb3NpdGlvbigpIGNv bnN0OworICAgIHZpcnR1YWwgSW50UG9pbnQgbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7 CisgICAgdmlydHVhbCBJbnRSZWN0IHZpc2libGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3Jv bGxiYXJzKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3Q7CiAg ICAgdmlydHVhbCBpbnQgdmlzaWJsZVdpZHRoKCkgY29uc3Q7CisgICAgdmlydHVhbCBJbnRTaXpl IGNvbnRlbnRzU2l6ZSgpIGNvbnN0OworICAgIHZpcnR1YWwgSW50U2l6ZSBvdmVyaGFuZ0Ftb3Vu dCgpIGNvbnN0OwogICAgIHZpcnR1YWwgSW50UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24oKSBj b25zdDsKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBj b25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tcGxldGVSdWJiZXJCYW5kKGNvbnN0IEludFNp emUmKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlv bnMoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKICAgICAvLyBSZWN0YW5nbGUgZW5jb21wYXNz aW5nIHRoZSBzY3JvbGwgY29ybmVyIGFuZCByZXNpemVyIHJlY3QuCiAgICAgSW50UmVjdCBzY3Jv bGxDb3JuZXJBbmRSZXNpemVyUmVjdCgpIGNvbnN0Owo= 93040 2011-05-10 16:24:32 -0700 2011-05-11 10:00:13 -0700 Patch bug-60593-20110510162431.patch text/plain 5952 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODYxMTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkOGFmZGI4MWIwMzliNWM5 NTMxY2M5MjIwN2I0MWU3NGRkNjAyOTliLi4yZTM4YWJjNmVkNjFmZDY5MzkzMTllZTEwY2ZhN2Mw MjAxMzNkOWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDUtMTAgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmxlc2ggb3V0IFJlbmRlckxheWVyJ3MgU2Nyb2xs YWJsZUFyZWEgaW1wbGVtZW50YXRpb24gYSBsaXR0bGUgbW9yZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA1OTMKKworICAgICAgICBPdmVycmlkZSBh IGZldyBtb3JlIFNjcm9sbGFibGVBcmVhIG1ldGhvZHMgb24gUmVuZGVyTGF5ZXIKKyAgICAgICAg YXMgYSBiYWJ5LXN0ZXAgdG93YXJkcyBhbmltYXRpbmcgb3ZlcmZsb3cgZGl2IHNjcm9sbGluZy4K KworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxhYmxlQXJlYTo6dmlzaWJsZUNvbnRlbnRSZWN0KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9s bFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjptaW5pbXVtU2Nyb2xs UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Om1heGltdW1TY3JvbGxQ b3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dmlzaWJsZUNvbnRlbnRS ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpvdmVyaGFuZ0Ftb3VudCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6ZGlkQ29tcGxldGVSdWJiZXJCYW5kKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyOjpzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucyk6CisKIDIwMTEtMDUtMDkgIFNp bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBJY29u VVJMLiogaW50byB0aGUgZG9tIGdyb3VwaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGFibGVBcmVhLmgKaW5kZXggZWYzMjNjNzAyMjQwOGM1NDVkMzgwNjJkZDliMThhYTMwNTgxZjk2 My4uNGJiZWQzZTVhY2Q1NzQ2ODYyNDNjMTU2ZTBjOTI3MGZhYjg2MTI2NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCkBAIC0xMjEsNyArMTIxLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgSW50UG9pbnQgc2Nyb2xsUG9zaXRpb24oKSBjb25zdCB7IEFTU0VSVF9O T1RfUkVBQ0hFRCgpOyByZXR1cm4gSW50UG9pbnQoKTsgfQogICAgIHZpcnR1YWwgSW50UG9pbnQg bWluaW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3QgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0 dXJuIEludFBvaW50KCk7IH0KICAgICB2aXJ0dWFsIEludFBvaW50IG1heGltdW1TY3JvbGxQb3Np dGlvbigpIGNvbnN0IHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBJbnRQb2ludCgpOyB9 Ci0gICAgdmlydHVhbCBJbnRSZWN0IHZpc2libGVDb250ZW50UmVjdChib29sID0gZmFsc2UpIGNv bnN0IHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBJbnRSZWN0KCk7IH0KKyAgICB2aXJ0 dWFsIEludFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0KGJvb2wgLyppbmNsdWRlU2Nyb2xsYmFycyov ID0gZmFsc2UpIGNvbnN0IHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBJbnRSZWN0KCk7 IH0KICAgICB2aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3QgeyBBU1NFUlRfTk9UX1JF QUNIRUQoKTsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCB2aXNpYmxlV2lkdGgoKSBjb25z dCB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgSW50U2l6 ZSBjb250ZW50c1NpemUoKSBjb25zdCB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyByZXR1cm4gSW50 U2l6ZSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA2 Yzc1ZjZjOGJjNGMxYTQ4NjY2NGM4NmU3ODFjMzhjZWE1Y2ZhNTQ2Li5jMGVjZTJmNzE5OTlkNDg3 N2UyZWQyYzFkZmM1N2RmM2Y3ZjM2NDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKQEAgLTE2NjQsNiArMTY2NCw0NSBAQCBpbnQgUmVuZGVyTGF5ZXI6OnNjcm9s bFBvc2l0aW9uKFNjcm9sbGJhciogc2Nyb2xsYmFyKSBjb25zdAogICAgIHJldHVybiAwOwogfQog CitJbnRQb2ludCBSZW5kZXJMYXllcjo6c2Nyb2xsUG9zaXRpb24oKSBjb25zdAoreworICAgIHJl dHVybiBJbnRQb2ludChzY3JvbGxYT2Zmc2V0KCksIHNjcm9sbFlPZmZzZXQoKSk7Cit9CisKK0lu dFBvaW50IFJlbmRlckxheWVyOjptaW5pbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdAoreworICAg IHJldHVybiBtX3Njcm9sbE9yaWdpbjsKK30KKworSW50UG9pbnQgUmVuZGVyTGF5ZXI6Om1heGlt dW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IHRoZXNlIG1heSBub3Qg YmUgdXAtdG8tZGF0ZSBpZiBtX3Njcm9sbERpbWVuc2lvbnNEaXJ0eSBpcyB0cnVlLgorICAgIHJl dHVybiBJbnRQb2ludChtX3Njcm9sbFdpZHRoLCBtX3Njcm9sbEhlaWdodCk7Cit9CisKK0ludFJl Y3QgUmVuZGVyTGF5ZXI6OnZpc2libGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3JvbGxiYXJz KSBjb25zdAoreworICAgIGludCB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoID0gMDsKKyAgICBpbnQg aG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCA9IDA7CisgICAgaWYgKGluY2x1ZGVTY3JvbGxiYXJz KSB7CisgICAgICAgIHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGggPSAodmVydGljYWxTY3JvbGxiYXIo KSAmJiAhdmVydGljYWxTY3JvbGxiYXIoKS0+aXNPdmVybGF5U2Nyb2xsYmFyKCkpID8gdmVydGlj YWxTY3JvbGxiYXIoKS0+d2lkdGgoKSA6IDA7CisgICAgICAgIGhvcml6b250YWxTY3JvbGxiYXJI ZWlnaHQgPSAoaG9yaXpvbnRhbFNjcm9sbGJhcigpICYmICFob3Jpem9udGFsU2Nyb2xsYmFyKCkt PmlzT3ZlcmxheVNjcm9sbGJhcigpKSA/IGhvcml6b250YWxTY3JvbGxiYXIoKS0+aGVpZ2h0KCkg OiAwOworICAgIH0KKyAgICAKKyAgICByZXR1cm4gSW50UmVjdChJbnRQb2ludChzY3JvbGxYT2Zm c2V0KCksIHNjcm9sbFlPZmZzZXQoKSksCisgICAgICAgICAgICAgICAgICAgSW50U2l6ZShtYXgo MCwgbV93aWR0aCAtIHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgpLCAKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1heCgwLCBtX2hlaWdodCAtIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQpKSk7 Cit9CisKK0ludFNpemUgUmVuZGVyTGF5ZXI6Om92ZXJoYW5nQW1vdW50KCkgY29uc3QKK3sKKyAg ICByZXR1cm4gSW50U2l6ZSgpOworfQorCit2b2lkIFJlbmRlckxheWVyOjpkaWRDb21wbGV0ZVJ1 YmJlckJhbmQoY29uc3QgSW50U2l6ZSYpIGNvbnN0Cit7Cit9CisKIGJvb2wgUmVuZGVyTGF5ZXI6 OmlzQWN0aXZlKCkgY29uc3QKIHsKICAgICBQYWdlKiBwYWdlID0gcmVuZGVyZXIoKS0+ZnJhbWUo KS0+cGFnZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCAxMTAy OWVkZjQ5MGRiMDdmMTIzYzYzMGRhZGIyNDI3MmU5NzQwOGVmLi5jMzVlODU0NzU2ZTgyYmVjMTFh YWNlNDk5ZjdhZGUxNzQ1ZTM4MDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuaApAQCAtNTIxLDEwICs1MjEsOSBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBzaG91bGRCZU5v cm1hbEZsb3dPbmx5KCkgY29uc3Q7IAogCisgICAgaW50IHNjcm9sbFBvc2l0aW9uKFNjcm9sbGJh ciopIGNvbnN0OworICAgIAogICAgIC8vIFNjcm9sbGFibGVBcmVhIGludGVyZmFjZQotICAgIHZp cnR1YWwgaW50IHNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNv bnN0OwotICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxPZmZzZXQoY29uc3QgSW50UG9pbnQmKTsK LSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqKSBjb25zdDsKICAgICB2 aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZVNjcm9sbGJhclJlY3QoU2Nyb2xsYmFyKiwgY29uc3QgSW50 UmVjdCYpOwogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsQ29ybmVyUmVjdChjb25z dCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCBib29sIGlzQWN0aXZlKCkgY29uc3Q7CkBAIC01MzQs MTAgKzUzMywxOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSW50UmVjdCBjb252ZXJ0RnJvbUNv bnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYp IGNvbnN0OwogICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRh aW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAgICAg dmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29u c3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UG9pbnQmKSBjb25zdDsKLSAgICB2aXJ0dWFsIEludFNp emUgY29udGVudHNTaXplKCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgc2Nyb2xsU2l6ZShTY3Jv bGxiYXJPcmllbnRhdGlvbikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbE9mZnNl dChjb25zdCBJbnRQb2ludCYpOworICAgIHZpcnR1YWwgSW50UG9pbnQgc2Nyb2xsUG9zaXRpb24o KSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFBvaW50IG1pbmltdW1TY3JvbGxQb3NpdGlvbigpIGNv bnN0OworICAgIHZpcnR1YWwgSW50UG9pbnQgbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7 CisgICAgdmlydHVhbCBJbnRSZWN0IHZpc2libGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3Jv bGxiYXJzKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3Q7CiAg ICAgdmlydHVhbCBpbnQgdmlzaWJsZVdpZHRoKCkgY29uc3Q7CisgICAgdmlydHVhbCBJbnRTaXpl IGNvbnRlbnRzU2l6ZSgpIGNvbnN0OworICAgIHZpcnR1YWwgSW50U2l6ZSBvdmVyaGFuZ0Ftb3Vu dCgpIGNvbnN0OwogICAgIHZpcnR1YWwgSW50UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24oKSBj b25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tcGxldGVSdWJiZXJCYW5kKGNvbnN0IEludFNp emUmKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlv bnMoKSBjb25zdDsKIAogICAgIC8vIFJlY3RhbmdsZSBlbmNvbXBhc3NpbmcgdGhlIHNjcm9sbCBj b3JuZXIgYW5kIHJlc2l6ZXIgcmVjdC4K 93138 2011-05-11 10:00:17 -0700 2011-05-11 10:27:17 -0700 Patch bug-60593-20110511100015.patch text/plain 5955 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODYyMzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNWExNzE3OWE3ZDAzOGNj MmIyNjQ2Y2VjMmM2NzgwMTBhZDk5NTJhLi44ZmJlY2FlNmYwNTc3ODQ0ZDQ5ZDZmZmFhYWM0ZmQ3 MjJmZWU4ODNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDUtMTEgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmxlc2ggb3V0IFJlbmRlckxheWVyJ3MgU2Nyb2xs YWJsZUFyZWEgaW1wbGVtZW50YXRpb24gYSBsaXR0bGUgbW9yZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA1OTMKKworICAgICAgICBPdmVycmlkZSBh IGZldyBtb3JlIFNjcm9sbGFibGVBcmVhIG1ldGhvZHMgb24gUmVuZGVyTGF5ZXIKKyAgICAgICAg YXMgYSBiYWJ5LXN0ZXAgdG93YXJkcyBhbmltYXRpbmcgb3ZlcmZsb3cgZGl2IHNjcm9sbGluZy4K KworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxhYmxlQXJlYTo6dmlzaWJsZUNvbnRlbnRSZWN0KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9s bFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjptaW5pbXVtU2Nyb2xs UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Om1heGltdW1TY3JvbGxQ b3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dmlzaWJsZUNvbnRlbnRS ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpvdmVyaGFuZ0Ftb3VudCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6ZGlkQ29tcGxldGVSdWJiZXJCYW5kKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyOjpzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucyk6CisKIDIwMTEtMDUtMTEgIEp1 bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFy ZWEuaAppbmRleCBlZjMyM2M3MDIyNDA4YzU0NWQzODA2MmRkOWIxOGFhMzA1ODFmOTYzLi40YmJl ZDNlNWFjZDU3NDY4NjI0M2MxNTZlMGM5MjcwZmFiODYxMjY1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTEyMSw3ICsxMjEsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCBJbnRQb2ludCBzY3JvbGxQb3NpdGlvbigpIGNvbnN0IHsgQVNTRVJUX05PVF9SRUFD SEVEKCk7IHJldHVybiBJbnRQb2ludCgpOyB9CiAgICAgdmlydHVhbCBJbnRQb2ludCBtaW5pbXVt U2Nyb2xsUG9zaXRpb24oKSBjb25zdCB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyByZXR1cm4gSW50 UG9pbnQoKTsgfQogICAgIHZpcnR1YWwgSW50UG9pbnQgbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkg Y29uc3QgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0dXJuIEludFBvaW50KCk7IH0KLSAgICB2 aXJ0dWFsIEludFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0KGJvb2wgPSBmYWxzZSkgY29uc3QgeyBB U1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0dXJuIEludFJlY3QoKTsgfQorICAgIHZpcnR1YWwgSW50 UmVjdCB2aXNpYmxlQ29udGVudFJlY3QoYm9vbCAvKmluY2x1ZGVTY3JvbGxiYXJzKi8gPSBmYWxz ZSkgY29uc3QgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0dXJuIEludFJlY3QoKTsgfQogICAg IHZpcnR1YWwgaW50IHZpc2libGVIZWlnaHQoKSBjb25zdCB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgp OyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgaW50IHZpc2libGVXaWR0aCgpIGNvbnN0IHsgQVNT RVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBJbnRTaXplIGNvbnRl bnRzU2l6ZSgpIGNvbnN0IHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBJbnRTaXplKCk7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDk2Nzk4ZDdm OTZkZTAxNjNhYzM0OTQxZDhjOThjYjc3MzMxOWI2NDIuLjQ1MTVmNzcxZGU1NzA2YmJmZDhjYjY3 MjIzZDE0YTkwMzVlYTVkMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcApAQCAtMTY1MCw2ICsxNjUwLDQ1IEBAIGludCBSZW5kZXJMYXllcjo6c2Nyb2xsUG9zaXRp b24oU2Nyb2xsYmFyKiBzY3JvbGxiYXIpIGNvbnN0CiAgICAgcmV0dXJuIDA7CiB9CiAKK0ludFBv aW50IFJlbmRlckxheWVyOjpzY3JvbGxQb3NpdGlvbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1f c2Nyb2xsT3JpZ2luICsgbV9zY3JvbGxPZmZzZXQ7Cit9CisKK0ludFBvaW50IFJlbmRlckxheWVy OjptaW5pbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdAoreworICAgIHJldHVybiBtX3Njcm9sbE9y aWdpbjsKK30KKworSW50UG9pbnQgUmVuZGVyTGF5ZXI6Om1heGltdW1TY3JvbGxQb3NpdGlvbigp IGNvbnN0Cit7CisgICAgLy8gRklYTUU6IG1fc2Nyb2xsU2l6ZSBtYXkgbm90IGJlIHVwLXRvLWRh dGUgaWYgbV9zY3JvbGxEaW1lbnNpb25zRGlydHkgaXMgdHJ1ZS4KKyAgICByZXR1cm4gbV9zY3Jv bGxPcmlnaW4gKyBtX3Njcm9sbFNpemU7Cit9CisKK0ludFJlY3QgUmVuZGVyTGF5ZXI6OnZpc2li bGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3JvbGxiYXJzKSBjb25zdAoreworICAgIGludCB2 ZXJ0aWNhbFNjcm9sbGJhcldpZHRoID0gMDsKKyAgICBpbnQgaG9yaXpvbnRhbFNjcm9sbGJhckhl aWdodCA9IDA7CisgICAgaWYgKGluY2x1ZGVTY3JvbGxiYXJzKSB7CisgICAgICAgIHZlcnRpY2Fs U2Nyb2xsYmFyV2lkdGggPSAodmVydGljYWxTY3JvbGxiYXIoKSAmJiAhdmVydGljYWxTY3JvbGxi YXIoKS0+aXNPdmVybGF5U2Nyb2xsYmFyKCkpID8gdmVydGljYWxTY3JvbGxiYXIoKS0+d2lkdGgo KSA6IDA7CisgICAgICAgIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQgPSAoaG9yaXpvbnRhbFNj cm9sbGJhcigpICYmICFob3Jpem9udGFsU2Nyb2xsYmFyKCktPmlzT3ZlcmxheVNjcm9sbGJhcigp KSA/IGhvcml6b250YWxTY3JvbGxiYXIoKS0+aGVpZ2h0KCkgOiAwOworICAgIH0KKyAgICAKKyAg ICByZXR1cm4gSW50UmVjdChJbnRQb2ludChzY3JvbGxYT2Zmc2V0KCksIHNjcm9sbFlPZmZzZXQo KSksCisgICAgICAgICAgICAgICAgICAgSW50U2l6ZShtYXgoMCwgbV9sYXllclNpemUud2lkdGgo KSAtIHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgpLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAg IG1heCgwLCBtX2xheWVyU2l6ZS5oZWlnaHQoKSAtIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQp KSk7Cit9CisKK0ludFNpemUgUmVuZGVyTGF5ZXI6Om92ZXJoYW5nQW1vdW50KCkgY29uc3QKK3sK KyAgICByZXR1cm4gSW50U2l6ZSgpOworfQorCit2b2lkIFJlbmRlckxheWVyOjpkaWRDb21wbGV0 ZVJ1YmJlckJhbmQoY29uc3QgSW50U2l6ZSYpIGNvbnN0Cit7Cit9CisKIGJvb2wgUmVuZGVyTGF5 ZXI6OmlzQWN0aXZlKCkgY29uc3QKIHsKICAgICBQYWdlKiBwYWdlID0gcmVuZGVyZXIoKS0+ZnJh bWUoKS0+cGFnZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCBj NTFkMmEzZjI0ZmJmZmY2ZjE0NDI1MzcwMWZlZjhlYmI3OTEyYWQ0Li4zMjZhMTRkZDFhOGJiYWVm MTk4Yzk1ODk0ZjU4NmQwNDgyYmMwNGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuaApAQCAtNTIxLDEwICs1MjEsOSBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBzaG91bGRC ZU5vcm1hbEZsb3dPbmx5KCkgY29uc3Q7IAogCisgICAgaW50IHNjcm9sbFBvc2l0aW9uKFNjcm9s bGJhciopIGNvbnN0OworICAgIAogICAgIC8vIFNjcm9sbGFibGVBcmVhIGludGVyZmFjZQotICAg IHZpcnR1YWwgaW50IHNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24p IGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxPZmZzZXQoY29uc3QgSW50UG9pbnQm KTsKLSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqKSBjb25zdDsKICAg ICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZVNjcm9sbGJhclJlY3QoU2Nyb2xsYmFyKiwgY29uc3Qg SW50UmVjdCYpOwogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsQ29ybmVyUmVjdChj b25zdCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCBib29sIGlzQWN0aXZlKCkgY29uc3Q7CkBAIC01 MzQsMTAgKzUzMywxOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSW50UmVjdCBjb252ZXJ0RnJv bUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVj dCYpIGNvbnN0OwogICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydEZyb21TY3JvbGxiYXJUb0Nv bnRhaW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAg ICAgdmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIo Y29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UG9pbnQmKSBjb25zdDsKLSAgICB2aXJ0dWFsIElu dFNpemUgY29udGVudHNTaXplKCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgc2Nyb2xsU2l6ZShT Y3JvbGxiYXJPcmllbnRhdGlvbikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbE9m ZnNldChjb25zdCBJbnRQb2ludCYpOworICAgIHZpcnR1YWwgSW50UG9pbnQgc2Nyb2xsUG9zaXRp b24oKSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFBvaW50IG1pbmltdW1TY3JvbGxQb3NpdGlvbigp IGNvbnN0OworICAgIHZpcnR1YWwgSW50UG9pbnQgbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29u c3Q7CisgICAgdmlydHVhbCBJbnRSZWN0IHZpc2libGVDb250ZW50UmVjdChib29sIGluY2x1ZGVT Y3JvbGxiYXJzKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3Q7 CiAgICAgdmlydHVhbCBpbnQgdmlzaWJsZVdpZHRoKCkgY29uc3Q7CisgICAgdmlydHVhbCBJbnRT aXplIGNvbnRlbnRzU2l6ZSgpIGNvbnN0OworICAgIHZpcnR1YWwgSW50U2l6ZSBvdmVyaGFuZ0Ft b3VudCgpIGNvbnN0OwogICAgIHZpcnR1YWwgSW50UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24o KSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tcGxldGVSdWJiZXJCYW5kKGNvbnN0IElu dFNpemUmKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1h dGlvbnMoKSBjb25zdDsKIAogICAgIC8vIFJlY3RhbmdsZSBlbmNvbXBhc3NpbmcgdGhlIHNjcm9s bCBjb3JuZXIgYW5kIHJlc2l6ZXIgcmVjdC4K