61010 2011-05-17 18:17:03 -0700 [chromium] Add histograms for paint times 2011-05-18 20:21:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nduca nduca commit-queue enne jamesr oldest_to_newest 405437 0 nduca 2011-05-17 18:17:03 -0700 [chromium] Add histograms for paint times 405438 1 93854 nduca 2011-05-17 18:17:29 -0700 Created attachment 93854 Patch 405441 2 nduca 2011-05-17 18:18:46 -0700 The goal here is to improve our visibility into tile paint durations in the field. 405475 3 93854 dominicc 2011-05-17 20:20:20 -0700 Comment on attachment 93854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93854&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:1024 > + TRACE_EVENT("WebViewImpl::;layout", this, 0); DBC: typo w/ extra ;? 405484 4 93862 nduca 2011-05-17 20:45:41 -0700 Created attachment 93862 typo fix. 406021 5 93862 jamesr 2011-05-18 14:18:26 -0700 Comment on attachment 93862 typo fix. View in context: https://bugs.webkit.org/attachment.cgi?id=93862&action=review R=me, but you should use currentTime() or currentTimeMS() from <wtf/CurrentTime.h> instead of calling straight into PlatformBridge. > Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp:87 > + double pixelsPerSec = static_cast<double>(contentRect.width() * contentRect.height()) / (paintEnd - paintStart); nit: static_cast<double> here is redundant since the divisor is double already > Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp:88 > + PlatformBridge::histogramCustomCounts("Renderer4.AccelNonRootPaintDurationMS", (paintEnd - paintStart) * 1000.0, 0, 120, 30); nit: use 1000, or use currentTimeMS() to avoid having to do this math > Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp:89 > + PlatformBridge::histogramCustomCounts("Renderer4.AccelNonRootPaintMegapixPerSecond", pixelsPerSec / 1000000.0, 10, 210, 30); nit: use 1000000 or 1000 * 1000 406053 6 93991 nduca 2011-05-18 15:16:25 -0700 Created attachment 93991 Patch 406096 7 94000 nduca 2011-05-18 16:38:39 -0700 Created attachment 94000 Make patch applyable 406099 8 94000 jamesr 2011-05-18 16:41:46 -0700 Comment on attachment 94000 Make patch applyable laaaaaand 406114 9 94000 commit-queue 2011-05-18 17:07:05 -0700 Comment on attachment 94000 Make patch applyable Rejecting attachment 94000 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'land-a..." exit_code: 2 Last 500 characters of output: s/chromium/ContentLayerChromium.cpp M Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h A Source/WebCore/platform/graphics/chromium/LayerTextureSubImage.h A Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.h M Source/WebCore/platform/chromium/TraceEvent.h M Source/WebCore/WebCore.gypi r86805 = 2afa3b43989ae1a0a8f6b8998b7ed5ba92e855d5 (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. Full output: http://queues.webkit.org/results/8707630 406128 10 94007 nduca 2011-05-18 17:18:13 -0700 Created attachment 94007 i can haz commit nao? 406222 11 commit-queue 2011-05-18 20:19:45 -0700 The commit-queue encountered the following flaky tests while processing attachment 94007: http/tests/websocket/tests/multiple-connections.html bug 53825 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 406223 12 94007 commit-queue 2011-05-18 20:21:15 -0700 Comment on attachment 94007 i can haz commit nao? Clearing flags on attachment: 94007 Committed r86816: <http://trac.webkit.org/changeset/86816> 406224 13 commit-queue 2011-05-18 20:21:20 -0700 All reviewed patches have been landed. Closing bug. 93854 2011-05-17 18:17:29 -0700 2011-05-17 20:45:39 -0700 Patch bug-61010-20110517181728.patch text/plain 5423 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODY2NDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNzk1Mzk0NDk3ZTkxZjlh NTUzMzJlZDI0ZGQ0NjlkOTk5ZGExZTJjLi5iMDZhYzhiMjE0ZGY5OWM5YzcyZWIyNmJkODcxNWQ0 YjcxNzFiMzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGhpc3RvZ3JhbXMgZm9yIHBhaW50IHRp bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTAx MAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyUGFpbnRlcjo6cGFpbnQp OgorCiAyMDExLTA1LTE2ICBBbmRyZXcgV2lsc29uICA8YXR3aWxzb25AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NjYyNS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9t aXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRl bnRMYXllckNocm9taXVtLmNwcAppbmRleCAzZTJlYjgzOWMxZDI3YjNmY2NjZDdjNjI5ODMwNjg3 YTkxNDg3N2RkLi5kNGRiODEyMGI3MzY5NmFiMGYxNzBmMWQ0OGZlMTk3NGU2NzE2NDM4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50 TGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCkBAIC0zOCw5ICszOCwxMSBAQAogI2lu Y2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiTGF5ZXJSZW5kZXJlckNocm9t aXVtLmgiCiAjaW5jbHVkZSAiTGF5ZXJUZXh0dXJlLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1Ccmlk Z2UuaCIKICNpbmNsdWRlICJSZW5kZXJMYXllckJhY2tpbmcuaCIKICNpbmNsdWRlICJUZXh0U3Ry ZWFtLmgiCiAKKwogLy8gTWF4aW11bSBzaXplIHRoZSB3aWR0aCBvciBoZWlnaHQgb2YgdGhpcyBs YXllciBjYW4gYmUgYmVmb3JlIGVuYWJsaW5nIHRpbGluZwogLy8gd2hlbiBtX3RpbGluZ09wdGlv biA9PSBBdXRvVGlsZS4KIHN0YXRpYyBpbnQgbWF4VW50aWxlZFNpemUgPSA1MTI7CkBAIC03Nyw5 ICs3OSwxNCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoR3JhcGhpY3NDb250 ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKICAgICB7CisgICAgICAg IGRvdWJsZSBwYWludFN0YXJ0ID0gUGxhdGZvcm1CcmlkZ2U6OmN1cnJlbnRUaW1lKCk7CiAgICAg ICAgIGNvbnRleHQuY2xlYXJSZWN0KGNvbnRlbnRSZWN0KTsKICAgICAgICAgY29udGV4dC5jbGlw KGNvbnRlbnRSZWN0KTsKICAgICAgICAgbV9vd25lci0+cGFpbnRHcmFwaGljc0xheWVyQ29udGVu dHMoY29udGV4dCwgY29udGVudFJlY3QpOworICAgICAgICBkb3VibGUgcGFpbnRFbmQgPSBQbGF0 Zm9ybUJyaWRnZTo6Y3VycmVudFRpbWUoKTsKKyAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9 IHN0YXRpY19jYXN0PGRvdWJsZT4oY29udGVudFJlY3Qud2lkdGgoKSAqIGNvbnRlbnRSZWN0Lmhl aWdodCgpKSAvIChwYWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJyaWRn ZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxOb25Sb290UGFpbnREdXJh dGlvbk1TIiwgKHBhaW50RW5kIC0gcGFpbnRTdGFydCkgKiAxMDAwLjAsIDAsIDEyMCwgMzApOwor ICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQu QWNjZWxOb25Sb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2VjIC8gMTAwMDAw MC4wLCAxMCwgMjEwLCAzMCk7CiAgICAgfQogcHJpdmF0ZToKICAgICBHcmFwaGljc0xheWVyQ2hy b21pdW0qIG1fb3duZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDlmYWE2OGQ2YjZk MjU5Y2MxMzkxMGFiYTMwZDJlN2IxMjZlZjM2OWIuLjY3NTQ1ODZjNTAxNmMyMTgwYzdhZGQyY2Mw N2QxOTMyOTgzNjVkMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDUtMTcgIE5hdCBEdWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGhp c3RvZ3JhbXMgZm9yIHBhaW50IHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MTAxMAorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmFuaW1hdGUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6bGF5b3V0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnBh aW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGxDb250ZW50UGFpbnRlcjo6cGFpbnQp OgorCiAyMDExLTA1LTE2ICBBbmRyZXcgV2lsc29uICA8YXR3aWxzb25AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NjYyNS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA3OWFkODczN2E2MjAzYzY4OWJjYmNh NjQyNjUwNjQxY2Q0NGZlNWY0Li43NTcwMmRmMThiYWJiZGRjNjBiZjA1YzA5MWFlMjVmZmEwMzUz MDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0x MDAzLDYgKzEwMDMsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZXNpemUoY29uc3QgV2ViU2l6ZSYg bmV3U2l6ZSkKIAogdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZSgpCiB7CisgICAgVFJBQ0VfRVZF TlQoIldlYlZpZXdJbXBsOjphbmltYXRlIiwgdGhpcywgMCk7CiAjaWYgRU5BQkxFKFJFUVVFU1Rf QU5JTUFUSU9OX0ZSQU1FKQogICAgIFdlYkZyYW1lSW1wbCogd2ViZnJhbWUgPSBtYWluRnJhbWVJ bXBsKCk7CiAgICAgaWYgKHdlYmZyYW1lKSB7CkBAIC0xMDIwLDYgKzEwMjEsNyBAQCB2b2lkIFdl YlZpZXdJbXBsOjphbmltYXRlKCkKIAogdm9pZCBXZWJWaWV3SW1wbDo6bGF5b3V0KCkKIHsKKyAg ICBUUkFDRV9FVkVOVCgiV2ViVmlld0ltcGw6OjtsYXlvdXQiLCB0aGlzLCAwKTsKICNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gRklYTUU6IFJUTCBzdHlsZSBub3Qgc3Vw cG9ydGVkIGJ5IHRoZSBjb21wb3NpdG9yIHlldC4KICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBv c2l0aW5nQWN0aXZlKCkgJiYgcGFnZUhhc1JUTFN0eWxlKCkpCkBAIC0xMDk1LDkgKzEwOTcsMTQg QEAgdm9pZCBXZWJWaWV3SW1wbDo6cGFpbnQoV2ViQ2FudmFzKiBjYW52YXMsIGNvbnN0IFdlYlJl Y3QmIHJlY3QpCiAgICAgICAgIH0KICNlbmRpZgogICAgIH0gZWxzZSB7CisgICAgICAgIGRvdWJs ZSBwYWludFN0YXJ0ID0gUGxhdGZvcm1CcmlkZ2U6OmN1cnJlbnRUaW1lKCk7CiAgICAgICAgIFdl YkZyYW1lSW1wbCogd2ViZnJhbWUgPSBtYWluRnJhbWVJbXBsKCk7CiAgICAgICAgIGlmICh3ZWJm cmFtZSkKICAgICAgICAgICAgIHdlYmZyYW1lLT5wYWludChjYW52YXMsIHJlY3QpOworICAgICAg ICBkb3VibGUgcGFpbnRFbmQgPSBQbGF0Zm9ybUJyaWRnZTo6Y3VycmVudFRpbWUoKTsKKyAgICAg ICAgZG91YmxlIHBpeGVsc1BlclNlYyA9IHN0YXRpY19jYXN0PGRvdWJsZT4ocmVjdC53aWR0aCAq IHJlY3QuaGVpZ2h0KSAvIChwYWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9y bUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludER1 cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0YXJ0KSAqIDEwMDAuMCwgMCwgMTIwLCAzMCk7 CisgICAgICAgIFBsYXRmb3JtQnJpZGdlOjpoaXN0b2dyYW1DdXN0b21Db3VudHMoIlJlbmRlcmVy NC5Tb2Z0d2FyZVBhaW50TWVnYXBpeFBlclNlY29uZCIsIHBpeGVsc1BlclNlYyAvIDEwMDAwMDAu MCwgMTAsIDIxMCwgMzApOwogICAgIH0KIH0KIApAQCAtMjQxOSwxMSArMjQyNiwxNiBAQCBwdWJs aWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBj b25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKICAgICB7CisgICAgICAgIGRvdWJsZSBwYWludFN0 YXJ0ID0gUGxhdGZvcm1CcmlkZ2U6OmN1cnJlbnRUaW1lKCk7CiAgICAgICAgIFBhZ2UqIHBhZ2Ug PSBtX3dlYlZpZXdJbXBsLT5wYWdlKCk7CiAgICAgICAgIGlmICghcGFnZSkKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgRnJhbWVWaWV3KiB2aWV3ID0gcGFnZS0+bWFpbkZyYW1lKCktPnZp ZXcoKTsKICAgICAgICAgdmlldy0+cGFpbnRDb250ZW50cygmY29udGV4dCwgY29udGVudFJlY3Qp OworICAgICAgICBkb3VibGUgcGFpbnRFbmQgPSBQbGF0Zm9ybUJyaWRnZTo6Y3VycmVudFRpbWUo KTsKKyAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9IHN0YXRpY19jYXN0PGRvdWJsZT4oY29u dGVudFJlY3Qud2lkdGgoKSAqIGNvbnRlbnRSZWN0LmhlaWdodCgpKSAvIChwYWludEVuZCAtIHBh aW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRz KCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnREdXJhdGlvbk1TIiwgKHBhaW50RW5kIC0gcGFpbnRT dGFydCkgKiAxMDAwLjAsIDAsIDEyMCwgMzApOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlz dG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vj b25kIiwgcGl4ZWxzUGVyU2VjIC8gMTAwMDAwMC4wLCAxMCwgMjEwLCAzMCk7CiAgICAgfQogCiBw cml2YXRlOgo= 93862 2011-05-17 20:45:41 -0700 2011-05-18 15:16:23 -0700 typo fix. bug-61010-20110517204540.patch text/plain 5422 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODY2NDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNzk1Mzk0NDk3ZTkxZjlh NTUzMzJlZDI0ZGQ0NjlkOTk5ZGExZTJjLi5iMDZhYzhiMjE0ZGY5OWM5YzcyZWIyNmJkODcxNWQ0 YjcxNzFiMzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGhpc3RvZ3JhbXMgZm9yIHBhaW50IHRp bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTAx MAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyUGFpbnRlcjo6cGFpbnQp OgorCiAyMDExLTA1LTE2ICBBbmRyZXcgV2lsc29uICA8YXR3aWxzb25AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NjYyNS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9t aXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRl bnRMYXllckNocm9taXVtLmNwcAppbmRleCAzZTJlYjgzOWMxZDI3YjNmY2NjZDdjNjI5ODMwNjg3 YTkxNDg3N2RkLi5kNGRiODEyMGI3MzY5NmFiMGYxNzBmMWQ0OGZlMTk3NGU2NzE2NDM4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50 TGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCkBAIC0zOCw5ICszOCwxMSBAQAogI2lu Y2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiTGF5ZXJSZW5kZXJlckNocm9t aXVtLmgiCiAjaW5jbHVkZSAiTGF5ZXJUZXh0dXJlLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1Ccmlk Z2UuaCIKICNpbmNsdWRlICJSZW5kZXJMYXllckJhY2tpbmcuaCIKICNpbmNsdWRlICJUZXh0U3Ry ZWFtLmgiCiAKKwogLy8gTWF4aW11bSBzaXplIHRoZSB3aWR0aCBvciBoZWlnaHQgb2YgdGhpcyBs YXllciBjYW4gYmUgYmVmb3JlIGVuYWJsaW5nIHRpbGluZwogLy8gd2hlbiBtX3RpbGluZ09wdGlv biA9PSBBdXRvVGlsZS4KIHN0YXRpYyBpbnQgbWF4VW50aWxlZFNpemUgPSA1MTI7CkBAIC03Nyw5 ICs3OSwxNCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoR3JhcGhpY3NDb250 ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKICAgICB7CisgICAgICAg IGRvdWJsZSBwYWludFN0YXJ0ID0gUGxhdGZvcm1CcmlkZ2U6OmN1cnJlbnRUaW1lKCk7CiAgICAg ICAgIGNvbnRleHQuY2xlYXJSZWN0KGNvbnRlbnRSZWN0KTsKICAgICAgICAgY29udGV4dC5jbGlw KGNvbnRlbnRSZWN0KTsKICAgICAgICAgbV9vd25lci0+cGFpbnRHcmFwaGljc0xheWVyQ29udGVu dHMoY29udGV4dCwgY29udGVudFJlY3QpOworICAgICAgICBkb3VibGUgcGFpbnRFbmQgPSBQbGF0 Zm9ybUJyaWRnZTo6Y3VycmVudFRpbWUoKTsKKyAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9 IHN0YXRpY19jYXN0PGRvdWJsZT4oY29udGVudFJlY3Qud2lkdGgoKSAqIGNvbnRlbnRSZWN0Lmhl aWdodCgpKSAvIChwYWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJyaWRn ZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxOb25Sb290UGFpbnREdXJh dGlvbk1TIiwgKHBhaW50RW5kIC0gcGFpbnRTdGFydCkgKiAxMDAwLjAsIDAsIDEyMCwgMzApOwor ICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQu QWNjZWxOb25Sb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2VjIC8gMTAwMDAw MC4wLCAxMCwgMjEwLCAzMCk7CiAgICAgfQogcHJpdmF0ZToKICAgICBHcmFwaGljc0xheWVyQ2hy b21pdW0qIG1fb3duZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDlmYWE2OGQ2YjZk MjU5Y2MxMzkxMGFiYTMwZDJlN2IxMjZlZjM2OWIuLjY3NTQ1ODZjNTAxNmMyMTgwYzdhZGQyY2Mw N2QxOTMyOTgzNjVkMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDUtMTcgIE5hdCBEdWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGhp c3RvZ3JhbXMgZm9yIHBhaW50IHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MTAxMAorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmFuaW1hdGUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6bGF5b3V0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnBh aW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGxDb250ZW50UGFpbnRlcjo6cGFpbnQp OgorCiAyMDExLTA1LTE2ICBBbmRyZXcgV2lsc29uICA8YXR3aWxzb25AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NjYyNS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA3OWFkODczN2E2MjAzYzY4OWJjYmNh NjQyNjUwNjQxY2Q0NGZlNWY0Li5hNWY2YjBhY2Q2MGE5MGY5MzM4M2ViM2FkODI2NzYxNzJhNzQx NGM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0x MDAzLDYgKzEwMDMsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZXNpemUoY29uc3QgV2ViU2l6ZSYg bmV3U2l6ZSkKIAogdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZSgpCiB7CisgICAgVFJBQ0VfRVZF TlQoIldlYlZpZXdJbXBsOjphbmltYXRlIiwgdGhpcywgMCk7CiAjaWYgRU5BQkxFKFJFUVVFU1Rf QU5JTUFUSU9OX0ZSQU1FKQogICAgIFdlYkZyYW1lSW1wbCogd2ViZnJhbWUgPSBtYWluRnJhbWVJ bXBsKCk7CiAgICAgaWYgKHdlYmZyYW1lKSB7CkBAIC0xMDIwLDYgKzEwMjEsNyBAQCB2b2lkIFdl YlZpZXdJbXBsOjphbmltYXRlKCkKIAogdm9pZCBXZWJWaWV3SW1wbDo6bGF5b3V0KCkKIHsKKyAg ICBUUkFDRV9FVkVOVCgiV2ViVmlld0ltcGw6OmxheW91dCIsIHRoaXMsIDApOwogI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAvLyBGSVhNRTogUlRMIHN0eWxlIG5vdCBzdXBw b3J0ZWQgYnkgdGhlIGNvbXBvc2l0b3IgeWV0LgogICAgIGlmIChpc0FjY2VsZXJhdGVkQ29tcG9z aXRpbmdBY3RpdmUoKSAmJiBwYWdlSGFzUlRMU3R5bGUoKSkKQEAgLTEwOTUsOSArMTA5NywxNCBA QCB2b2lkIFdlYlZpZXdJbXBsOjpwYWludChXZWJDYW52YXMqIGNhbnZhcywgY29uc3QgV2ViUmVj dCYgcmVjdCkKICAgICAgICAgfQogI2VuZGlmCiAgICAgfSBlbHNlIHsKKyAgICAgICAgZG91Ymxl IHBhaW50U3RhcnQgPSBQbGF0Zm9ybUJyaWRnZTo6Y3VycmVudFRpbWUoKTsKICAgICAgICAgV2Vi RnJhbWVJbXBsKiB3ZWJmcmFtZSA9IG1haW5GcmFtZUltcGwoKTsKICAgICAgICAgaWYgKHdlYmZy YW1lKQogICAgICAgICAgICAgd2ViZnJhbWUtPnBhaW50KGNhbnZhcywgcmVjdCk7CisgICAgICAg IGRvdWJsZSBwYWludEVuZCA9IFBsYXRmb3JtQnJpZGdlOjpjdXJyZW50VGltZSgpOworICAgICAg ICBkb3VibGUgcGl4ZWxzUGVyU2VjID0gc3RhdGljX2Nhc3Q8ZG91YmxlPihyZWN0LndpZHRoICog cmVjdC5oZWlnaHQpIC8gKHBhaW50RW5kIC0gcGFpbnRTdGFydCk7CisgICAgICAgIFBsYXRmb3Jt QnJpZGdlOjpoaXN0b2dyYW1DdXN0b21Db3VudHMoIlJlbmRlcmVyNC5Tb2Z0d2FyZVBhaW50RHVy YXRpb25NUyIsIChwYWludEVuZCAtIHBhaW50U3RhcnQpICogMTAwMC4wLCAwLCAxMjAsIDMwKTsK KyAgICAgICAgUGxhdGZvcm1CcmlkZ2U6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0 LlNvZnR3YXJlUGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2VjIC8gMTAwMDAwMC4w LCAxMCwgMjEwLCAzMCk7CiAgICAgfQogfQogCkBAIC0yNDE5LDExICsyNDI2LDE2IEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgdm9pZCBwYWludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNv bnN0IEludFJlY3QmIGNvbnRlbnRSZWN0KQogICAgIHsKKyAgICAgICAgZG91YmxlIHBhaW50U3Rh cnQgPSBQbGF0Zm9ybUJyaWRnZTo6Y3VycmVudFRpbWUoKTsKICAgICAgICAgUGFnZSogcGFnZSA9 IG1fd2ViVmlld0ltcGwtPnBhZ2UoKTsKICAgICAgICAgaWYgKCFwYWdlKQogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICBGcmFtZVZpZXcqIHZpZXcgPSBwYWdlLT5tYWluRnJhbWUoKS0+dmll dygpOwogICAgICAgICB2aWV3LT5wYWludENvbnRlbnRzKCZjb250ZXh0LCBjb250ZW50UmVjdCk7 CisgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IFBsYXRmb3JtQnJpZGdlOjpjdXJyZW50VGltZSgp OworICAgICAgICBkb3VibGUgcGl4ZWxzUGVyU2VjID0gc3RhdGljX2Nhc3Q8ZG91YmxlPihjb250 ZW50UmVjdC53aWR0aCgpICogY29udGVudFJlY3QuaGVpZ2h0KCkpIC8gKHBhaW50RW5kIC0gcGFp bnRTdGFydCk7CisgICAgICAgIFBsYXRmb3JtQnJpZGdlOjpoaXN0b2dyYW1DdXN0b21Db3VudHMo IlJlbmRlcmVyNC5BY2NlbFJvb3RQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0 YXJ0KSAqIDEwMDAuMCwgMCwgMTIwLCAzMCk7CisgICAgICAgIFBsYXRmb3JtQnJpZGdlOjpoaXN0 b2dyYW1DdXN0b21Db3VudHMoIlJlbmRlcmVyNC5BY2NlbFJvb3RQYWludE1lZ2FwaXhQZXJTZWNv bmQiLCBwaXhlbHNQZXJTZWMgLyAxMDAwMDAwLjAsIDEwLCAyMTAsIDMwKTsKICAgICB9CiAKIHBy aXZhdGU6Cg== 93991 2011-05-18 15:16:25 -0700 2011-05-18 16:38:36 -0700 Patch bug-61010-20110518151624.patch text/plain 5289 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODQ1ODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjI0NTFiN2I1YjU3YjJl NDQ5MmExN2I3N2I0M2MwNGVhYzFkYTY2Li5mM2I2MGFhNmZhOTZiMzY3Y2U0YzM0NzExMTVhMzI5 YjlhNGFkOTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGhpc3RvZ3JhbXMgZm9yIHBhaW50IHRp bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTAx MAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyUGFpbnRlcjo6cGFpbnQp OgorCiAyMDExLTA0LTIxICBWYW5nZWxpcyBLb2trZXZpcyAgPHZhbmdlbGlzQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9t aXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRl bnRMYXllckNocm9taXVtLmNwcAppbmRleCA5ODI0NGI5ODAzNTYxMmFkNTBkZjhkZmYyODI3MmFm N2VkYzMwOTYzLi5lMDYxMGFjM2MwMjMyMjQwMTA2ZDgyN2NjZjBlMmI2MzAxMTU0ZTdkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50 TGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCkBAIC0zOCw4ICszOCwxMCBAQAogI2lu Y2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiTGF5ZXJSZW5kZXJlckNocm9t aXVtLmgiCiAjaW5jbHVkZSAiTGF5ZXJUZXh0dXJlLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1Ccmlk Z2UuaCIKICNpbmNsdWRlICJSZW5kZXJMYXllckJhY2tpbmcuaCIKICNpbmNsdWRlICJUZXh0U3Ry ZWFtLmgiCisjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAKIC8vIE1heGltdW0gc2l6ZSB0 aGUgd2lkdGggb3IgaGVpZ2h0IG9mIHRoaXMgbGF5ZXIgY2FuIGJlIGJlZm9yZSBlbmFibGluZyB0 aWxpbmcKIC8vIHdoZW4gbV90aWxpbmdPcHRpb24gPT0gQXV0b1RpbGUuCkBAIC03NywxMSArNzks MTYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHBhaW50KEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCwgY29uc3QgSW50UmVjdCYgY29udGVudFJlY3QpCiAgICAgeworICAgICAgICBkb3Vi bGUgcGFpbnRTdGFydCA9IGN1cnJlbnRUaW1lKCk7CiAgICAgICAgIGNvbnRleHQuc2F2ZSgpOwog ICAgICAgICBjb250ZXh0LmNsZWFyUmVjdChjb250ZW50UmVjdCk7CiAgICAgICAgIGNvbnRleHQu Y2xpcChjb250ZW50UmVjdCk7CiAgICAgICAgIG1fb3duZXItPnBhaW50R3JhcGhpY3NMYXllckNv bnRlbnRzKGNvbnRleHQsIGNvbnRlbnRSZWN0KTsKICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7 CisgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IGN1cnJlbnRUaW1lKCk7CisgICAgICAgIGRvdWJs ZSBwaXhlbHNQZXJTZWMgPSAoY29udGVudFJlY3Qud2lkdGgoKSAqIGNvbnRlbnRSZWN0LmhlaWdo dCgpKSAvIChwYWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6 aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxDb250ZW50UGFpbnREdXJhdGlv bk1TIiwgKHBhaW50RW5kIC0gcGFpbnRTdGFydCkgKiAxMDAwLCAwLCAxMjAsIDMwKTsKKyAgICAg ICAgUGxhdGZvcm1CcmlkZ2U6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0LkFjY2Vs Q29udGVudFBhaW50TWVnYXBpeFBlclNlY29uZCIsIHBpeGVsc1BlclNlYyAvIDEwMDAwMDAsIDEw LCAyMTAsIDMwKTsKICAgICB9CiBwcml2YXRlOgogICAgIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSog bV9vd25lcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNGYxY2JlZDBiYjJjNzBiODlj NjBmYTNiNTdmY2M2MGQ2YTZmNzMyNi4uNjA5M2EyMDc5ODc3MjI3MmNiZmZlNDJhNTE4NDhiOTcz MzAwZTgyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAx MS0wNS0xNyAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBBZGQgaGlzdG9ncmFt cyBmb3IgcGFpbnQgdGltZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYxMDEwCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6YW5pbWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXdJbXBsOjpsYXlvdXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cGFpbnQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbENvbnRlbnRQYWludGVyOjpwYWludCk6CisKIDIw MTEtMDQtMjEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAppbmRleCAyNDM4YTk0ODFkMDE3MGM1NmIzNjMyYTBmYjAxZDZjM2QwMTg3YjhkLi4z NzM0MjkyNjVjZDAyN2NlN2FmNGZkMDYyYmZiYzAwNTVkYzk4NGRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC05OTMsNiArOTkzLDcgQEAgdm9pZCBX ZWJWaWV3SW1wbDo6cmVzaXplKGNvbnN0IFdlYlNpemUmIG5ld1NpemUpCiAKIHZvaWQgV2ViVmll d0ltcGw6OmFuaW1hdGUoKQogeworICAgIFRSQUNFX0VWRU5UKCJXZWJWaWV3SW1wbDo6YW5pbWF0 ZSIsIHRoaXMsIDApOwogI2lmIEVOQUJMRShSRVFVRVNUX0FOSU1BVElPTl9GUkFNRSkKICAgICBX ZWJGcmFtZUltcGwqIHdlYmZyYW1lID0gbWFpbkZyYW1lSW1wbCgpOwogICAgIGlmICh3ZWJmcmFt ZSkgewpAQCAtMTAwNSw2ICsxMDA2LDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZSgpCiAK IHZvaWQgV2ViVmlld0ltcGw6OmxheW91dCgpCiB7CisgICAgVFJBQ0VfRVZFTlQoIldlYlZpZXdJ bXBsOjpsYXlvdXQiLCB0aGlzLCAwKTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp CiAgICAgLy8gRklYTUU6IFJUTCBzdHlsZSBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBjb21wb3NpdG9y IHlldC4KICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkgJiYgcGFnZUhh c1JUTFN0eWxlKCkpCkBAIC0xMDgwLDkgKzEwODIsMTQgQEAgdm9pZCBXZWJWaWV3SW1wbDo6cGFp bnQoV2ViQ2FudmFzKiBjYW52YXMsIGNvbnN0IFdlYlJlY3QmIHJlY3QpCiAgICAgICAgIH0KICNl bmRpZgogICAgIH0gZWxzZSB7CisgICAgICAgIGRvdWJsZSBwYWludFN0YXJ0ID0gY3VycmVudFRp bWUoKTsKICAgICAgICAgV2ViRnJhbWVJbXBsKiB3ZWJmcmFtZSA9IG1haW5GcmFtZUltcGwoKTsK ICAgICAgICAgaWYgKHdlYmZyYW1lKQogICAgICAgICAgICAgd2ViZnJhbWUtPnBhaW50KGNhbnZh cywgcmVjdCk7CisgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IGN1cnJlbnRUaW1lKCk7CisgICAg ICAgIGRvdWJsZSBwaXhlbHNQZXJTZWMgPSAocmVjdC53aWR0aCAqIHJlY3QuaGVpZ2h0KSAvIChw YWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFt Q3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludER1cmF0aW9uTVMiLCAocGFpbnRF bmQgLSBwYWludFN0YXJ0KSAqIDEwMDAsIDAsIDEyMCwgMzApOworICAgICAgICBQbGF0Zm9ybUJy aWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludE1lZ2Fw aXhQZXJTZWNvbmQiLCBwaXhlbHNQZXJTZWMgLyAxMDAwMDAwLCAxMCwgMjEwLCAzMCk7CiAgICAg fQogfQogCkBAIC0yMzYzLDExICsyMzcwLDE2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9p ZCBwYWludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGNvbnRlbnRS ZWN0KQogICAgIHsKKyAgICAgICAgZG91YmxlIHBhaW50U3RhcnQgPSBjdXJyZW50VGltZSgpOwog ICAgICAgICBQYWdlKiBwYWdlID0gbV93ZWJWaWV3SW1wbC0+cGFnZSgpOwogICAgICAgICBpZiAo IXBhZ2UpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIEZyYW1lVmlldyogdmlldyA9IHBh Z2UtPm1haW5GcmFtZSgpLT52aWV3KCk7CiAgICAgICAgIHZpZXctPnBhaW50Q29udGVudHMoJmNv bnRleHQsIGNvbnRlbnRSZWN0KTsKKyAgICAgICAgZG91YmxlIHBhaW50RW5kID0gY3VycmVudFRp bWUoKTsKKyAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9IChjb250ZW50UmVjdC53aWR0aCgp ICogY29udGVudFJlY3QuaGVpZ2h0KCkpIC8gKHBhaW50RW5kIC0gcGFpbnRTdGFydCk7CisgICAg ICAgIFBsYXRmb3JtQnJpZGdlOjpoaXN0b2dyYW1DdXN0b21Db3VudHMoIlJlbmRlcmVyNC5BY2Nl bFJvb3RQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0YXJ0KSAqIDEwMDAsIDAs IDEyMCwgMzApOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRz KCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2Vj IC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogICAgIH0KIAogcHJpdmF0ZToK 94000 2011-05-18 16:38:39 -0700 2011-05-18 17:18:10 -0700 Make patch applyable bug-61010-20110518163838.patch text/plain 5292 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODY3OTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3OWIyYWUzOTc1MDI4ZDgz ZTQ2MDc0YzRkOGJjOTRjNGU0MDJlYzM3Li5jOWQ2ZmVhMWRlMjg5MjIzYjU1ODE1NzZkMTdiZDhi M2JlZGY4MDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGhpc3RvZ3JhbXMgZm9yIHBhaW50IHRp bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTAx MAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyUGFpbnRlcjo6cGFpbnQp OgorCiAyMDExLTA1LTE4ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eu b3JnPiwgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21p dW0uY3BwCmluZGV4IDNlMmViODM5YzFkMjdiM2ZjY2NkN2M2Mjk4MzA2ODdhOTE0ODc3ZGQuLjU4 YjgyOGRkNTMyOThkYjQ5Y2NhMDM1OTE3YjAxMzQ4NWZiNjlhNDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVt LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250 ZW50TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTM4LDggKzM4LDEwIEBACiAjaW5jbHVkZSAiR3JhcGhp Y3NDb250ZXh0M0QuaCIKICNpbmNsdWRlICJMYXllclJlbmRlcmVyQ2hyb21pdW0uaCIKICNpbmNs dWRlICJMYXllclRleHR1cmUuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgogI2luY2x1 ZGUgIlJlbmRlckxheWVyQmFja2luZy5oIgogI2luY2x1ZGUgIlRleHRTdHJlYW0uaCIKKyNpbmNs dWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KIAogLy8gTWF4aW11bSBzaXplIHRoZSB3aWR0aCBvciBo ZWlnaHQgb2YgdGhpcyBsYXllciBjYW4gYmUgYmVmb3JlIGVuYWJsaW5nIHRpbGluZwogLy8gd2hl biBtX3RpbGluZ09wdGlvbiA9PSBBdXRvVGlsZS4KQEAgLTc3LDkgKzc5LDE0IEBAIHB1YmxpYzoK IAogICAgIHZpcnR1YWwgdm9pZCBwYWludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0 IEludFJlY3QmIGNvbnRlbnRSZWN0KQogICAgIHsKKyAgICAgICAgZG91YmxlIHBhaW50U3RhcnQg PSBjdXJyZW50VGltZSgpOwogICAgICAgICBjb250ZXh0LmNsZWFyUmVjdChjb250ZW50UmVjdCk7 CiAgICAgICAgIGNvbnRleHQuY2xpcChjb250ZW50UmVjdCk7CiAgICAgICAgIG1fb3duZXItPnBh aW50R3JhcGhpY3NMYXllckNvbnRlbnRzKGNvbnRleHQsIGNvbnRlbnRSZWN0KTsKKyAgICAgICAg ZG91YmxlIHBhaW50RW5kID0gY3VycmVudFRpbWUoKTsKKyAgICAgICAgZG91YmxlIHBpeGVsc1Bl clNlYyA9IChjb250ZW50UmVjdC53aWR0aCgpICogY29udGVudFJlY3QuaGVpZ2h0KCkpIC8gKHBh aW50RW5kIC0gcGFpbnRTdGFydCk7CisgICAgICAgIFBsYXRmb3JtQnJpZGdlOjpoaXN0b2dyYW1D dXN0b21Db3VudHMoIlJlbmRlcmVyNC5BY2NlbENvbnRlbnRQYWludER1cmF0aW9uTVMiLCAocGFp bnRFbmQgLSBwYWludFN0YXJ0KSAqIDEwMDAsIDAsIDEyMCwgMzApOworICAgICAgICBQbGF0Zm9y bUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxDb250ZW50UGFp bnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzAp OwogICAgIH0KIHByaXZhdGU6CiAgICAgR3JhcGhpY3NMYXllckNocm9taXVtKiBtX293bmVyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCAyNjJmYTVhZDg2ZGMzMjMyYmFkM2M2YjZiMzYy OTgyZWE2YWE0ZGE4Li5hOWQwYzE2NmNhYjdlMDgxZGIzZGEyMmMxNjAyNzgzZWUzNGFjOGI2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTA1LTE3ICBO YXQgRHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCBoaXN0b2dyYW1zIGZvciBwYWlu dCB0aW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjEwMTAKKworICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlZpZXdJbXBsOjphbmltYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Omxh eW91dCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpwYWludCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlZpZXdJbXBsQ29udGVudFBhaW50ZXI6OnBhaW50KToKKwogMjAxMS0wNS0xNyAg TWlraGFpbCBOYWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKaW5kZXggNzlhZDg3MzdhNjIwM2M2ODliY2JjYTY0MjY1MDY0MWNkNDRmZTVmNC4u ZGNkY2ZhZmFhZTE4YjNjZjA0NmZlNDdjOGI3NzVmYTFiZWNmYTZjYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTAwMyw2ICsxMDAzLDcgQEAgdm9p ZCBXZWJWaWV3SW1wbDo6cmVzaXplKGNvbnN0IFdlYlNpemUmIG5ld1NpemUpCiAKIHZvaWQgV2Vi Vmlld0ltcGw6OmFuaW1hdGUoKQogeworICAgIFRSQUNFX0VWRU5UKCJXZWJWaWV3SW1wbDo6YW5p bWF0ZSIsIHRoaXMsIDApOwogI2lmIEVOQUJMRShSRVFVRVNUX0FOSU1BVElPTl9GUkFNRSkKICAg ICBXZWJGcmFtZUltcGwqIHdlYmZyYW1lID0gbWFpbkZyYW1lSW1wbCgpOwogICAgIGlmICh3ZWJm cmFtZSkgewpAQCAtMTAyMCw2ICsxMDIxLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZSgp CiAKIHZvaWQgV2ViVmlld0ltcGw6OmxheW91dCgpCiB7CisgICAgVFJBQ0VfRVZFTlQoIldlYlZp ZXdJbXBsOjpsYXlvdXQiLCB0aGlzLCAwKTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCiAgICAgLy8gRklYTUU6IFJUTCBzdHlsZSBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBjb21wb3Np dG9yIHlldC4KICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkgJiYgcGFn ZUhhc1JUTFN0eWxlKCkpCkBAIC0xMDk1LDkgKzEwOTcsMTQgQEAgdm9pZCBXZWJWaWV3SW1wbDo6 cGFpbnQoV2ViQ2FudmFzKiBjYW52YXMsIGNvbnN0IFdlYlJlY3QmIHJlY3QpCiAgICAgICAgIH0K ICNlbmRpZgogICAgIH0gZWxzZSB7CisgICAgICAgIGRvdWJsZSBwYWludFN0YXJ0ID0gY3VycmVu dFRpbWUoKTsKICAgICAgICAgV2ViRnJhbWVJbXBsKiB3ZWJmcmFtZSA9IG1haW5GcmFtZUltcGwo KTsKICAgICAgICAgaWYgKHdlYmZyYW1lKQogICAgICAgICAgICAgd2ViZnJhbWUtPnBhaW50KGNh bnZhcywgcmVjdCk7CisgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IGN1cnJlbnRUaW1lKCk7Cisg ICAgICAgIGRvdWJsZSBwaXhlbHNQZXJTZWMgPSAocmVjdC53aWR0aCAqIHJlY3QuaGVpZ2h0KSAv IChwYWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9n cmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludER1cmF0aW9uTVMiLCAocGFp bnRFbmQgLSBwYWludFN0YXJ0KSAqIDEwMDAsIDAsIDEyMCwgMzApOworICAgICAgICBQbGF0Zm9y bUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludE1l Z2FwaXhQZXJTZWNvbmQiLCBwaXhlbHNQZXJTZWMgLyAxMDAwMDAwLCAxMCwgMjEwLCAzMCk7CiAg ICAgfQogfQogCkBAIC0yNDE5LDExICsyNDI2LDE2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg dm9pZCBwYWludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGNvbnRl bnRSZWN0KQogICAgIHsKKyAgICAgICAgZG91YmxlIHBhaW50U3RhcnQgPSBjdXJyZW50VGltZSgp OwogICAgICAgICBQYWdlKiBwYWdlID0gbV93ZWJWaWV3SW1wbC0+cGFnZSgpOwogICAgICAgICBp ZiAoIXBhZ2UpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIEZyYW1lVmlldyogdmlldyA9 IHBhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCk7CiAgICAgICAgIHZpZXctPnBhaW50Q29udGVudHMo JmNvbnRleHQsIGNvbnRlbnRSZWN0KTsKKyAgICAgICAgZG91YmxlIHBhaW50RW5kID0gY3VycmVu dFRpbWUoKTsKKyAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9IChjb250ZW50UmVjdC53aWR0 aCgpICogY29udGVudFJlY3QuaGVpZ2h0KCkpIC8gKHBhaW50RW5kIC0gcGFpbnRTdGFydCk7Cisg ICAgICAgIFBsYXRmb3JtQnJpZGdlOjpoaXN0b2dyYW1DdXN0b21Db3VudHMoIlJlbmRlcmVyNC5B Y2NlbFJvb3RQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0YXJ0KSAqIDEwMDAs IDAsIDEyMCwgMzApOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291 bnRzKCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVy U2VjIC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogICAgIH0KIAogcHJpdmF0ZToK 94007 2011-05-18 17:18:13 -0700 2011-05-18 20:21:14 -0700 i can haz commit nao? bug-61010-20110518171812.patch text/plain 5289 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODY4MDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MDBiZTEzMGIzODkwZTg5 YTQxNzM4YjM4YzAzZmQ0YTRhYWUxMDI1Li41MmJhMThiOTBmMTcyZTQ2NThlZGVmMTY4NTUxYjU2 MTgzN2JlMGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTcgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGhpc3RvZ3JhbXMgZm9yIHBhaW50IHRp bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTAx MAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyUGFpbnRlcjo6cGFpbnQp OgorCiAyMDExLTA1LTE4ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1 bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50 TGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggOTRjNzJlODEwMzJjYjExODRlY2I4ZjAwNTc5MDlmNWJi YjZkMzgyZi4uYWUxODkwZWM3MTA4MDllMjg2NmFlNWFjYmUzYTAyMTgwNDRhYmRlZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExh eWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcApAQCAtNDEsOCArNDEsMTAgQEAKICNpbmNs dWRlICJMYXllclRleHR1cmUuaCIKICNpbmNsdWRlICJMYXllclRleHR1cmVVcGRhdGVyQ2FudmFz LmgiCiAjaW5jbHVkZSAiTGF5ZXJUaWxlckNocm9taXVtLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1C cmlkZ2UuaCIKICNpbmNsdWRlICJSZW5kZXJMYXllckJhY2tpbmcuaCIKICNpbmNsdWRlICJUZXh0 U3RyZWFtLmgiCisjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAKIC8vIE1heGltdW0gc2l6 ZSB0aGUgd2lkdGggb3IgaGVpZ2h0IG9mIHRoaXMgbGF5ZXIgY2FuIGJlIGJlZm9yZSBlbmFibGlu ZyB0aWxpbmcKIC8vIHdoZW4gbV90aWxpbmdPcHRpb24gPT0gQXV0b1RpbGUuCkBAIC02Myw5ICs2 NSwxNCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKICAgICB7CisgICAgICAgIGRv dWJsZSBwYWludFN0YXJ0ID0gY3VycmVudFRpbWUoKTsKICAgICAgICAgY29udGV4dC5jbGVhclJl Y3QoY29udGVudFJlY3QpOwogICAgICAgICBjb250ZXh0LmNsaXAoY29udGVudFJlY3QpOwogICAg ICAgICBtX293bmVyLT5wYWludEdyYXBoaWNzTGF5ZXJDb250ZW50cyhjb250ZXh0LCBjb250ZW50 UmVjdCk7CisgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IGN1cnJlbnRUaW1lKCk7CisgICAgICAg IGRvdWJsZSBwaXhlbHNQZXJTZWMgPSAoY29udGVudFJlY3Qud2lkdGgoKSAqIGNvbnRlbnRSZWN0 LmhlaWdodCgpKSAvIChwYWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJy aWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuQWNjZWxDb250ZW50UGFpbnRE dXJhdGlvbk1TIiwgKHBhaW50RW5kIC0gcGFpbnRTdGFydCkgKiAxMDAwLCAwLCAxMjAsIDMwKTsK KyAgICAgICAgUGxhdGZvcm1CcmlkZ2U6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiUmVuZGVyZXI0 LkFjY2VsQ29udGVudFBhaW50TWVnYXBpeFBlclNlY29uZCIsIHBpeGVsc1BlclNlYyAvIDEwMDAw MDAsIDEwLCAyMTAsIDMwKTsKICAgICB9CiBwcml2YXRlOgogICAgIEdyYXBoaWNzTGF5ZXJDaHJv bWl1bSogbV9vd25lcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZDRjZjYyOTA2ZTg0 MWYzNTRhMDkxMTlhZjFiZTY0Y2EyMThhMzc0Ny4uMTM3YjQzNTNmNDI1MTI1NjE5NTNiM2U2OWQ3 Y2UyMmRjZGU5MjBjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAxMS0wNS0xNyAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBBZGQgaGlz dG9ncmFtcyBmb3IgcGFpbnQgdGltZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTYxMDEwCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6YW5pbWF0ZSk6CisgICAgICAgIChXZWJLaXQ6 OldlYlZpZXdJbXBsOjpsYXlvdXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cGFp bnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbENvbnRlbnRQYWludGVyOjpwYWludCk6 CisKIDIwMTEtMDUtMTggIEFsb2sgUHJpeWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+IGFu ZCBBZHJpZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgSmFtZXMgUm9iaW5zb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKaW5kZXggMTVkZDI5YTA3YzA2NTI4YmYwZmJjMWRiZDExZDlkNWEwMDBiNzRiZS4uY2Nh NTlmNzRlNGE4YjEyZDdjMGFmNWQ3MWY2NjM0MjQyZmNmZjc1MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTAwNCw2ICsxMDA0LDcgQEAgdm9pZCBX ZWJWaWV3SW1wbDo6cmVzaXplKGNvbnN0IFdlYlNpemUmIG5ld1NpemUpCiAKIHZvaWQgV2ViVmll d0ltcGw6OmFuaW1hdGUoKQogeworICAgIFRSQUNFX0VWRU5UKCJXZWJWaWV3SW1wbDo6YW5pbWF0 ZSIsIHRoaXMsIDApOwogI2lmIEVOQUJMRShSRVFVRVNUX0FOSU1BVElPTl9GUkFNRSkKICAgICBX ZWJGcmFtZUltcGwqIHdlYmZyYW1lID0gbWFpbkZyYW1lSW1wbCgpOwogICAgIGlmICh3ZWJmcmFt ZSkgewpAQCAtMTAyMSw2ICsxMDIyLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZSgpCiAK IHZvaWQgV2ViVmlld0ltcGw6OmxheW91dCgpCiB7CisgICAgVFJBQ0VfRVZFTlQoIldlYlZpZXdJ bXBsOjpsYXlvdXQiLCB0aGlzLCAwKTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp CiAgICAgLy8gRklYTUU6IFJUTCBzdHlsZSBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBjb21wb3NpdG9y IHlldC4KICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkgJiYgcGFnZUhh c1JUTFN0eWxlKCkpCkBAIC0xMDk2LDkgKzEwOTgsMTQgQEAgdm9pZCBXZWJWaWV3SW1wbDo6cGFp bnQoV2ViQ2FudmFzKiBjYW52YXMsIGNvbnN0IFdlYlJlY3QmIHJlY3QpCiAgICAgICAgIH0KICNl bmRpZgogICAgIH0gZWxzZSB7CisgICAgICAgIGRvdWJsZSBwYWludFN0YXJ0ID0gY3VycmVudFRp bWUoKTsKICAgICAgICAgV2ViRnJhbWVJbXBsKiB3ZWJmcmFtZSA9IG1haW5GcmFtZUltcGwoKTsK ICAgICAgICAgaWYgKHdlYmZyYW1lKQogICAgICAgICAgICAgd2ViZnJhbWUtPnBhaW50KGNhbnZh cywgcmVjdCk7CisgICAgICAgIGRvdWJsZSBwYWludEVuZCA9IGN1cnJlbnRUaW1lKCk7CisgICAg ICAgIGRvdWJsZSBwaXhlbHNQZXJTZWMgPSAocmVjdC53aWR0aCAqIHJlY3QuaGVpZ2h0KSAvIChw YWludEVuZCAtIHBhaW50U3RhcnQpOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFt Q3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludER1cmF0aW9uTVMiLCAocGFpbnRF bmQgLSBwYWludFN0YXJ0KSAqIDEwMDAsIDAsIDEyMCwgMzApOworICAgICAgICBQbGF0Zm9ybUJy aWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJSZW5kZXJlcjQuU29mdHdhcmVQYWludE1lZ2Fw aXhQZXJTZWNvbmQiLCBwaXhlbHNQZXJTZWMgLyAxMDAwMDAwLCAxMCwgMjEwLCAzMCk7CiAgICAg fQogfQogCkBAIC0yNDIwLDExICsyNDI3LDE2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9p ZCBwYWludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGNvbnRlbnRS ZWN0KQogICAgIHsKKyAgICAgICAgZG91YmxlIHBhaW50U3RhcnQgPSBjdXJyZW50VGltZSgpOwog ICAgICAgICBQYWdlKiBwYWdlID0gbV93ZWJWaWV3SW1wbC0+cGFnZSgpOwogICAgICAgICBpZiAo IXBhZ2UpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIEZyYW1lVmlldyogdmlldyA9IHBh Z2UtPm1haW5GcmFtZSgpLT52aWV3KCk7CiAgICAgICAgIHZpZXctPnBhaW50Q29udGVudHMoJmNv bnRleHQsIGNvbnRlbnRSZWN0KTsKKyAgICAgICAgZG91YmxlIHBhaW50RW5kID0gY3VycmVudFRp bWUoKTsKKyAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9IChjb250ZW50UmVjdC53aWR0aCgp ICogY29udGVudFJlY3QuaGVpZ2h0KCkpIC8gKHBhaW50RW5kIC0gcGFpbnRTdGFydCk7CisgICAg ICAgIFBsYXRmb3JtQnJpZGdlOjpoaXN0b2dyYW1DdXN0b21Db3VudHMoIlJlbmRlcmVyNC5BY2Nl bFJvb3RQYWludER1cmF0aW9uTVMiLCAocGFpbnRFbmQgLSBwYWludFN0YXJ0KSAqIDEwMDAsIDAs IDEyMCwgMzApOworICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6aGlzdG9ncmFtQ3VzdG9tQ291bnRz KCJSZW5kZXJlcjQuQWNjZWxSb290UGFpbnRNZWdhcGl4UGVyU2Vjb25kIiwgcGl4ZWxzUGVyU2Vj IC8gMTAwMDAwMCwgMTAsIDIxMCwgMzApOwogICAgIH0KIAogcHJpdmF0ZToK