59668 2011-04-27 20:19:12 -0700 [chromium] Compute compositor fps value and history using the frameBegin timestamp 2011-04-28 17:01:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 nduca nduca abarth commit-queue eric fishd nduca webkit.review.bot oldest_to_newest 394147 0 nduca 2011-04-27 20:19:12 -0700 [chromium] Compute compositor fps value and history using the frameBegin timestamp 394163 1 91420 nduca 2011-04-27 20:54:26 -0700 Created attachment 91420 Patch 394310 2 91420 eric 2011-04-28 02:02:47 -0700 Comment on attachment 91420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91420&action=review > Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:58 > +using namespace WTF; Generally wtf headers do this for you... > Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:16 > + * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AYN Nope. 394501 3 91508 nduca 2011-04-28 10:00:51 -0700 Created attachment 91508 Patch 394674 4 91508 fishd 2011-04-28 12:47:45 -0700 Comment on attachment 91508 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91508&action=review R=me, but please fix nits before committing. > Source/WebCore/ChangeLog:9 > + beginning of the frame rather than the time we call swapBuffers. When scheudling is oops: scheudling > Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:196 > + // This value is currently inaccessible because it is up in RenderWidget. I think you mean Chromium's RenderWidget (render_widget.cc), but this could be confused with WebCore::RenderWidget. 394683 5 91541 nduca 2011-04-28 12:50:54 -0700 Created attachment 91541 Patch 394699 6 91541 fishd 2011-04-28 13:18:38 -0700 Comment on attachment 91541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91541&action=review > Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:196 > + // This value is currently inaccessible because it is up in Chromiuum's Chromiuum -> Chromium 394727 7 91551 nduca 2011-04-28 14:10:49 -0700 Created attachment 91551 chromiuuuuuuuuuuuuuuuuum ftw 394917 8 91551 commit-queue 2011-04-28 16:50:06 -0700 Comment on attachment 91551 chromiuuuuuuuuuuuuuuuuum ftw Clearing flags on attachment: 91551 Committed r85261: <http://trac.webkit.org/changeset/85261> 394918 9 commit-queue 2011-04-28 16:50:11 -0700 All reviewed patches have been landed. Closing bug. 394937 10 webkit.review.bot 2011-04-28 17:01:42 -0700 http://trac.webkit.org/changeset/85261 might have broken WinCE Release (Build) 91420 2011-04-27 20:54:26 -0700 2011-04-28 10:00:48 -0700 Patch bug-59668-20110427205425.patch text/plain 8006 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODQ1ODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjI0NTFiN2I1YjU3YjJl NDQ5MmExN2I3N2I0M2MwNGVhYzFkYTY2Li5iM2FkNGYxN2Y0YWY3ZjQwMjU3MWRiM2MyNTQxZGJi MDU3MmFiNWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMjcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQ29tcHV0ZSBjb21wb3NpdG9yIGZwcyB2YWx1 ZSBhbmQgaGlzdG9yeSB1c2luZyB0aGUgZnJhbWVCZWdpbiB0aW1lc3RhbXAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NjY4CisKKyAgICAgICAgVGhp cyBjaGFuZ2Ugc3dpdGNoZXMgdGhlIGNvbXBvc2l0b3IgRlBTIG1ldGVyIHRvIHVzZSB0aGUgdGlt ZXN0YW1wIG9mIHRoZQorICAgICAgICBiZWdpbm5pbmcgb2YgdGhlIGZyYW1lIHJhdGhlciB0aGFu IHRoZSB0aW1lIHdlIGNhbGwgc3dhcEJ1ZmZlcnMuIFdoZW4gc2NoZXVkbGluZyBpcworICAgICAg ICBjb3JyZWN0bHkgdGllZCB0byB2c3luYywgd2UgY2FuIGhhdmUgaGlnaGx5IHZhcmlhYmxlIHRp bWVzIHdoZW4gd2UgZmluaXNoIHZzeW5jIGFuZCAKKyAgICAgICAgc3RpbGwgaGF2ZSBzdGFibGUg ZnJhbWUgcmF0ZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNo cm9taXVtOjp1cGRhdGVBbmREcmF3TGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkND SGVhZHNVcERpc3BsYXk6OkNDSGVhZHNVcERpc3BsYXkpOgorICAgICAgICAoV2ViQ29yZTo6Q0NI ZWFkc1VwRGlzcGxheTo6ZHJhd0ZQU0NvdW50ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0NIZWFk c1VwRGlzcGxheTo6b25GcmFtZUJlZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkNDSGVhZHNVcERp c3BsYXk6Om9uUHJlc2VudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NIZWFkc1VwRGlzcGxheS5oOgorCiAyMDExLTA0LTIxICBWYW5nZWxpcyBLb2trZXZpcyAg PHZhbmdlbGlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2Jp bnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IGU2MmI2NzQx YTkzYjhjYzE3ZWI0ZTFmODEyY2E3ZTlkZjU1MTU4YmUuLjdjMTBlMjUyZjM2OGY0ZmYxNTgyMDFi YjI4ZTJkYWQ4YzVjMDE5ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNw cApAQCAtNTMsNiArNTMsOSBAQAogI2VsaWYgVVNFKENHKQogI2luY2x1ZGUgPENvcmVHcmFwaGlj cy9DR0JpdG1hcENvbnRleHQuaD4KICNlbmRpZgorI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5o PgorCit1c2luZyBuYW1lc3BhY2UgV1RGOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE5 MSw2ICsxOTQsOSBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6c2V0Vmlld3BvcnQoY29u c3QgSW50UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IEludFJlYwogCiB2b2lkIExheWVyUmVuZGVy ZXJDaHJvbWl1bTo6dXBkYXRlQW5kRHJhd0xheWVycygpCiB7CisgICAgLy8gRklYTUU6IHVzZSB0 aGUgZnJhbWUgYmVnaW4gdGltZSBmcm9tIHRoZSBvdmVyYWxsIGNvbXBvc2l0b3Igc2NoZWR1bGVy LgorICAgIC8vIFRoaXMgdmFsdWUgaXMgY3VycmVudGx5IGluYWNjZXNzaWJsZSBiZWNhdXNlIGl0 IGlzIHVwIGluIFJlbmRlcldpZGdldC4KKyAgICBtX2hlYWRzVXBEaXNwbGF5LT5vbkZyYW1lQmVn aW4oY3VycmVudFRpbWUoKSk7CiAgICAgQVNTRVJUKG1faGFyZHdhcmVDb21wb3NpdGluZyk7CiAK ICAgICBpZiAoIW1fcm9vdExheWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcApp bmRleCBjYjI4NzRkZDI5MzVjOWE1MWQ3YTllY2Q3MGJjMGVmMGE3ZGIzNjU4Li4yNzZlOTk1Y2Yx M2EwMGM2MWZjMjA1Yjc1ZTAzYjY5NzIyYjhjZTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBE aXNwbGF5LmNwcApAQCAtMTMsNyArMTMsNyBAQAogICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQgQU5ZCiAg KiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFRIRSBJTVBMSUVECiAgKiBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCi0gKiBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZP UiBBTlkKKyAqIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFZTgogICogRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKICAq IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsKICAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTgpAQCAtMjcsNyAr MjcsNiBAQAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICNpbmNsdWRlICJDQ0hl YWRzVXBEaXNwbGF5LmgiCiAKLSNpbmNsdWRlICJDdXJyZW50VGltZS5oIgogI2luY2x1ZGUgIkZv bnQuaCIKICNpbmNsdWRlICJGb250RGVzY3JpcHRpb24uaCIKICNpbmNsdWRlICJHcmFwaGljc0Nv bnRleHQzRC5oIgpAQCAtMzcsNiArMzYsNyBAQAogI2luY2x1ZGUgIlRleHRSdW4uaCIKICNpbmNs dWRlICJUZXh0U3RyZWFtLmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hbmFnZXIuaCIKKyNpbmNsdWRl IDx3dGYvQ3VycmVudFRpbWUuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTUxLDEwICs1MSwxMCBAQCBDQ0hlYWRz VXBEaXNwbGF5OjpDQ0hlYWRzVXBEaXNwbGF5KExheWVyUmVuZGVyZXJDaHJvbWl1bSogb3duZXIp CiAgICAgLCBtX3Nob3dGUFNDb3VudGVyKGZhbHNlKQogICAgICwgbV9zaG93UGxhdGZvcm1MYXll clRyZWUoZmFsc2UpCiB7Ci0gICAgbV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1swXSA9IGN1cnJl bnRUaW1lKCk7Ci0gICAgbV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1sxXSA9IG1fcHJlc2VudFRp bWVIaXN0b3J5SW5TZWNbMF07Ci0gICAgZm9yIChpbnQgaSA9IDI7IGkgPCBrUHJlc2VudEhpc3Rv cnlTaXplOyBpKyspCi0gICAgICAgIG1fcHJlc2VudFRpbWVIaXN0b3J5SW5TZWNbaV0gPSAwOwor ICAgIG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjWzBdID0gY3VycmVudFRpbWUoKTsKKyAgICBtX2Jl Z2luVGltZUhpc3RvcnlJblNlY1sxXSA9IG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjWzBdOworICAg IGZvciAoaW50IGkgPSAyOyBpIDwga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZTsgaSsrKQorICAgICAg ICBtX2JlZ2luVGltZUhpc3RvcnlJblNlY1tpXSA9IDA7CiAKICAgICBGb250RGVzY3JpcHRpb24g bWVkaXVtRm9udERlc2M7CiAgICAgbWVkaXVtRm9udERlc2Muc2V0R2VuZXJpY0ZhbWlseShGb250 RGVzY3JpcHRpb246Ok1vbm9zcGFjZUZhbWlseSk7CkBAIC0xNTEsOCArMTUxLDggQEAgdm9pZCBD Q0hlYWRzVXBEaXNwbGF5OjpkcmF3RlBTQ291bnRlcihHcmFwaGljc0NvbnRleHQqIGN0eCwgaW50 IHRvcCwgaW50IGhlaWdodCkKIHsKICAgICAvLyBOb3RlIHRoYXQgc2luY2Ugd2UgaGF2ZW4ndCBm aW5pc2hlZCB0aGUgY3VycmVudCBmcmFtZSwgdGhlIEZQUyBjb3VudGVyCiAgICAgLy8gYWN0dWFs bHkgcmVwb3J0cyB0aGUgbGFzdCBmcmFtZSdzIHRpbWUuCi0gICAgZG91YmxlIHNlY0Zvckxhc3RG cmFtZSA9IG1fcHJlc2VudFRpbWVIaXN0b3J5SW5TZWNbKG1fY3VycmVudEZyYW1lTnVtYmVyICsg a1ByZXNlbnRIaXN0b3J5U2l6ZSAtIDEpICUga1ByZXNlbnRIaXN0b3J5U2l6ZV0gLQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBtX3ByZXNlbnRUaW1lSGlzdG9yeUluU2VjWyhtX2N1cnJl bnRGcmFtZU51bWJlciArIGtQcmVzZW50SGlzdG9yeVNpemUgLSAyKSAlIGtQcmVzZW50SGlzdG9y eVNpemVdOworICAgIGRvdWJsZSBzZWNGb3JMYXN0RnJhbWUgPSBtX2JlZ2luVGltZUhpc3RvcnlJ blNlY1sobV9jdXJyZW50RnJhbWVOdW1iZXIgKyBrQmVnaW5GcmFtZUhpc3RvcnlTaXplIC0gMSkg JSBrQmVnaW5GcmFtZUhpc3RvcnlTaXplXSAtCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjWyhtX2N1cnJlbnRGcmFtZU51bWJlciArIGtCZWdpbkZy YW1lSGlzdG9yeVNpemUgLSAyKSAlIGtCZWdpbkZyYW1lSGlzdG9yeVNpemVdOwogCiAgICAgLy8g RmlsdGVyIHRoZSBmcmFtZSB0aW1lcyB0byBhdm9pZCBzcGlrZXMuCiAgICAgY29uc3QgZmxvYXQg YWxwaGEgPSAwLjE7CkBAIC0xNjYsNyArMTY2LDcgQEAgdm9pZCBDQ0hlYWRzVXBEaXNwbGF5Ojpk cmF3RlBTQ291bnRlcihHcmFwaGljc0NvbnRleHQqIGN0eCwgaW50IHRvcCwgaW50IGhlaWdodCkK ICAgICBTdHJpbmcgdGV4dChTdHJpbmc6OmZvcm1hdCgiRlBTOiAlNS4xZiIsIDEuMCAvIG1fZmls dGVyZWRGcmFtZVRpbWUpKTsKICAgICBUZXh0UnVuIHJ1bih0ZXh0KTsKICAgICBmbG9hdCB0ZXh0 V2lkdGggPSBtX21lZGl1bUZvbnQtPndpZHRoKHJ1bikgKyAyLjBmOwotICAgIGZsb2F0IGdyYXBo V2lkdGggPSBrUHJlc2VudEhpc3RvcnlTaXplOworICAgIGZsb2F0IGdyYXBoV2lkdGggPSBrQmVn aW5GcmFtZUhpc3RvcnlTaXplOwogCiAgICAgLy8gRHJhdyBiYWNrZ3JvdW5kLgogICAgIGN0eC0+ c2V0RmlsbENvbG9yKENvbG9yKDAsIDAsIDAsIDI1NSksIENvbG9yU3BhY2VEZXZpY2VSR0IpOwpA QCAtMTg3LDkgKzE4Nyw5IEBAIHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhd0ZQU0NvdW50ZXIo R3JhcGhpY3NDb250ZXh0KiBjdHgsIGludCB0b3AsIGludCBoZWlnaHQpCiAgICAgSW50UG9pbnQg cHJldigtMSwgMCk7CiAgICAgaW50IHggPSAwOwogICAgIGRvdWJsZSBoID0gc3RhdGljX2Nhc3Q8 ZG91YmxlPihoZWlnaHQgLSAyKTsKLSAgICBmb3IgKGludCBpID0gbV9jdXJyZW50RnJhbWVOdW1i ZXIgJSBrUHJlc2VudEhpc3RvcnlTaXplOyBpICE9IChtX2N1cnJlbnRGcmFtZU51bWJlciAtIDEp ICUga1ByZXNlbnRIaXN0b3J5U2l6ZTsgaSA9IChpICsgMSkgJSBrUHJlc2VudEhpc3RvcnlTaXpl KSB7Ci0gICAgICAgIGludCBqID0gKGkgKyAxKSAlIGtQcmVzZW50SGlzdG9yeVNpemU7Ci0gICAg ICAgIGRvdWJsZSBmcHMgPSAxLjAgLyAobV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1tqXSAtIG1f cHJlc2VudFRpbWVIaXN0b3J5SW5TZWNbaV0pOworICAgIGZvciAoaW50IGkgPSBtX2N1cnJlbnRG cmFtZU51bWJlciAlIGtCZWdpbkZyYW1lSGlzdG9yeVNpemU7IGkgIT0gKG1fY3VycmVudEZyYW1l TnVtYmVyIC0gMSkgJSBrQmVnaW5GcmFtZUhpc3RvcnlTaXplOyBpID0gKGkgKyAxKSAlIGtCZWdp bkZyYW1lSGlzdG9yeVNpemUpIHsKKyAgICAgICAgaW50IGogPSAoaSArIDEpICUga0JlZ2luRnJh bWVIaXN0b3J5U2l6ZTsKKyAgICAgICAgZG91YmxlIGZwcyA9IDEuMCAvIChtX2JlZ2luVGltZUhp c3RvcnlJblNlY1tqXSAtIG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjW2ldKTsKICAgICAgICAgZG91 YmxlIHAgPSAxIC0gKChmcHMgLSBsb0ZQUykgLyAoaGlGUFMgLSBsb0ZQUykpOwogICAgICAgICBp ZiAocCA8IDApCiAgICAgICAgICAgICBwID0gMDsKQEAgLTIxNiw5ICsyMTYsMTMgQEAgdm9pZCBD Q0hlYWRzVXBEaXNwbGF5OjpkcmF3UGxhdGZvcm1MYXllclRyZWUoR3JhcGhpY3NDb250ZXh0KiBj dHgsIGludCB0b3ApCiAgICAgfQogfQogCit2b2lkIENDSGVhZHNVcERpc3BsYXk6Om9uRnJhbWVC ZWdpbihkb3VibGUgdGltZXN0YW1wKQoreworICAgIG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjW21f Y3VycmVudEZyYW1lTnVtYmVyICUga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZV0gPSB0aW1lc3RhbXA7 Cit9CisKIHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6b25QcmVzZW50KCkKIHsKLSAgICBtX3ByZXNl bnRUaW1lSGlzdG9yeUluU2VjW21fY3VycmVudEZyYW1lTnVtYmVyICUga1ByZXNlbnRIaXN0b3J5 U2l6ZV0gPSBjdXJyZW50VGltZSgpOwogICAgIG1fY3VycmVudEZyYW1lTnVtYmVyICs9IDE7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDSGVhZHNVcERpc3BsYXkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuaAppbmRleCBmYzY4ZjFkNjU0NDBkMTFjOGI1 NzEyYWI1NTgwOWYzZWIzYWNhMzhlLi5hMDlmZDE1M2I4OGUyNDg0ZGE5MjIzZjI2ZDIyMDI2OGI2 YmUyMjIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5oCkBAIC00OSw2ICs0OSw3IEBA IHB1YmxpYzoKIAogICAgIH5DQ0hlYWRzVXBEaXNwbGF5KCk7CiAKKyAgICB2b2lkIG9uRnJhbWVC ZWdpbihkb3VibGUgdGltZXN0YW1wKTsKICAgICB2b2lkIG9uUHJlc2VudCgpOwogCiAgICAgdm9p ZCBzZXRTaG93RlBTQ291bnRlcihib29sIGVuYWJsZSkgeyBtX3Nob3dGUFNDb3VudGVyID0gZW5h YmxlOyB9CkBAIC03Nyw4ICs3OCw4IEBAIHByaXZhdGU6CiAKICAgICBMYXllclJlbmRlcmVyQ2hy b21pdW0qIG1fbGF5ZXJSZW5kZXJlcjsKIAotICAgIHN0YXRpYyBjb25zdCBpbnQga1ByZXNlbnRI aXN0b3J5U2l6ZSA9IDY0OwotICAgIGRvdWJsZSBtX3ByZXNlbnRUaW1lSGlzdG9yeUluU2VjW2tQ cmVzZW50SGlzdG9yeVNpemVdOworICAgIHN0YXRpYyBjb25zdCBpbnQga0JlZ2luRnJhbWVIaXN0 b3J5U2l6ZSA9IDY0OworICAgIGRvdWJsZSBtX2JlZ2luVGltZUhpc3RvcnlJblNlY1trQmVnaW5G cmFtZUhpc3RvcnlTaXplXTsKIAogICAgIGJvb2wgbV9zaG93RlBTQ291bnRlcjsKICAgICBib29s IG1fc2hvd1BsYXRmb3JtTGF5ZXJUcmVlOwo= 91508 2011-04-28 10:00:51 -0700 2011-04-28 12:50:46 -0700 Patch bug-59668-20110428100050.patch text/plain 7319 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODQ1ODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjI0NTFiN2I1YjU3YjJl NDQ5MmExN2I3N2I0M2MwNGVhYzFkYTY2Li5iM2FkNGYxN2Y0YWY3ZjQwMjU3MWRiM2MyNTQxZGJi MDU3MmFiNWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMjcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQ29tcHV0ZSBjb21wb3NpdG9yIGZwcyB2YWx1 ZSBhbmQgaGlzdG9yeSB1c2luZyB0aGUgZnJhbWVCZWdpbiB0aW1lc3RhbXAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NjY4CisKKyAgICAgICAgVGhp cyBjaGFuZ2Ugc3dpdGNoZXMgdGhlIGNvbXBvc2l0b3IgRlBTIG1ldGVyIHRvIHVzZSB0aGUgdGlt ZXN0YW1wIG9mIHRoZQorICAgICAgICBiZWdpbm5pbmcgb2YgdGhlIGZyYW1lIHJhdGhlciB0aGFu IHRoZSB0aW1lIHdlIGNhbGwgc3dhcEJ1ZmZlcnMuIFdoZW4gc2NoZXVkbGluZyBpcworICAgICAg ICBjb3JyZWN0bHkgdGllZCB0byB2c3luYywgd2UgY2FuIGhhdmUgaGlnaGx5IHZhcmlhYmxlIHRp bWVzIHdoZW4gd2UgZmluaXNoIHZzeW5jIGFuZCAKKyAgICAgICAgc3RpbGwgaGF2ZSBzdGFibGUg ZnJhbWUgcmF0ZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNo cm9taXVtOjp1cGRhdGVBbmREcmF3TGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkND SGVhZHNVcERpc3BsYXk6OkNDSGVhZHNVcERpc3BsYXkpOgorICAgICAgICAoV2ViQ29yZTo6Q0NI ZWFkc1VwRGlzcGxheTo6ZHJhd0ZQU0NvdW50ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0NIZWFk c1VwRGlzcGxheTo6b25GcmFtZUJlZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkNDSGVhZHNVcERp c3BsYXk6Om9uUHJlc2VudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NIZWFkc1VwRGlzcGxheS5oOgorCiAyMDExLTA0LTIxICBWYW5nZWxpcyBLb2trZXZpcyAg PHZhbmdlbGlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2Jp bnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IGU2MmI2NzQx YTkzYjhjYzE3ZWI0ZTFmODEyY2E3ZTlkZjU1MTU4YmUuLjg1ODNlMGQyNDRjOTYwZDg5ZjIxOTRl ZDI1NTNlNTliZjk2MzkxMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNw cApAQCAtNTMsNiArNTMsNyBAQAogI2VsaWYgVVNFKENHKQogI2luY2x1ZGUgPENvcmVHcmFwaGlj cy9DR0JpdG1hcENvbnRleHQuaD4KICNlbmRpZgorI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE5MSw2ICsxOTIsOSBAQCB2b2lkIExheWVy UmVuZGVyZXJDaHJvbWl1bTo6c2V0Vmlld3BvcnQoY29uc3QgSW50UmVjdCYgdmlzaWJsZVJlY3Qs IGNvbnN0IEludFJlYwogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlQW5kRHJh d0xheWVycygpCiB7CisgICAgLy8gRklYTUU6IHVzZSB0aGUgZnJhbWUgYmVnaW4gdGltZSBmcm9t IHRoZSBvdmVyYWxsIGNvbXBvc2l0b3Igc2NoZWR1bGVyLgorICAgIC8vIFRoaXMgdmFsdWUgaXMg Y3VycmVudGx5IGluYWNjZXNzaWJsZSBiZWNhdXNlIGl0IGlzIHVwIGluIFJlbmRlcldpZGdldC4K KyAgICBtX2hlYWRzVXBEaXNwbGF5LT5vbkZyYW1lQmVnaW4oY3VycmVudFRpbWUoKSk7CiAgICAg QVNTRVJUKG1faGFyZHdhcmVDb21wb3NpdGluZyk7CiAKICAgICBpZiAoIW1fcm9vdExheWVyKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NIZWFkc1VwRGlzcGxheS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcAppbmRleCBjYjI4NzRkZDI5MzVjOWE1MWQ3 YTllY2Q3MGJjMGVmMGE3ZGIzNjU4Li45MWY4ZDRlOWQwZWExZmYxOGY1ZThiYTdhZmQ5ZDAxZWE3 ZGNkZWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcApAQCAtMjcsNyArMjcs NiBAQAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICNpbmNsdWRlICJDQ0hlYWRz VXBEaXNwbGF5LmgiCiAKLSNpbmNsdWRlICJDdXJyZW50VGltZS5oIgogI2luY2x1ZGUgIkZvbnQu aCIKICNpbmNsdWRlICJGb250RGVzY3JpcHRpb24uaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRl eHQzRC5oIgpAQCAtMzcsNiArMzYsNyBAQAogI2luY2x1ZGUgIlRleHRSdW4uaCIKICNpbmNsdWRl ICJUZXh0U3RyZWFtLmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hbmFnZXIuaCIKKyNpbmNsdWRlIDx3 dGYvQ3VycmVudFRpbWUuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVk ZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTUxLDEwICs1MSwxMCBAQCBDQ0hlYWRzVXBE aXNwbGF5OjpDQ0hlYWRzVXBEaXNwbGF5KExheWVyUmVuZGVyZXJDaHJvbWl1bSogb3duZXIpCiAg ICAgLCBtX3Nob3dGUFNDb3VudGVyKGZhbHNlKQogICAgICwgbV9zaG93UGxhdGZvcm1MYXllclRy ZWUoZmFsc2UpCiB7Ci0gICAgbV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1swXSA9IGN1cnJlbnRU aW1lKCk7Ci0gICAgbV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1sxXSA9IG1fcHJlc2VudFRpbWVI aXN0b3J5SW5TZWNbMF07Ci0gICAgZm9yIChpbnQgaSA9IDI7IGkgPCBrUHJlc2VudEhpc3RvcnlT aXplOyBpKyspCi0gICAgICAgIG1fcHJlc2VudFRpbWVIaXN0b3J5SW5TZWNbaV0gPSAwOworICAg IG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjWzBdID0gY3VycmVudFRpbWUoKTsKKyAgICBtX2JlZ2lu VGltZUhpc3RvcnlJblNlY1sxXSA9IG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjWzBdOworICAgIGZv ciAoaW50IGkgPSAyOyBpIDwga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZTsgaSsrKQorICAgICAgICBt X2JlZ2luVGltZUhpc3RvcnlJblNlY1tpXSA9IDA7CiAKICAgICBGb250RGVzY3JpcHRpb24gbWVk aXVtRm9udERlc2M7CiAgICAgbWVkaXVtRm9udERlc2Muc2V0R2VuZXJpY0ZhbWlseShGb250RGVz Y3JpcHRpb246Ok1vbm9zcGFjZUZhbWlseSk7CkBAIC0xNTEsOCArMTUxLDggQEAgdm9pZCBDQ0hl YWRzVXBEaXNwbGF5OjpkcmF3RlBTQ291bnRlcihHcmFwaGljc0NvbnRleHQqIGN0eCwgaW50IHRv cCwgaW50IGhlaWdodCkKIHsKICAgICAvLyBOb3RlIHRoYXQgc2luY2Ugd2UgaGF2ZW4ndCBmaW5p c2hlZCB0aGUgY3VycmVudCBmcmFtZSwgdGhlIEZQUyBjb3VudGVyCiAgICAgLy8gYWN0dWFsbHkg cmVwb3J0cyB0aGUgbGFzdCBmcmFtZSdzIHRpbWUuCi0gICAgZG91YmxlIHNlY0Zvckxhc3RGcmFt ZSA9IG1fcHJlc2VudFRpbWVIaXN0b3J5SW5TZWNbKG1fY3VycmVudEZyYW1lTnVtYmVyICsga1By ZXNlbnRIaXN0b3J5U2l6ZSAtIDEpICUga1ByZXNlbnRIaXN0b3J5U2l6ZV0gLQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBtX3ByZXNlbnRUaW1lSGlzdG9yeUluU2VjWyhtX2N1cnJlbnRG cmFtZU51bWJlciArIGtQcmVzZW50SGlzdG9yeVNpemUgLSAyKSAlIGtQcmVzZW50SGlzdG9yeVNp emVdOworICAgIGRvdWJsZSBzZWNGb3JMYXN0RnJhbWUgPSBtX2JlZ2luVGltZUhpc3RvcnlJblNl Y1sobV9jdXJyZW50RnJhbWVOdW1iZXIgKyBrQmVnaW5GcmFtZUhpc3RvcnlTaXplIC0gMSkgJSBr QmVnaW5GcmFtZUhpc3RvcnlTaXplXSAtCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1f YmVnaW5UaW1lSGlzdG9yeUluU2VjWyhtX2N1cnJlbnRGcmFtZU51bWJlciArIGtCZWdpbkZyYW1l SGlzdG9yeVNpemUgLSAyKSAlIGtCZWdpbkZyYW1lSGlzdG9yeVNpemVdOwogCiAgICAgLy8gRmls dGVyIHRoZSBmcmFtZSB0aW1lcyB0byBhdm9pZCBzcGlrZXMuCiAgICAgY29uc3QgZmxvYXQgYWxw aGEgPSAwLjE7CkBAIC0xNjYsNyArMTY2LDcgQEAgdm9pZCBDQ0hlYWRzVXBEaXNwbGF5OjpkcmF3 RlBTQ291bnRlcihHcmFwaGljc0NvbnRleHQqIGN0eCwgaW50IHRvcCwgaW50IGhlaWdodCkKICAg ICBTdHJpbmcgdGV4dChTdHJpbmc6OmZvcm1hdCgiRlBTOiAlNS4xZiIsIDEuMCAvIG1fZmlsdGVy ZWRGcmFtZVRpbWUpKTsKICAgICBUZXh0UnVuIHJ1bih0ZXh0KTsKICAgICBmbG9hdCB0ZXh0V2lk dGggPSBtX21lZGl1bUZvbnQtPndpZHRoKHJ1bikgKyAyLjBmOwotICAgIGZsb2F0IGdyYXBoV2lk dGggPSBrUHJlc2VudEhpc3RvcnlTaXplOworICAgIGZsb2F0IGdyYXBoV2lkdGggPSBrQmVnaW5G cmFtZUhpc3RvcnlTaXplOwogCiAgICAgLy8gRHJhdyBiYWNrZ3JvdW5kLgogICAgIGN0eC0+c2V0 RmlsbENvbG9yKENvbG9yKDAsIDAsIDAsIDI1NSksIENvbG9yU3BhY2VEZXZpY2VSR0IpOwpAQCAt MTg3LDkgKzE4Nyw5IEBAIHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhd0ZQU0NvdW50ZXIoR3Jh cGhpY3NDb250ZXh0KiBjdHgsIGludCB0b3AsIGludCBoZWlnaHQpCiAgICAgSW50UG9pbnQgcHJl digtMSwgMCk7CiAgICAgaW50IHggPSAwOwogICAgIGRvdWJsZSBoID0gc3RhdGljX2Nhc3Q8ZG91 YmxlPihoZWlnaHQgLSAyKTsKLSAgICBmb3IgKGludCBpID0gbV9jdXJyZW50RnJhbWVOdW1iZXIg JSBrUHJlc2VudEhpc3RvcnlTaXplOyBpICE9IChtX2N1cnJlbnRGcmFtZU51bWJlciAtIDEpICUg a1ByZXNlbnRIaXN0b3J5U2l6ZTsgaSA9IChpICsgMSkgJSBrUHJlc2VudEhpc3RvcnlTaXplKSB7 Ci0gICAgICAgIGludCBqID0gKGkgKyAxKSAlIGtQcmVzZW50SGlzdG9yeVNpemU7Ci0gICAgICAg IGRvdWJsZSBmcHMgPSAxLjAgLyAobV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1tqXSAtIG1fcHJl c2VudFRpbWVIaXN0b3J5SW5TZWNbaV0pOworICAgIGZvciAoaW50IGkgPSBtX2N1cnJlbnRGcmFt ZU51bWJlciAlIGtCZWdpbkZyYW1lSGlzdG9yeVNpemU7IGkgIT0gKG1fY3VycmVudEZyYW1lTnVt YmVyIC0gMSkgJSBrQmVnaW5GcmFtZUhpc3RvcnlTaXplOyBpID0gKGkgKyAxKSAlIGtCZWdpbkZy YW1lSGlzdG9yeVNpemUpIHsKKyAgICAgICAgaW50IGogPSAoaSArIDEpICUga0JlZ2luRnJhbWVI aXN0b3J5U2l6ZTsKKyAgICAgICAgZG91YmxlIGZwcyA9IDEuMCAvIChtX2JlZ2luVGltZUhpc3Rv cnlJblNlY1tqXSAtIG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjW2ldKTsKICAgICAgICAgZG91Ymxl IHAgPSAxIC0gKChmcHMgLSBsb0ZQUykgLyAoaGlGUFMgLSBsb0ZQUykpOwogICAgICAgICBpZiAo cCA8IDApCiAgICAgICAgICAgICBwID0gMDsKQEAgLTIxNiw5ICsyMTYsMTMgQEAgdm9pZCBDQ0hl YWRzVXBEaXNwbGF5OjpkcmF3UGxhdGZvcm1MYXllclRyZWUoR3JhcGhpY3NDb250ZXh0KiBjdHgs IGludCB0b3ApCiAgICAgfQogfQogCit2b2lkIENDSGVhZHNVcERpc3BsYXk6Om9uRnJhbWVCZWdp bihkb3VibGUgdGltZXN0YW1wKQoreworICAgIG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjW21fY3Vy cmVudEZyYW1lTnVtYmVyICUga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZV0gPSB0aW1lc3RhbXA7Cit9 CisKIHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6b25QcmVzZW50KCkKIHsKLSAgICBtX3ByZXNlbnRU aW1lSGlzdG9yeUluU2VjW21fY3VycmVudEZyYW1lTnVtYmVyICUga1ByZXNlbnRIaXN0b3J5U2l6 ZV0gPSBjdXJyZW50VGltZSgpOwogICAgIG1fY3VycmVudEZyYW1lTnVtYmVyICs9IDE7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDSGVhZHNVcERpc3BsYXkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuaAppbmRleCBmYzY4ZjFkNjU0NDBkMTFjOGI1NzEy YWI1NTgwOWYzZWIzYWNhMzhlLi5hMDlmZDE1M2I4OGUyNDg0ZGE5MjIzZjI2ZDIyMDI2OGI2YmUy MjIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5oCkBAIC00OSw2ICs0OSw3IEBAIHB1 YmxpYzoKIAogICAgIH5DQ0hlYWRzVXBEaXNwbGF5KCk7CiAKKyAgICB2b2lkIG9uRnJhbWVCZWdp bihkb3VibGUgdGltZXN0YW1wKTsKICAgICB2b2lkIG9uUHJlc2VudCgpOwogCiAgICAgdm9pZCBz ZXRTaG93RlBTQ291bnRlcihib29sIGVuYWJsZSkgeyBtX3Nob3dGUFNDb3VudGVyID0gZW5hYmxl OyB9CkBAIC03Nyw4ICs3OCw4IEBAIHByaXZhdGU6CiAKICAgICBMYXllclJlbmRlcmVyQ2hyb21p dW0qIG1fbGF5ZXJSZW5kZXJlcjsKIAotICAgIHN0YXRpYyBjb25zdCBpbnQga1ByZXNlbnRIaXN0 b3J5U2l6ZSA9IDY0OwotICAgIGRvdWJsZSBtX3ByZXNlbnRUaW1lSGlzdG9yeUluU2VjW2tQcmVz ZW50SGlzdG9yeVNpemVdOworICAgIHN0YXRpYyBjb25zdCBpbnQga0JlZ2luRnJhbWVIaXN0b3J5 U2l6ZSA9IDY0OworICAgIGRvdWJsZSBtX2JlZ2luVGltZUhpc3RvcnlJblNlY1trQmVnaW5GcmFt ZUhpc3RvcnlTaXplXTsKIAogICAgIGJvb2wgbV9zaG93RlBTQ291bnRlcjsKICAgICBib29sIG1f c2hvd1BsYXRmb3JtTGF5ZXJUcmVlOwo= 91541 2011-04-28 12:50:54 -0700 2011-04-28 14:10:46 -0700 Patch bug-59668-20110428125048.patch text/plain 7348 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODQ1ODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjI0NTFiN2I1YjU3YjJl NDQ5MmExN2I3N2I0M2MwNGVhYzFkYTY2Li44ZDU5MWZhMTkxYWYxOWViODZhZDg1OGU0NWM5MTRj MDZmMzZjNjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDQtMjcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQ29tcHV0ZSBjb21wb3NpdG9yIGZwcyB2YWx1 ZSBhbmQgaGlzdG9yeSB1c2luZyB0aGUgZnJhbWVCZWdpbiB0aW1lc3RhbXAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NjY4CisKKyAgICAgICAgVGhp cyBjaGFuZ2Ugc3dpdGNoZXMgdGhlIGNvbXBvc2l0b3IgRlBTIG1ldGVyIHRvIHVzZSB0aGUgdGlt ZXN0YW1wCisgICAgICAgIG9mIHRoZSBiZWdpbm5pbmcgb2YgdGhlIGZyYW1lIHJhdGhlciB0aGFu IHRoZSB0aW1lIHdlIGNhbGwKKyAgICAgICAgc3dhcEJ1ZmZlcnMuIFdoZW4gc2NoZWR1bGluZyBp cyBjb3JyZWN0bHkgdGllZCB0byB2c3luYywgd2UgY2FuCisgICAgICAgIGhhdmUgaGlnaGx5IHZh cmlhYmxlIHRpbWVzIHdoZW4gd2UgZmluaXNoIHZzeW5jIGFuZCBzdGlsbCBoYXZlCisgICAgICAg IHN0YWJsZSBmcmFtZSByYXRlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJl bmRlcmVyQ2hyb21pdW06OnVwZGF0ZUFuZERyYXdMYXllcnMpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NIZWFkc1VwRGlzcGxheTo6Q0NIZWFkc1VwRGlzcGxheSk6CisgICAgICAgIChXZWJD b3JlOjpDQ0hlYWRzVXBEaXNwbGF5OjpkcmF3RlBTQ291bnRlcik6CisgICAgICAgIChXZWJDb3Jl OjpDQ0hlYWRzVXBEaXNwbGF5OjpvbkZyYW1lQmVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6Q0NI ZWFkc1VwRGlzcGxheTo6b25QcmVzZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5Lmg6CisKIDIwMTEtMDQtMjEgIFZhbmdlbGlzIEtv a2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEph bWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXgg ZTYyYjY3NDFhOTNiOGNjMTdlYjRlMWY4MTJjYTdlOWRmNTUxNThiZS4uNDRmYzg2Y2I3MzVhNzdk YzgxNDZiMjEzMzE2OGI0YmY2OTFhZjczNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uY3BwCkBAIC01Myw2ICs1Myw3IEBACiAjZWxpZiBVU0UoQ0cpCiAjaW5jbHVkZSA8Q29y ZUdyYXBoaWNzL0NHQml0bWFwQ29udGV4dC5oPgogI2VuZGlmCisjaW5jbHVkZSA8d3RmL0N1cnJl bnRUaW1lLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMTkxLDYgKzE5MiwxMCBAQCB2 b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6c2V0Vmlld3BvcnQoY29uc3QgSW50UmVjdCYgdmlz aWJsZVJlY3QsIGNvbnN0IEludFJlYwogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBk YXRlQW5kRHJhd0xheWVycygpCiB7CisgICAgLy8gRklYTUU6IHVzZSB0aGUgZnJhbWUgYmVnaW4g dGltZSBmcm9tIHRoZSBvdmVyYWxsIGNvbXBvc2l0b3Igc2NoZWR1bGVyLgorICAgIC8vIFRoaXMg dmFsdWUgaXMgY3VycmVudGx5IGluYWNjZXNzaWJsZSBiZWNhdXNlIGl0IGlzIHVwIGluIENocm9t aXV1bSdzCisgICAgLy8gUmVuZGVyV2lkZ2V0LgorICAgIG1faGVhZHNVcERpc3BsYXktPm9uRnJh bWVCZWdpbihjdXJyZW50VGltZSgpKTsKICAgICBBU1NFUlQobV9oYXJkd2FyZUNvbXBvc2l0aW5n KTsKIAogICAgIGlmICghbV9yb290TGF5ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXku Y3BwCmluZGV4IGNiMjg3NGRkMjkzNWM5YTUxZDdhOWVjZDcwYmMwZWYwYTdkYjM2NTguLjkxZjhk NGU5ZDBlYTFmZjE4ZjVlOGJhN2FmZDlkMDFlYTdkY2RlY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVh ZHNVcERpc3BsYXkuY3BwCkBAIC0yNyw3ICsyNyw2IEBACiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NP TVBPU0lUSU5HKQogI2luY2x1ZGUgIkNDSGVhZHNVcERpc3BsYXkuaCIKIAotI2luY2x1ZGUgIkN1 cnJlbnRUaW1lLmgiCiAjaW5jbHVkZSAiRm9udC5oIgogI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlv bi5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCkBAIC0zNyw2ICszNiw3IEBACiAj aW5jbHVkZSAiVGV4dFJ1bi5oIgogI2luY2x1ZGUgIlRleHRTdHJlYW0uaCIKICNpbmNsdWRlICJU ZXh0dXJlTWFuYWdlci5oIgorI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogI2luY2x1ZGUg PHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApA QCAtNTEsMTAgKzUxLDEwIEBAIENDSGVhZHNVcERpc3BsYXk6OkNDSGVhZHNVcERpc3BsYXkoTGF5 ZXJSZW5kZXJlckNocm9taXVtKiBvd25lcikKICAgICAsIG1fc2hvd0ZQU0NvdW50ZXIoZmFsc2Up CiAgICAgLCBtX3Nob3dQbGF0Zm9ybUxheWVyVHJlZShmYWxzZSkKIHsKLSAgICBtX3ByZXNlbnRU aW1lSGlzdG9yeUluU2VjWzBdID0gY3VycmVudFRpbWUoKTsKLSAgICBtX3ByZXNlbnRUaW1lSGlz dG9yeUluU2VjWzFdID0gbV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1swXTsKLSAgICBmb3IgKGlu dCBpID0gMjsgaSA8IGtQcmVzZW50SGlzdG9yeVNpemU7IGkrKykKLSAgICAgICAgbV9wcmVzZW50 VGltZUhpc3RvcnlJblNlY1tpXSA9IDA7CisgICAgbV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbMF0g PSBjdXJyZW50VGltZSgpOworICAgIG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjWzFdID0gbV9iZWdp blRpbWVIaXN0b3J5SW5TZWNbMF07CisgICAgZm9yIChpbnQgaSA9IDI7IGkgPCBrQmVnaW5GcmFt ZUhpc3RvcnlTaXplOyBpKyspCisgICAgICAgIG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjW2ldID0g MDsKIAogICAgIEZvbnREZXNjcmlwdGlvbiBtZWRpdW1Gb250RGVzYzsKICAgICBtZWRpdW1Gb250 RGVzYy5zZXRHZW5lcmljRmFtaWx5KEZvbnREZXNjcmlwdGlvbjo6TW9ub3NwYWNlRmFtaWx5KTsK QEAgLTE1MSw4ICsxNTEsOCBAQCB2b2lkIENDSGVhZHNVcERpc3BsYXk6OmRyYXdGUFNDb3VudGVy KEdyYXBoaWNzQ29udGV4dCogY3R4LCBpbnQgdG9wLCBpbnQgaGVpZ2h0KQogewogICAgIC8vIE5v dGUgdGhhdCBzaW5jZSB3ZSBoYXZlbid0IGZpbmlzaGVkIHRoZSBjdXJyZW50IGZyYW1lLCB0aGUg RlBTIGNvdW50ZXIKICAgICAvLyBhY3R1YWxseSByZXBvcnRzIHRoZSBsYXN0IGZyYW1lJ3MgdGlt ZS4KLSAgICBkb3VibGUgc2VjRm9yTGFzdEZyYW1lID0gbV9wcmVzZW50VGltZUhpc3RvcnlJblNl Y1sobV9jdXJyZW50RnJhbWVOdW1iZXIgKyBrUHJlc2VudEhpc3RvcnlTaXplIC0gMSkgJSBrUHJl c2VudEhpc3RvcnlTaXplXSAtCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcHJlc2Vu dFRpbWVIaXN0b3J5SW5TZWNbKG1fY3VycmVudEZyYW1lTnVtYmVyICsga1ByZXNlbnRIaXN0b3J5 U2l6ZSAtIDIpICUga1ByZXNlbnRIaXN0b3J5U2l6ZV07CisgICAgZG91YmxlIHNlY0Zvckxhc3RG cmFtZSA9IG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjWyhtX2N1cnJlbnRGcmFtZU51bWJlciArIGtC ZWdpbkZyYW1lSGlzdG9yeVNpemUgLSAxKSAlIGtCZWdpbkZyYW1lSGlzdG9yeVNpemVdIC0KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbKG1fY3Vy cmVudEZyYW1lTnVtYmVyICsga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZSAtIDIpICUga0JlZ2luRnJh bWVIaXN0b3J5U2l6ZV07CiAKICAgICAvLyBGaWx0ZXIgdGhlIGZyYW1lIHRpbWVzIHRvIGF2b2lk IHNwaWtlcy4KICAgICBjb25zdCBmbG9hdCBhbHBoYSA9IDAuMTsKQEAgLTE2Niw3ICsxNjYsNyBA QCB2b2lkIENDSGVhZHNVcERpc3BsYXk6OmRyYXdGUFNDb3VudGVyKEdyYXBoaWNzQ29udGV4dCog Y3R4LCBpbnQgdG9wLCBpbnQgaGVpZ2h0KQogICAgIFN0cmluZyB0ZXh0KFN0cmluZzo6Zm9ybWF0 KCJGUFM6ICU1LjFmIiwgMS4wIC8gbV9maWx0ZXJlZEZyYW1lVGltZSkpOwogICAgIFRleHRSdW4g cnVuKHRleHQpOwogICAgIGZsb2F0IHRleHRXaWR0aCA9IG1fbWVkaXVtRm9udC0+d2lkdGgocnVu KSArIDIuMGY7Ci0gICAgZmxvYXQgZ3JhcGhXaWR0aCA9IGtQcmVzZW50SGlzdG9yeVNpemU7Cisg ICAgZmxvYXQgZ3JhcGhXaWR0aCA9IGtCZWdpbkZyYW1lSGlzdG9yeVNpemU7CiAKICAgICAvLyBE cmF3IGJhY2tncm91bmQuCiAgICAgY3R4LT5zZXRGaWxsQ29sb3IoQ29sb3IoMCwgMCwgMCwgMjU1 KSwgQ29sb3JTcGFjZURldmljZVJHQik7CkBAIC0xODcsOSArMTg3LDkgQEAgdm9pZCBDQ0hlYWRz VXBEaXNwbGF5OjpkcmF3RlBTQ291bnRlcihHcmFwaGljc0NvbnRleHQqIGN0eCwgaW50IHRvcCwg aW50IGhlaWdodCkKICAgICBJbnRQb2ludCBwcmV2KC0xLCAwKTsKICAgICBpbnQgeCA9IDA7CiAg ICAgZG91YmxlIGggPSBzdGF0aWNfY2FzdDxkb3VibGU+KGhlaWdodCAtIDIpOwotICAgIGZvciAo aW50IGkgPSBtX2N1cnJlbnRGcmFtZU51bWJlciAlIGtQcmVzZW50SGlzdG9yeVNpemU7IGkgIT0g KG1fY3VycmVudEZyYW1lTnVtYmVyIC0gMSkgJSBrUHJlc2VudEhpc3RvcnlTaXplOyBpID0gKGkg KyAxKSAlIGtQcmVzZW50SGlzdG9yeVNpemUpIHsKLSAgICAgICAgaW50IGogPSAoaSArIDEpICUg a1ByZXNlbnRIaXN0b3J5U2l6ZTsKLSAgICAgICAgZG91YmxlIGZwcyA9IDEuMCAvIChtX3ByZXNl bnRUaW1lSGlzdG9yeUluU2VjW2pdIC0gbV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1tpXSk7Cisg ICAgZm9yIChpbnQgaSA9IG1fY3VycmVudEZyYW1lTnVtYmVyICUga0JlZ2luRnJhbWVIaXN0b3J5 U2l6ZTsgaSAhPSAobV9jdXJyZW50RnJhbWVOdW1iZXIgLSAxKSAlIGtCZWdpbkZyYW1lSGlzdG9y eVNpemU7IGkgPSAoaSArIDEpICUga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZSkgeworICAgICAgICBp bnQgaiA9IChpICsgMSkgJSBrQmVnaW5GcmFtZUhpc3RvcnlTaXplOworICAgICAgICBkb3VibGUg ZnBzID0gMS4wIC8gKG1fYmVnaW5UaW1lSGlzdG9yeUluU2VjW2pdIC0gbV9iZWdpblRpbWVIaXN0 b3J5SW5TZWNbaV0pOwogICAgICAgICBkb3VibGUgcCA9IDEgLSAoKGZwcyAtIGxvRlBTKSAvICho aUZQUyAtIGxvRlBTKSk7CiAgICAgICAgIGlmIChwIDwgMCkKICAgICAgICAgICAgIHAgPSAwOwpA QCAtMjE2LDkgKzIxNiwxMyBAQCB2b2lkIENDSGVhZHNVcERpc3BsYXk6OmRyYXdQbGF0Zm9ybUxh eWVyVHJlZShHcmFwaGljc0NvbnRleHQqIGN0eCwgaW50IHRvcCkKICAgICB9CiB9CiAKK3ZvaWQg Q0NIZWFkc1VwRGlzcGxheTo6b25GcmFtZUJlZ2luKGRvdWJsZSB0aW1lc3RhbXApCit7CisgICAg bV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbbV9jdXJyZW50RnJhbWVOdW1iZXIgJSBrQmVnaW5GcmFt ZUhpc3RvcnlTaXplXSA9IHRpbWVzdGFtcDsKK30KKwogdm9pZCBDQ0hlYWRzVXBEaXNwbGF5Ojpv blByZXNlbnQoKQogewotICAgIG1fcHJlc2VudFRpbWVIaXN0b3J5SW5TZWNbbV9jdXJyZW50RnJh bWVOdW1iZXIgJSBrUHJlc2VudEhpc3RvcnlTaXplXSA9IGN1cnJlbnRUaW1lKCk7CiAgICAgbV9j dXJyZW50RnJhbWVOdW1iZXIgKz0gMTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5o CmluZGV4IGZjNjhmMWQ2NTQ0MGQxMWM4YjU3MTJhYjU1ODA5ZjNlYjNhY2EzOGUuLmEwOWZkMTUz Yjg4ZTI0ODRkYTkyMjNmMjZkMjIwMjY4YjZiZTIyMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBE aXNwbGF5LmgKQEAgLTQ5LDYgKzQ5LDcgQEAgcHVibGljOgogCiAgICAgfkNDSGVhZHNVcERpc3Bs YXkoKTsKIAorICAgIHZvaWQgb25GcmFtZUJlZ2luKGRvdWJsZSB0aW1lc3RhbXApOwogICAgIHZv aWQgb25QcmVzZW50KCk7CiAKICAgICB2b2lkIHNldFNob3dGUFNDb3VudGVyKGJvb2wgZW5hYmxl KSB7IG1fc2hvd0ZQU0NvdW50ZXIgPSBlbmFibGU7IH0KQEAgLTc3LDggKzc4LDggQEAgcHJpdmF0 ZToKIAogICAgIExheWVyUmVuZGVyZXJDaHJvbWl1bSogbV9sYXllclJlbmRlcmVyOwogCi0gICAg c3RhdGljIGNvbnN0IGludCBrUHJlc2VudEhpc3RvcnlTaXplID0gNjQ7Ci0gICAgZG91YmxlIG1f cHJlc2VudFRpbWVIaXN0b3J5SW5TZWNba1ByZXNlbnRIaXN0b3J5U2l6ZV07CisgICAgc3RhdGlj IGNvbnN0IGludCBrQmVnaW5GcmFtZUhpc3RvcnlTaXplID0gNjQ7CisgICAgZG91YmxlIG1fYmVn aW5UaW1lSGlzdG9yeUluU2VjW2tCZWdpbkZyYW1lSGlzdG9yeVNpemVdOwogCiAgICAgYm9vbCBt X3Nob3dGUFNDb3VudGVyOwogICAgIGJvb2wgbV9zaG93UGxhdGZvcm1MYXllclRyZWU7Cg== 91551 2011-04-28 14:10:49 -0700 2011-04-28 16:50:06 -0700 chromiuuuuuuuuuuuuuuuuum ftw bug-59668-20110428141048.patch text/plain 7347 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODQ1ODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjI0NTFiN2I1YjU3YjJl NDQ5MmExN2I3N2I0M2MwNGVhYzFkYTY2Li44ZDU5MWZhMTkxYWYxOWViODZhZDg1OGU0NWM5MTRj MDZmMzZjNjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDQtMjcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQ29tcHV0ZSBjb21wb3NpdG9yIGZwcyB2YWx1 ZSBhbmQgaGlzdG9yeSB1c2luZyB0aGUgZnJhbWVCZWdpbiB0aW1lc3RhbXAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NjY4CisKKyAgICAgICAgVGhp cyBjaGFuZ2Ugc3dpdGNoZXMgdGhlIGNvbXBvc2l0b3IgRlBTIG1ldGVyIHRvIHVzZSB0aGUgdGlt ZXN0YW1wCisgICAgICAgIG9mIHRoZSBiZWdpbm5pbmcgb2YgdGhlIGZyYW1lIHJhdGhlciB0aGFu IHRoZSB0aW1lIHdlIGNhbGwKKyAgICAgICAgc3dhcEJ1ZmZlcnMuIFdoZW4gc2NoZWR1bGluZyBp cyBjb3JyZWN0bHkgdGllZCB0byB2c3luYywgd2UgY2FuCisgICAgICAgIGhhdmUgaGlnaGx5IHZh cmlhYmxlIHRpbWVzIHdoZW4gd2UgZmluaXNoIHZzeW5jIGFuZCBzdGlsbCBoYXZlCisgICAgICAg IHN0YWJsZSBmcmFtZSByYXRlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJl bmRlcmVyQ2hyb21pdW06OnVwZGF0ZUFuZERyYXdMYXllcnMpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NIZWFkc1VwRGlzcGxheTo6Q0NIZWFkc1VwRGlzcGxheSk6CisgICAgICAgIChXZWJD b3JlOjpDQ0hlYWRzVXBEaXNwbGF5OjpkcmF3RlBTQ291bnRlcik6CisgICAgICAgIChXZWJDb3Jl OjpDQ0hlYWRzVXBEaXNwbGF5OjpvbkZyYW1lQmVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6Q0NI ZWFkc1VwRGlzcGxheTo6b25QcmVzZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5Lmg6CisKIDIwMTEtMDQtMjEgIFZhbmdlbGlzIEtv a2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEph bWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXgg ZTYyYjY3NDFhOTNiOGNjMTdlYjRlMWY4MTJjYTdlOWRmNTUxNThiZS4uZTJhMTNhMTAyZDJkY2M3 OTMyNzZmMzQ2ZGUwNmQ2ZjM0NjBhM2YzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uY3BwCkBAIC01Myw2ICs1Myw3IEBACiAjZWxpZiBVU0UoQ0cpCiAjaW5jbHVkZSA8Q29y ZUdyYXBoaWNzL0NHQml0bWFwQ29udGV4dC5oPgogI2VuZGlmCisjaW5jbHVkZSA8d3RmL0N1cnJl bnRUaW1lLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMTkxLDYgKzE5MiwxMCBAQCB2 b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6c2V0Vmlld3BvcnQoY29uc3QgSW50UmVjdCYgdmlz aWJsZVJlY3QsIGNvbnN0IEludFJlYwogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBk YXRlQW5kRHJhd0xheWVycygpCiB7CisgICAgLy8gRklYTUU6IHVzZSB0aGUgZnJhbWUgYmVnaW4g dGltZSBmcm9tIHRoZSBvdmVyYWxsIGNvbXBvc2l0b3Igc2NoZWR1bGVyLgorICAgIC8vIFRoaXMg dmFsdWUgaXMgY3VycmVudGx5IGluYWNjZXNzaWJsZSBiZWNhdXNlIGl0IGlzIHVwIGluIENocm9t aXVtJ3MKKyAgICAvLyBSZW5kZXJXaWRnZXQuCisgICAgbV9oZWFkc1VwRGlzcGxheS0+b25GcmFt ZUJlZ2luKGN1cnJlbnRUaW1lKCkpOwogICAgIEFTU0VSVChtX2hhcmR3YXJlQ29tcG9zaXRpbmcp OwogCiAgICAgaWYgKCFtX3Jvb3RMYXllcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5j cHAKaW5kZXggY2IyODc0ZGQyOTM1YzlhNTFkN2E5ZWNkNzBiYzBlZjBhN2RiMzY1OC4uOTFmOGQ0 ZTlkMGVhMWZmMThmNWU4YmE3YWZkOWQwMWVhN2RjZGVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFk c1VwRGlzcGxheS5jcHAKQEAgLTI3LDcgKzI3LDYgQEAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCiAjaW5jbHVkZSAiQ0NIZWFkc1VwRGlzcGxheS5oIgogCi0jaW5jbHVkZSAiQ3Vy cmVudFRpbWUuaCIKICNpbmNsdWRlICJGb250LmgiCiAjaW5jbHVkZSAiRm9udERlc2NyaXB0aW9u LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIKQEAgLTM3LDYgKzM2LDcgQEAKICNp bmNsdWRlICJUZXh0UnVuLmgiCiAjaW5jbHVkZSAiVGV4dFN0cmVhbS5oIgogI2luY2x1ZGUgIlRl eHR1cmVNYW5hZ2VyLmgiCisjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAjaW5jbHVkZSA8 d3RmL3RleHQvQ1N0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBA IC01MSwxMCArNTEsMTAgQEAgQ0NIZWFkc1VwRGlzcGxheTo6Q0NIZWFkc1VwRGlzcGxheShMYXll clJlbmRlcmVyQ2hyb21pdW0qIG93bmVyKQogICAgICwgbV9zaG93RlBTQ291bnRlcihmYWxzZSkK ICAgICAsIG1fc2hvd1BsYXRmb3JtTGF5ZXJUcmVlKGZhbHNlKQogewotICAgIG1fcHJlc2VudFRp bWVIaXN0b3J5SW5TZWNbMF0gPSBjdXJyZW50VGltZSgpOwotICAgIG1fcHJlc2VudFRpbWVIaXN0 b3J5SW5TZWNbMV0gPSBtX3ByZXNlbnRUaW1lSGlzdG9yeUluU2VjWzBdOwotICAgIGZvciAoaW50 IGkgPSAyOyBpIDwga1ByZXNlbnRIaXN0b3J5U2l6ZTsgaSsrKQotICAgICAgICBtX3ByZXNlbnRU aW1lSGlzdG9yeUluU2VjW2ldID0gMDsKKyAgICBtX2JlZ2luVGltZUhpc3RvcnlJblNlY1swXSA9 IGN1cnJlbnRUaW1lKCk7CisgICAgbV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbMV0gPSBtX2JlZ2lu VGltZUhpc3RvcnlJblNlY1swXTsKKyAgICBmb3IgKGludCBpID0gMjsgaSA8IGtCZWdpbkZyYW1l SGlzdG9yeVNpemU7IGkrKykKKyAgICAgICAgbV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbaV0gPSAw OwogCiAgICAgRm9udERlc2NyaXB0aW9uIG1lZGl1bUZvbnREZXNjOwogICAgIG1lZGl1bUZvbnRE ZXNjLnNldEdlbmVyaWNGYW1pbHkoRm9udERlc2NyaXB0aW9uOjpNb25vc3BhY2VGYW1pbHkpOwpA QCAtMTUxLDggKzE1MSw4IEBAIHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhd0ZQU0NvdW50ZXIo R3JhcGhpY3NDb250ZXh0KiBjdHgsIGludCB0b3AsIGludCBoZWlnaHQpCiB7CiAgICAgLy8gTm90 ZSB0aGF0IHNpbmNlIHdlIGhhdmVuJ3QgZmluaXNoZWQgdGhlIGN1cnJlbnQgZnJhbWUsIHRoZSBG UFMgY291bnRlcgogICAgIC8vIGFjdHVhbGx5IHJlcG9ydHMgdGhlIGxhc3QgZnJhbWUncyB0aW1l LgotICAgIGRvdWJsZSBzZWNGb3JMYXN0RnJhbWUgPSBtX3ByZXNlbnRUaW1lSGlzdG9yeUluU2Vj WyhtX2N1cnJlbnRGcmFtZU51bWJlciArIGtQcmVzZW50SGlzdG9yeVNpemUgLSAxKSAlIGtQcmVz ZW50SGlzdG9yeVNpemVdIC0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9wcmVzZW50 VGltZUhpc3RvcnlJblNlY1sobV9jdXJyZW50RnJhbWVOdW1iZXIgKyBrUHJlc2VudEhpc3RvcnlT aXplIC0gMikgJSBrUHJlc2VudEhpc3RvcnlTaXplXTsKKyAgICBkb3VibGUgc2VjRm9yTGFzdEZy YW1lID0gbV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbKG1fY3VycmVudEZyYW1lTnVtYmVyICsga0Jl Z2luRnJhbWVIaXN0b3J5U2l6ZSAtIDEpICUga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZV0gLQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtX2JlZ2luVGltZUhpc3RvcnlJblNlY1sobV9jdXJy ZW50RnJhbWVOdW1iZXIgKyBrQmVnaW5GcmFtZUhpc3RvcnlTaXplIC0gMikgJSBrQmVnaW5GcmFt ZUhpc3RvcnlTaXplXTsKIAogICAgIC8vIEZpbHRlciB0aGUgZnJhbWUgdGltZXMgdG8gYXZvaWQg c3Bpa2VzLgogICAgIGNvbnN0IGZsb2F0IGFscGhhID0gMC4xOwpAQCAtMTY2LDcgKzE2Niw3IEBA IHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhd0ZQU0NvdW50ZXIoR3JhcGhpY3NDb250ZXh0KiBj dHgsIGludCB0b3AsIGludCBoZWlnaHQpCiAgICAgU3RyaW5nIHRleHQoU3RyaW5nOjpmb3JtYXQo IkZQUzogJTUuMWYiLCAxLjAgLyBtX2ZpbHRlcmVkRnJhbWVUaW1lKSk7CiAgICAgVGV4dFJ1biBy dW4odGV4dCk7CiAgICAgZmxvYXQgdGV4dFdpZHRoID0gbV9tZWRpdW1Gb250LT53aWR0aChydW4p ICsgMi4wZjsKLSAgICBmbG9hdCBncmFwaFdpZHRoID0ga1ByZXNlbnRIaXN0b3J5U2l6ZTsKKyAg ICBmbG9hdCBncmFwaFdpZHRoID0ga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZTsKIAogICAgIC8vIERy YXcgYmFja2dyb3VuZC4KICAgICBjdHgtPnNldEZpbGxDb2xvcihDb2xvcigwLCAwLCAwLCAyNTUp LCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKQEAgLTE4Nyw5ICsxODcsOSBAQCB2b2lkIENDSGVhZHNV cERpc3BsYXk6OmRyYXdGUFNDb3VudGVyKEdyYXBoaWNzQ29udGV4dCogY3R4LCBpbnQgdG9wLCBp bnQgaGVpZ2h0KQogICAgIEludFBvaW50IHByZXYoLTEsIDApOwogICAgIGludCB4ID0gMDsKICAg ICBkb3VibGUgaCA9IHN0YXRpY19jYXN0PGRvdWJsZT4oaGVpZ2h0IC0gMik7Ci0gICAgZm9yIChp bnQgaSA9IG1fY3VycmVudEZyYW1lTnVtYmVyICUga1ByZXNlbnRIaXN0b3J5U2l6ZTsgaSAhPSAo bV9jdXJyZW50RnJhbWVOdW1iZXIgLSAxKSAlIGtQcmVzZW50SGlzdG9yeVNpemU7IGkgPSAoaSAr IDEpICUga1ByZXNlbnRIaXN0b3J5U2l6ZSkgewotICAgICAgICBpbnQgaiA9IChpICsgMSkgJSBr UHJlc2VudEhpc3RvcnlTaXplOwotICAgICAgICBkb3VibGUgZnBzID0gMS4wIC8gKG1fcHJlc2Vu dFRpbWVIaXN0b3J5SW5TZWNbal0gLSBtX3ByZXNlbnRUaW1lSGlzdG9yeUluU2VjW2ldKTsKKyAg ICBmb3IgKGludCBpID0gbV9jdXJyZW50RnJhbWVOdW1iZXIgJSBrQmVnaW5GcmFtZUhpc3RvcnlT aXplOyBpICE9IChtX2N1cnJlbnRGcmFtZU51bWJlciAtIDEpICUga0JlZ2luRnJhbWVIaXN0b3J5 U2l6ZTsgaSA9IChpICsgMSkgJSBrQmVnaW5GcmFtZUhpc3RvcnlTaXplKSB7CisgICAgICAgIGlu dCBqID0gKGkgKyAxKSAlIGtCZWdpbkZyYW1lSGlzdG9yeVNpemU7CisgICAgICAgIGRvdWJsZSBm cHMgPSAxLjAgLyAobV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbal0gLSBtX2JlZ2luVGltZUhpc3Rv cnlJblNlY1tpXSk7CiAgICAgICAgIGRvdWJsZSBwID0gMSAtICgoZnBzIC0gbG9GUFMpIC8gKGhp RlBTIC0gbG9GUFMpKTsKICAgICAgICAgaWYgKHAgPCAwKQogICAgICAgICAgICAgcCA9IDA7CkBA IC0yMTYsOSArMjE2LDEzIEBAIHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhd1BsYXRmb3JtTGF5 ZXJUcmVlKEdyYXBoaWNzQ29udGV4dCogY3R4LCBpbnQgdG9wKQogICAgIH0KIH0KIAordm9pZCBD Q0hlYWRzVXBEaXNwbGF5OjpvbkZyYW1lQmVnaW4oZG91YmxlIHRpbWVzdGFtcCkKK3sKKyAgICBt X2JlZ2luVGltZUhpc3RvcnlJblNlY1ttX2N1cnJlbnRGcmFtZU51bWJlciAlIGtCZWdpbkZyYW1l SGlzdG9yeVNpemVdID0gdGltZXN0YW1wOworfQorCiB2b2lkIENDSGVhZHNVcERpc3BsYXk6Om9u UHJlc2VudCgpCiB7Ci0gICAgbV9wcmVzZW50VGltZUhpc3RvcnlJblNlY1ttX2N1cnJlbnRGcmFt ZU51bWJlciAlIGtQcmVzZW50SGlzdG9yeVNpemVdID0gY3VycmVudFRpbWUoKTsKICAgICBtX2N1 cnJlbnRGcmFtZU51bWJlciArPSAxOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmgK aW5kZXggZmM2OGYxZDY1NDQwZDExYzhiNTcxMmFiNTU4MDlmM2ViM2FjYTM4ZS4uYTA5ZmQxNTNi ODhlMjQ4NGRhOTIyM2YyNmQyMjAyNjhiNmJlMjIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERp c3BsYXkuaApAQCAtNDksNiArNDksNyBAQCBwdWJsaWM6CiAKICAgICB+Q0NIZWFkc1VwRGlzcGxh eSgpOwogCisgICAgdm9pZCBvbkZyYW1lQmVnaW4oZG91YmxlIHRpbWVzdGFtcCk7CiAgICAgdm9p ZCBvblByZXNlbnQoKTsKIAogICAgIHZvaWQgc2V0U2hvd0ZQU0NvdW50ZXIoYm9vbCBlbmFibGUp IHsgbV9zaG93RlBTQ291bnRlciA9IGVuYWJsZTsgfQpAQCAtNzcsOCArNzgsOCBAQCBwcml2YXRl OgogCiAgICAgTGF5ZXJSZW5kZXJlckNocm9taXVtKiBtX2xheWVyUmVuZGVyZXI7CiAKLSAgICBz dGF0aWMgY29uc3QgaW50IGtQcmVzZW50SGlzdG9yeVNpemUgPSA2NDsKLSAgICBkb3VibGUgbV9w cmVzZW50VGltZUhpc3RvcnlJblNlY1trUHJlc2VudEhpc3RvcnlTaXplXTsKKyAgICBzdGF0aWMg Y29uc3QgaW50IGtCZWdpbkZyYW1lSGlzdG9yeVNpemUgPSA2NDsKKyAgICBkb3VibGUgbV9iZWdp blRpbWVIaXN0b3J5SW5TZWNba0JlZ2luRnJhbWVIaXN0b3J5U2l6ZV07CiAKICAgICBib29sIG1f c2hvd0ZQU0NvdW50ZXI7CiAgICAgYm9vbCBtX3Nob3dQbGF0Zm9ybUxheWVyVHJlZTsK