52280 2011-01-12 01:34:24 -0800 [GStreamer] support in mac video fullscreen controller 2011-03-02 08:58:11 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned eric.carlson webkit.review.bot oldest_to_newest 332962 0 pnormand 2011-01-12 01:34:24 -0800 Support for GStreamer platformMedia is missing in WebView/WebVideoFullscreenController.mm 332964 1 78663 pnormand 2011-01-12 01:36:26 -0800 Created attachment 78663 proposed patch 332965 2 webkit.review.bot 2011-01-12 01:39:30 -0800 Attachment 78663 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'WebKit/mac/ChangeLog', u'WebKit/mac/WebVie..." exit_code: 1 WebKit/mac/WebView/WebVideoFullscreenController.mm:112: Line contains tab character. [whitespace/tab] [5] WebKit/mac/WebView/WebVideoFullscreenController.mm:113: Line contains tab character. [whitespace/tab] [5] WebKit/mac/WebView/WebVideoFullscreenController.mm:114: Line contains tab character. [whitespace/tab] [5] WebKit/mac/WebView/WebVideoFullscreenController.mm:150: Line contains tab character. [whitespace/tab] [5] WebKit/mac/WebView/WebVideoFullscreenController.mm:151: Line contains tab character. [whitespace/tab] [5] Total errors found: 5 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 332968 3 78664 pnormand 2011-01-12 01:47:45 -0800 Created attachment 78664 proposed patch 353584 4 pnormand 2011-02-18 07:01:46 -0800 Eric, when you get time can you please look at this patch? Thanks! 353746 5 78664 eric 2011-02-18 12:32:01 -0800 Comment on attachment 78664 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=78664&action=review Seems we could use functions to abstract away some of this, no? > WebKit/mac/WebView/WebVideoFullscreenController.mm:117 > + [window setHasShadow:YES]; // This is nicer with a shadow. > + [window setLevel:NSPopUpMenuWindowLevel-1]; Seems this is shared with the QT path, no? 359706 6 84196 pnormand 2011-03-01 00:23:04 -0800 Created attachment 84196 proposed patch 359707 7 webkit.review.bot 2011-03-01 00:26:28 -0800 Attachment 84196 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/mac/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/mac/WebView/WebVideoFullscreenController.mm:108: Line contains tab character. [whitespace/tab] [5] Source/WebKit/mac/WebView/WebVideoFullscreenController.mm:109: Line contains tab character. [whitespace/tab] [5] Source/WebKit/mac/WebView/WebVideoFullscreenController.mm:110: Line contains tab character. [whitespace/tab] [5] Total errors found: 3 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 359709 8 84198 pnormand 2011-03-01 00:29:04 -0800 Created attachment 84198 proposed patch 360823 9 pnormand 2011-03-02 08:58:11 -0800 Thanks Eric, both of you :) Committed r80136: <http://trac.webkit.org/changeset/80136> 78663 2011-01-12 01:36:26 -0800 2011-01-12 01:47:45 -0800 proposed patch proposed-patch.patch text/plain 4453 pnormand RnJvbSBhZTEzMGY0YTljMjNkM2FiOWNjYmY3OTZhZWUwODNkZGE3ZDA4NjZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDI4IFNlcCAyMDEwIDE2OjA3OjQ5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViS2l0L21hYy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKwogV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0gfCAgIDI2ICsrKysrKysrKysrKysrKysrKysrCiAy IGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCBh N2FmMWY0Li4xZDkxYjFkIDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9X ZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTAxLTEyICBQaGlsaXBw ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1N0cmVhbWVyXSBzdXBwb3J0IGluIG1hYyB2aWRl byBmdWxsc2NyZWVuIGNvbnRyb2xsZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUyMjgwCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZGVvRnVsbHNj cmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xs ZXIgd2luZG93RGlkTG9hZF0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s bGVyIHNldE1lZGlhRWxlbWVudDpXZWJDb3JlOjpdKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlciB3aW5kb3dEaWRFeGl0RnVsbHNjcmVlbl0pOgorCiAyMDExLTAxLTA3 ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KaW5kZXggOTNlM2Q4Yy4uNmE3MmM5YSAxMDA2NDQK LS0tIGEvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0K KysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0K QEAgLTM4LDYgKzM4LDEwIEBACiAjaW1wb3J0IDxvYmpjL29iamMtcnVudGltZS5oPgogI2ltcG9y dCA8d3RmL1VudXNlZFBhcmFtLmg+CiAKKyNpZiBVU0UoR1NUUkVBTUVSKQorI2ltcG9ydCA8V2Vi Q29yZS9HU3RyZWFtZXJHV29ybGQuaD4KKyNlbmRpZgorCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFFU S2l0KQogU09GVF9MSU5LX0NMQVNTKFFUS2l0LCBRVE1vdmllTGF5ZXIpCiAKQEAgLTEwMyw2ICsx MDcsMTUgQEAgc3RhdGljIGNvbnN0IE5TVGltZUludGVydmFsIHRpY2tsZVRpbWVySW50ZXJ2YWwg PSAxLjA7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAjZWxzZQogICAgIFdlYlZpZGVvRnVs bHNjcmVlbldpbmRvdyAqd2luZG93ID0gW3NlbGYgZnVsbHNjcmVlbldpbmRvd107CisjaWYgVVNF KEdTVFJFQU1FUikKKyAgICBpZiAoX21lZGlhRWxlbWVudCAmJiBfbWVkaWFFbGVtZW50LT5wbGF0 Zm9ybU1lZGlhKCkudHlwZSA9PSBXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhOjpHU3RyZWFtZXJHV29y bGRUeXBlKSB7CisJV2ViQ29yZTo6R1N0cmVhbWVyR1dvcmxkKiBnc3RHd29ybGQgPSBfbWVkaWFF bGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkubWVkaWEuZ3N0cmVhbWVyR1dvcmxkOworCWlmIChnc3RH d29ybGQtPmVudGVyRnVsbHNjcmVlbigpKQorCSAgICBbd2luZG93IHNldENvbnRlbnRWaWV3Omdz dEd3b3JsZC0+cGxhdGZvcm1WaWRlb1dpbmRvdygpLT53aW5kb3coKV07CisgICAgfQorICAgIFt3 aW5kb3cgc2V0SGFzU2hhZG93OllFU107IC8vIFRoaXMgaXMgbmljZXIgd2l0aCBhIHNoYWRvdy4K KyAgICBbd2luZG93IHNldExldmVsOk5TUG9wVXBNZW51V2luZG93TGV2ZWwtMV07CisjZWxzZQog ICAgIFFUTW92aWVMYXllciAqbGF5ZXIgPSBbW2dldFFUTW92aWVMYXllckNsYXNzKCkgYWxsb2Nd IGluaXRdOwogICAgIFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRMYXllcjpsYXllcl07CiAgICAg W1t3aW5kb3cgY29udGVudFZpZXddIHNldFdhbnRzTGF5ZXI6WUVTXTsKQEAgLTExNSw2ICsxMjgs NyBAQCBzdGF0aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwgdGlja2xlVGltZXJJbnRlcnZhbCA9IDEu MDsKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVy OnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlOikgbmFt ZTpOU0FwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07 CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpz ZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihhcHBsaWNhdGlvbkRpZENoYW5nZVNjcmVlblBhcmFtZXRl cnM6KSBuYW1lOk5TQXBwbGljYXRpb25EaWRDaGFuZ2VTY3JlZW5QYXJhbWV0ZXJzTm90aWZpY2F0 aW9uIG9iamVjdDpOU0FwcF07CiAjZW5kaWYKKyNlbmRpZgogfQogCiAtIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50KiltZWRpYUVsZW1lbnQKQEAgLTEzMCw2ICsxNDQsMTMgQEAgc3RhdGljIGNv bnN0IE5TVGltZUludGVydmFsIHRpY2tsZVRpbWVySW50ZXJ2YWwgPSAxLjA7CiAjZWxzZQogICAg IF9tZWRpYUVsZW1lbnQgPSBtZWRpYUVsZW1lbnQ7CiAgICAgaWYgKFtzZWxmIGlzV2luZG93TG9h ZGVkXSkgeworI2lmIFVTRShHU1RSRUFNRVIpCisgICAgICAgIGlmIChfbWVkaWFFbGVtZW50ICYm IF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS50eXBlID09IFdlYkNvcmU6OlBsYXRmb3Jt TWVkaWE6OkdTdHJlYW1lckdXb3JsZFR5cGUpIHsKKyAgICAgICAgICAgIFdlYkNvcmU6OkdTdHJl YW1lckdXb3JsZCogZ3N0R3dvcmxkID0gX21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLm1l ZGlhLmdzdHJlYW1lckdXb3JsZDsKKwkgICAgaWYgKGdzdEd3b3JsZC0+ZW50ZXJGdWxsc2NyZWVu KCkpCisJICAgICAgICBbW3NlbGYgZnVsbHNjcmVlbldpbmRvd10gc2V0Q29udGVudFZpZXc6Z3N0 R3dvcmxkLT5wbGF0Zm9ybVZpZGVvV2luZG93KCktPndpbmRvdygpXTsKKyAgICAgICAgfQorI2Vs c2UKICAgICAgICAgUVRNb3ZpZSAqbW92aWUgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlh KCkudHlwZSA9PSBXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhOjpRVE1vdmllVHlwZSA/IF9tZWRpYUVs ZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5xdE1vdmllIDogMDsKICAgICAgICAgUVRNb3Zp ZUxheWVyICptb3ZpZUxheWVyID0gKFFUTW92aWVMYXllciAqKVtbW3NlbGYgZnVsbHNjcmVlbldp bmRvd10gY29udGVudFZpZXddIGxheWVyXTsKIApAQCAtMTQwLDYgKzE2MSw3IEBAIHN0YXRpYyBj b25zdCBOU1RpbWVJbnRlcnZhbCB0aWNrbGVUaW1lckludGVydmFsID0gMS4wOwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdG9yOkBzZWxlY3Rv cihyYXRlQ2hhbmdlZDopIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBuYW1lOlFUTW92aWVSYXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0Om1v dmllXTsKKyNlbmRpZgogICAgIH0KICNlbmRpZgogfQpAQCAtMTY2LDYgKzE4OCwxMCBAQCBzdGF0 aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwgdGlja2xlVGltZXJJbnRlcnZhbCA9IDEuMDsKIAogLSAo dm9pZCl3aW5kb3dEaWRFeGl0RnVsbHNjcmVlbgogeworI2lmIFVTRShHU1RSRUFNRVIpCisgICAg aWYgKF9tZWRpYUVsZW1lbnQgJiYgX21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLnR5cGUg PT0gV2ViQ29yZTo6UGxhdGZvcm1NZWRpYTo6R1N0cmVhbWVyR1dvcmxkVHlwZSkKKyAgICAgICAg X21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLm1lZGlhLmdzdHJlYW1lckdXb3JsZC0+ZXhp dEZ1bGxzY3JlZW4oKTsKKyNlbmRpZgogICAgIFtzZWxmIGNsZWFyRmFkZUFuaW1hdGlvbl07CiAg ICAgW1tzZWxmIHdpbmRvd10gY2xvc2VdOwogICAgIFtzZWxmIHNldFdpbmRvdzpuaWxdOwotLSAK MS43LjIuMw== 78664 2011-01-12 01:47:45 -0800 2011-03-01 00:23:04 -0800 proposed patch proposed-patch.patch text/plain 4628 pnormand RnJvbSAxMGQyYzBiODgxZDAwYjAzYzIwODgxYmE3YTA5NDA3OTI5ZGJkOTQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDI4IFNlcCAyMDEwIDE2OjA3OjQ5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViS2l0L21hYy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrCiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlk ZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbSB8ICAgMjggKysrKysrKysrKysrKysrKysrKy0KIDIg ZmlsZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGE3 YWYxZjQuLjFkOTFiMWQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1dl YktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTIgIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHU3RyZWFtZXJdIHN1cHBvcnQgaW4gbWFjIHZpZGVv IGZ1bGxzY3JlZW4gY29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTIyODAKKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlkZW9GdWxsc2Ny ZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xs ZXIgc2V0TWVkaWFFbGVtZW50OldlYkNvcmU6Ol0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxz Y3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZEV4aXRGdWxsc2NyZWVuXSk6CisKIDIwMTEtMDEtMDcg IEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0gYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlk ZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQppbmRleCA5M2UzZDhjLi5kZGUyMmZmIDEwMDY0NAot LS0gYS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQor KysgYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQpA QCAtMzgsNiArMzgsMTAgQEAKICNpbXBvcnQgPG9iamMvb2JqYy1ydW50aW1lLmg+CiAjaW1wb3J0 IDx3dGYvVW51c2VkUGFyYW0uaD4KIAorI2lmIFVTRShHU1RSRUFNRVIpCisjaW1wb3J0IDxXZWJD b3JlL0dTdHJlYW1lckdXb3JsZC5oPgorI2VuZGlmCisKIFNPRlRfTElOS19GUkFNRVdPUksoUVRL aXQpCiBTT0ZUX0xJTktfQ0xBU1MoUVRLaXQsIFFUTW92aWVMYXllcikKIApAQCAtMTAzLDYgKzEw NywxNSBAQCBzdGF0aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwgdGlja2xlVGltZXJJbnRlcnZhbCA9 IDEuMDsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICNlbHNlCiAgICAgV2ViVmlkZW9GdWxs c2NyZWVuV2luZG93ICp3aW5kb3cgPSBbc2VsZiBmdWxsc2NyZWVuV2luZG93XTsKKyNpZiBVU0Uo R1NUUkVBTUVSKQorICAgIGlmIChfbWVkaWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRm b3JtTWVkaWEoKS50eXBlID09IFdlYkNvcmU6OlBsYXRmb3JtTWVkaWE6OkdTdHJlYW1lckdXb3Js ZFR5cGUpIHsKKyAgICAgICBXZWJDb3JlOjpHU3RyZWFtZXJHV29ybGQqIGdzdEd3b3JsZCA9IF9t ZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5nc3RyZWFtZXJHV29ybGQ7CisgICAg ICAgaWYgKGdzdEd3b3JsZC0+ZW50ZXJGdWxsc2NyZWVuKCkpCisgICAgICAgICAgW3dpbmRvdyBz ZXRDb250ZW50Vmlldzpnc3RHd29ybGQtPnBsYXRmb3JtVmlkZW9XaW5kb3coKS0+d2luZG93KCld OworICAgIH0KKyAgICBbd2luZG93IHNldEhhc1NoYWRvdzpZRVNdOyAvLyBUaGlzIGlzIG5pY2Vy IHdpdGggYSBzaGFkb3cuCisgICAgW3dpbmRvdyBzZXRMZXZlbDpOU1BvcFVwTWVudVdpbmRvd0xl dmVsLTFdOworI2Vsc2UKICAgICBRVE1vdmllTGF5ZXIgKmxheWVyID0gW1tnZXRRVE1vdmllTGF5 ZXJDbGFzcygpIGFsbG9jXSBpbml0XTsKICAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0TGF5 ZXI6bGF5ZXJdOwogICAgIFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107 CkBAIC0xMTEsMTAgKzEyNCwxMSBAQCBzdGF0aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwgdGlja2xl VGltZXJJbnRlcnZhbCA9IDEuMDsKICAgICBbd2luZG93IHNldEhhc1NoYWRvdzpZRVNdOyAvLyBU aGlzIGlzIG5pY2VyIHdpdGggYSBzaGFkb3cuCiAgICAgW3dpbmRvdyBzZXRMZXZlbDpOU1BvcFVw TWVudVdpbmRvd0xldmVsLTFdOwogICAgIFtsYXllciByZWxlYXNlXTsKLSAgICAKKwogICAgIFtb TlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBzZWxl Y3RvcjpAc2VsZWN0b3IoYXBwbGljYXRpb25EaWRSZXNpZ25BY3RpdmU6KSBuYW1lOk5TQXBwbGlj YXRpb25EaWRSZXNpZ25BY3RpdmVOb3RpZmljYXRpb24gb2JqZWN0Ok5TQXBwXTsKICAgICBbW05T Tm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0 b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkQ2hhbmdlU2NyZWVuUGFyYW1ldGVyczopIG5hbWU6 TlNBcHBsaWNhdGlvbkRpZENoYW5nZVNjcmVlblBhcmFtZXRlcnNOb3RpZmljYXRpb24gb2JqZWN0 Ok5TQXBwXTsKICNlbmRpZgorI2VuZGlmCiB9CiAKIC0gKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQqKW1lZGlhRWxlbWVudApAQCAtMTMwLDYgKzE0NCwxMyBAQCBzdGF0aWMgY29uc3QgTlNUaW1l SW50ZXJ2YWwgdGlja2xlVGltZXJJbnRlcnZhbCA9IDEuMDsKICNlbHNlCiAgICAgX21lZGlhRWxl bWVudCA9IG1lZGlhRWxlbWVudDsKICAgICBpZiAoW3NlbGYgaXNXaW5kb3dMb2FkZWRdKSB7Cisj aWYgVVNFKEdTVFJFQU1FUikKKyAgICAgICAgaWYgKF9tZWRpYUVsZW1lbnQgJiYgX21lZGlhRWxl bWVudC0+cGxhdGZvcm1NZWRpYSgpLnR5cGUgPT0gV2ViQ29yZTo6UGxhdGZvcm1NZWRpYTo6R1N0 cmVhbWVyR1dvcmxkVHlwZSkgeworICAgICAgICAgICAgV2ViQ29yZTo6R1N0cmVhbWVyR1dvcmxk KiBnc3RHd29ybGQgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkubWVkaWEuZ3N0cmVh bWVyR1dvcmxkOworICAgICAgICAgICAgaWYgKGdzdEd3b3JsZC0+ZW50ZXJGdWxsc2NyZWVuKCkp CisgICAgICAgICAgICAgICAgW1tzZWxmIGZ1bGxzY3JlZW5XaW5kb3ddIHNldENvbnRlbnRWaWV3 OmdzdEd3b3JsZC0+cGxhdGZvcm1WaWRlb1dpbmRvdygpLT53aW5kb3coKV07CisgICAgICAgIH0K KyNlbHNlCiAgICAgICAgIFFUTW92aWUgKm1vdmllID0gX21lZGlhRWxlbWVudC0+cGxhdGZvcm1N ZWRpYSgpLnR5cGUgPT0gV2ViQ29yZTo6UGxhdGZvcm1NZWRpYTo6UVRNb3ZpZVR5cGUgPyBfbWVk aWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkubWVkaWEucXRNb3ZpZSA6IDA7CiAgICAgICAgIFFU TW92aWVMYXllciAqbW92aWVMYXllciA9IChRVE1vdmllTGF5ZXIgKilbW1tzZWxmIGZ1bGxzY3Jl ZW5XaW5kb3ddIGNvbnRlbnRWaWV3XSBsYXllcl07CiAKQEAgLTE0MCw2ICsxNjEsNyBAQCBzdGF0 aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwgdGlja2xlVGltZXJJbnRlcnZhbCA9IDEuMDsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3RvcjpAc2Vs ZWN0b3IocmF0ZUNoYW5nZWQ6KSAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbmFtZTpRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVj dDptb3ZpZV07CisjZW5kaWYKICAgICB9CiAjZW5kaWYKIH0KQEAgLTE2Niw2ICsxODgsMTAgQEAg c3RhdGljIGNvbnN0IE5TVGltZUludGVydmFsIHRpY2tsZVRpbWVySW50ZXJ2YWwgPSAxLjA7CiAK IC0gKHZvaWQpd2luZG93RGlkRXhpdEZ1bGxzY3JlZW4KIHsKKyNpZiBVU0UoR1NUUkVBTUVSKQor ICAgIGlmIChfbWVkaWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS50 eXBlID09IFdlYkNvcmU6OlBsYXRmb3JtTWVkaWE6OkdTdHJlYW1lckdXb3JsZFR5cGUpCisgICAg ICAgIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5nc3RyZWFtZXJHV29ybGQt PmV4aXRGdWxsc2NyZWVuKCk7CisjZW5kaWYKICAgICBbc2VsZiBjbGVhckZhZGVBbmltYXRpb25d OwogICAgIFtbc2VsZiB3aW5kb3ddIGNsb3NlXTsKICAgICBbc2VsZiBzZXRXaW5kb3c6bmlsXTsK LS0gCjEuNy4yLjM= 84196 2011-03-01 00:23:04 -0800 2011-03-01 00:29:04 -0800 proposed patch proposed-patch.patch text/plain 6467 pnormand RnJvbSBhNTBkNzdjNTBjOTg5MDQ3YWVhYjUwMDRkNDhhNjllOTdkN2UxNWIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDI4IFNlcCAyMDEwIDE2OjA3OjQ5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE3ICsrKysrKysKIC4uLi9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1 bGxzY3JlZW5Db250cm9sbGVyLmggICAgIHwgICAgMiArCiAuLi4vbWFjL1dlYlZpZXcvV2ViVmlk ZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbSAgICB8ICAgNDYgKysrKysrKysrKysrKysrLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cKaW5kZXggZTA5MTRiNi4uYWU4N2M3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIwIEBACisyMDExLTAzLTAxICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb R1N0cmVhbWVyXSBzdXBwb3J0IGluIG1hYyB2aWRlbyBmdWxsc2NyZWVuIGNvbnRyb2xsZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMjgwCisKKyAg ICAgICAgRmFjdG9yZWQgdGhlIGNvZGUgdG8gY29uZmlndXJlIHRoZSB2aWRlbyBvdmVybGF5IGlu IGEgbmV3IHByaXZhdGUKKyAgICAgICAgbWV0aG9kIG9mIHRoZSBjb250cm9sbGVyIGFuZCBhZGRl ZCBHU3RyZWFtZXIgc3VwcG9ydCB0byBpdC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlkZW9G dWxsc2NyZWVuQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlkZW9GdWxsc2Ny ZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ciBzZXR1cFZpZGVvT3ZlcmxheTpdKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIgc2V0TWVkaWFFbGVtZW50OldlYkNvcmU6Ol0pOgorICAgICAgICAoLVtXZWJWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZEV4aXRGdWxsc2NyZWVuXSk6CisKIDIwMTEt MDItMjggIENoYW5nIFNodSAgPGNzaHVAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBSeW9zdWtlIE5pd2EuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCmluZGV4IDY5YmE5ZjQuLjdmNzg3YjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2Ny ZWVuQ29udHJvbGxlci5oCkBAIC0zNCw2ICszNCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIEBw cm90b2NvbCBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyRGVsZWdhdGU7CiBAY2xhc3MgV2Vi VmlkZW9GdWxsc2NyZWVuSFVEV2luZG93Q29udHJvbGxlcjsKIEBjbGFzcyBXZWJXaW5kb3dGYWRl QW5pbWF0aW9uOworQGNsYXNzIFFUTW92aWVMYXllcjsKIAogQGludGVyZmFjZSBXZWJWaWRlb0Z1 bGxzY3JlZW5Db250cm9sbGVyIDogTlNXaW5kb3dDb250cm9sbGVyIHsKIEBwcml2YXRlCkBAIC01 OCw2ICs1OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIC0gKGlkIDxXZWJWaWRlb0Z1bGxzY3Jl ZW5Db250cm9sbGVyRGVsZWdhdGU+KWRlbGVnYXRlOwogLSAodm9pZClzZXREZWxlZ2F0ZTooaWQg PFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJEZWxlZ2F0ZT4pZGVsZWdhdGU7CiAKKy0gKHZv aWQpc2V0dXBWaWRlb092ZXJsYXk6KFFUTW92aWVMYXllciopbGF5ZXI7CiAtICh2b2lkKXNldE1l ZGlhRWxlbWVudDooV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCopbWVkaWFFbGVtZW50OwogLSAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCopbWVkaWFFbGVtZW50OwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0g Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIu bW0KaW5kZXggOTNlM2Q4Yy4uOWIxNWI2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQpAQCAtMzgsNiAr MzgsMTAgQEAKICNpbXBvcnQgPG9iamMvb2JqYy1ydW50aW1lLmg+CiAjaW1wb3J0IDx3dGYvVW51 c2VkUGFyYW0uaD4KIAorI2lmIFVTRShHU1RSRUFNRVIpCisjaW1wb3J0IDxXZWJDb3JlL0dTdHJl YW1lckdXb3JsZC5oPgorI2VuZGlmCisKIFNPRlRfTElOS19GUkFNRVdPUksoUVRLaXQpCiBTT0ZU X0xJTktfQ0xBU1MoUVRLaXQsIFFUTW92aWVMYXllcikKIApAQCAtOTYsNiArMTAwLDIzIEBAIHN0 YXRpYyBjb25zdCBOU1RpbWVJbnRlcnZhbCB0aWNrbGVUaW1lckludGVydmFsID0gMS4wOwogICAg IHJldHVybiAoV2ViVmlkZW9GdWxsc2NyZWVuV2luZG93ICopW3N1cGVyIHdpbmRvd107CiB9CiAK Ky0gKHZvaWQpc2V0dXBWaWRlb092ZXJsYXk6KFFUTW92aWVMYXllciopbGF5ZXIKK3sKKyAgICBX ZWJWaWRlb0Z1bGxzY3JlZW5XaW5kb3cgKndpbmRvdyA9IFtzZWxmIGZ1bGxzY3JlZW5XaW5kb3dd OworI2lmIFVTRShHU1RSRUFNRVIpCisgICAgaWYgKF9tZWRpYUVsZW1lbnQgJiYgX21lZGlhRWxl bWVudC0+cGxhdGZvcm1NZWRpYSgpLnR5cGUgPT0gV2ViQ29yZTo6UGxhdGZvcm1NZWRpYTo6R1N0 cmVhbWVyR1dvcmxkVHlwZSkgeworCVdlYkNvcmU6OkdTdHJlYW1lckdXb3JsZCogZ3N0R3dvcmxk ID0gX21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLm1lZGlhLmdzdHJlYW1lckdXb3JsZDsK KwlpZiAoZ3N0R3dvcmxkLT5lbnRlckZ1bGxzY3JlZW4oKSkKKwkgICAgW3dpbmRvdyBzZXRDb250 ZW50Vmlldzpnc3RHd29ybGQtPnBsYXRmb3JtVmlkZW9XaW5kb3coKS0+d2luZG93KCldOworICAg IH0KKyNlbHNlCisgICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldExheWVyOmxheWVyXTsKKyAg ICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0V2FudHNMYXllcjpZRVNdOworICAgIGlmIChfbWVk aWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS50eXBlID09IFdlYkNv cmU6OlBsYXRmb3JtTWVkaWE6OlFUTW92aWVUeXBlKQorICAgICAgICBbbGF5ZXIgc2V0TW92aWU6 X21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLm1lZGlhLnF0TW92aWVdOworI2VuZGlmCit9 CisKIC0gKHZvaWQpd2luZG93RGlkTG9hZAogewogI2lmZGVmIEJVSUxESU5HX09OX1RJR0VSCkBA IC0xMDMsMTggKzEyNCwxOCBAQCBzdGF0aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwgdGlja2xlVGlt ZXJJbnRlcnZhbCA9IDEuMDsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICNlbHNlCiAgICAg V2ViVmlkZW9GdWxsc2NyZWVuV2luZG93ICp3aW5kb3cgPSBbc2VsZiBmdWxsc2NyZWVuV2luZG93 XTsKLSAgICBRVE1vdmllTGF5ZXIgKmxheWVyID0gW1tnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGFs bG9jXSBpbml0XTsKLSAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0TGF5ZXI6bGF5ZXJdOwot ICAgIFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107Ci0gICAgaWYgKF9t ZWRpYUVsZW1lbnQgJiYgX21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLnR5cGUgPT0gV2Vi Q29yZTo6UGxhdGZvcm1NZWRpYTo6UVRNb3ZpZVR5cGUpCi0gICAgICAgIFtsYXllciBzZXRNb3Zp ZTpfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkubWVkaWEucXRNb3ZpZV07CiAgICAgW3dp bmRvdyBzZXRIYXNTaGFkb3c6WUVTXTsgLy8gVGhpcyBpcyBuaWNlciB3aXRoIGEgc2hhZG93Lgog ICAgIFt3aW5kb3cgc2V0TGV2ZWw6TlNQb3BVcE1lbnVXaW5kb3dMZXZlbC0xXTsKKworICAgIFFU TW92aWVMYXllciAqbGF5ZXIgPSBbW2dldFFUTW92aWVMYXllckNsYXNzKCkgYWxsb2NdIGluaXRd OworICAgIFtzZWxmIHNldHVwVmlkZW9PdmVybGF5OmxheWVyXTsKICAgICBbbGF5ZXIgcmVsZWFz ZV07Ci0gICAgCisKKyNpZiAhVVNFKEdTVFJFQU1FUikKICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu dGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGFw cGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlOikgbmFtZTpOU0FwcGxpY2F0aW9uRGlkUmVzaWduQWN0 aXZlTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihhcHBs aWNhdGlvbkRpZENoYW5nZVNjcmVlblBhcmFtZXRlcnM6KSBuYW1lOk5TQXBwbGljYXRpb25EaWRD aGFuZ2VTY3JlZW5QYXJhbWV0ZXJzTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiAjZW5kaWYK KyNlbmRpZgogfQogCiAtIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50KiltZWRpYUVsZW1lbnQK QEAgLTEzMCwxNiArMTUxLDE3IEBAIHN0YXRpYyBjb25zdCBOU1RpbWVJbnRlcnZhbCB0aWNrbGVU aW1lckludGVydmFsID0gMS4wOwogI2Vsc2UKICAgICBfbWVkaWFFbGVtZW50ID0gbWVkaWFFbGVt ZW50OwogICAgIGlmIChbc2VsZiBpc1dpbmRvd0xvYWRlZF0pIHsKLSAgICAgICAgUVRNb3ZpZSAq bW92aWUgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkudHlwZSA9PSBXZWJDb3JlOjpQ bGF0Zm9ybU1lZGlhOjpRVE1vdmllVHlwZSA/IF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEo KS5tZWRpYS5xdE1vdmllIDogMDsKICAgICAgICAgUVRNb3ZpZUxheWVyICptb3ZpZUxheWVyID0g KFFUTW92aWVMYXllciAqKVtbW3NlbGYgZnVsbHNjcmVlbldpbmRvd10gY29udGVudFZpZXddIGxh eWVyXTsKIAogICAgICAgICBBU1NFUlQobW92aWVMYXllciAmJiBbbW92aWVMYXllciBpc0tpbmRP ZkNsYXNzOltnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGNsYXNzXV0pOwotICAgICAgICBBU1NFUlQo bW92aWUpOwotICAgICAgICBbbW92aWVMYXllciBzZXRNb3ZpZTptb3ZpZV07CisgICAgICAgIFtz ZWxmIHNldHVwVmlkZW9PdmVybGF5Om1vdmllTGF5ZXJdOworI2lmICFVU0UoR1NUUkVBTUVSKQor ICAgICAgICBBU1NFUlQoW21vdmllTGF5ZXIgbW92aWVdKTsKICAgICAgICAgW1tOU05vdGlmaWNh dGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZWN0b3I6QHNlbGVjdG9yKHJh dGVDaGFuZ2VkOikgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5hbWU6UVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3RpZmljYXRpb24gCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvYmplY3Q6bW92aWVd OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2Jq ZWN0Olttb3ZpZUxheWVyIG1vdmllXV07CisjZW5kaWYKICAgICB9CiAjZW5kaWYKIH0KQEAgLTE2 Niw2ICsxODgsMTAgQEAgc3RhdGljIGNvbnN0IE5TVGltZUludGVydmFsIHRpY2tsZVRpbWVySW50 ZXJ2YWwgPSAxLjA7CiAKIC0gKHZvaWQpd2luZG93RGlkRXhpdEZ1bGxzY3JlZW4KIHsKKyNpZiBV U0UoR1NUUkVBTUVSKQorICAgIGlmIChfbWVkaWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBs YXRmb3JtTWVkaWEoKS50eXBlID09IFdlYkNvcmU6OlBsYXRmb3JtTWVkaWE6OkdTdHJlYW1lckdX b3JsZFR5cGUpCisgICAgICAgIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5n c3RyZWFtZXJHV29ybGQtPmV4aXRGdWxsc2NyZWVuKCk7CisjZW5kaWYKICAgICBbc2VsZiBjbGVh ckZhZGVBbmltYXRpb25dOwogICAgIFtbc2VsZiB3aW5kb3ddIGNsb3NlXTsKICAgICBbc2VsZiBz ZXRXaW5kb3c6bmlsXTsKLS0gCjEuNy40LjE= 84198 2011-03-01 00:29:04 -0800 2011-03-02 08:05:48 -0800 proposed patch proposed-patch.patch text/plain 6488 pnormand RnJvbSBkOWMzM2M1MDUxNDI5NjNmMGRhODM5OGVlM2U3ZDkzZTI2ZWFmNWM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDI4IFNlcCAyMDEwIDE2OjA3OjQ5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE3ICsrKysrKysKIC4uLi9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1 bGxzY3JlZW5Db250cm9sbGVyLmggICAgIHwgICAgMiArCiAuLi4vbWFjL1dlYlZpZXcvV2ViVmlk ZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbSAgICB8ICAgNDYgKysrKysrKysrKysrKysrLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cKaW5kZXggZTA5MTRiNi4uYWU4N2M3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIwIEBACisyMDExLTAzLTAxICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb R1N0cmVhbWVyXSBzdXBwb3J0IGluIG1hYyB2aWRlbyBmdWxsc2NyZWVuIGNvbnRyb2xsZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMjgwCisKKyAg ICAgICAgRmFjdG9yZWQgdGhlIGNvZGUgdG8gY29uZmlndXJlIHRoZSB2aWRlbyBvdmVybGF5IGlu IGEgbmV3IHByaXZhdGUKKyAgICAgICAgbWV0aG9kIG9mIHRoZSBjb250cm9sbGVyIGFuZCBhZGRl ZCBHU3RyZWFtZXIgc3VwcG9ydCB0byBpdC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlkZW9G dWxsc2NyZWVuQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlkZW9GdWxsc2Ny ZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ciBzZXR1cFZpZGVvT3ZlcmxheTpdKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIgc2V0TWVkaWFFbGVtZW50OldlYkNvcmU6Ol0pOgorICAgICAgICAoLVtXZWJWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZEV4aXRGdWxsc2NyZWVuXSk6CisKIDIwMTEt MDItMjggIENoYW5nIFNodSAgPGNzaHVAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBSeW9zdWtlIE5pd2EuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCmluZGV4IDY5YmE5ZjQuLjdmNzg3YjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2Ny ZWVuQ29udHJvbGxlci5oCkBAIC0zNCw2ICszNCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIEBw cm90b2NvbCBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyRGVsZWdhdGU7CiBAY2xhc3MgV2Vi VmlkZW9GdWxsc2NyZWVuSFVEV2luZG93Q29udHJvbGxlcjsKIEBjbGFzcyBXZWJXaW5kb3dGYWRl QW5pbWF0aW9uOworQGNsYXNzIFFUTW92aWVMYXllcjsKIAogQGludGVyZmFjZSBXZWJWaWRlb0Z1 bGxzY3JlZW5Db250cm9sbGVyIDogTlNXaW5kb3dDb250cm9sbGVyIHsKIEBwcml2YXRlCkBAIC01 OCw2ICs1OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIC0gKGlkIDxXZWJWaWRlb0Z1bGxzY3Jl ZW5Db250cm9sbGVyRGVsZWdhdGU+KWRlbGVnYXRlOwogLSAodm9pZClzZXREZWxlZ2F0ZTooaWQg PFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJEZWxlZ2F0ZT4pZGVsZWdhdGU7CiAKKy0gKHZv aWQpc2V0dXBWaWRlb092ZXJsYXk6KFFUTW92aWVMYXllciopbGF5ZXI7CiAtICh2b2lkKXNldE1l ZGlhRWxlbWVudDooV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCopbWVkaWFFbGVtZW50OwogLSAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCopbWVkaWFFbGVtZW50OwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0g Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIu bW0KaW5kZXggOTNlM2Q4Yy4uZmRmMWM4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQpAQCAtMzgsNiAr MzgsMTAgQEAKICNpbXBvcnQgPG9iamMvb2JqYy1ydW50aW1lLmg+CiAjaW1wb3J0IDx3dGYvVW51 c2VkUGFyYW0uaD4KIAorI2lmIFVTRShHU1RSRUFNRVIpCisjaW1wb3J0IDxXZWJDb3JlL0dTdHJl YW1lckdXb3JsZC5oPgorI2VuZGlmCisKIFNPRlRfTElOS19GUkFNRVdPUksoUVRLaXQpCiBTT0ZU X0xJTktfQ0xBU1MoUVRLaXQsIFFUTW92aWVMYXllcikKIApAQCAtOTYsNiArMTAwLDIzIEBAIHN0 YXRpYyBjb25zdCBOU1RpbWVJbnRlcnZhbCB0aWNrbGVUaW1lckludGVydmFsID0gMS4wOwogICAg IHJldHVybiAoV2ViVmlkZW9GdWxsc2NyZWVuV2luZG93ICopW3N1cGVyIHdpbmRvd107CiB9CiAK Ky0gKHZvaWQpc2V0dXBWaWRlb092ZXJsYXk6KFFUTW92aWVMYXllciopbGF5ZXIKK3sKKyAgICBX ZWJWaWRlb0Z1bGxzY3JlZW5XaW5kb3cgKndpbmRvdyA9IFtzZWxmIGZ1bGxzY3JlZW5XaW5kb3dd OworI2lmIFVTRShHU1RSRUFNRVIpCisgICAgaWYgKF9tZWRpYUVsZW1lbnQgJiYgX21lZGlhRWxl bWVudC0+cGxhdGZvcm1NZWRpYSgpLnR5cGUgPT0gV2ViQ29yZTo6UGxhdGZvcm1NZWRpYTo6R1N0 cmVhbWVyR1dvcmxkVHlwZSkgeworICAgICAgICBXZWJDb3JlOjpHU3RyZWFtZXJHV29ybGQqIGdz dEd3b3JsZCA9IF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5nc3RyZWFtZXJH V29ybGQ7CisgICAgICAgIGlmIChnc3RHd29ybGQtPmVudGVyRnVsbHNjcmVlbigpKQorICAgICAg ICAgICAgW3dpbmRvdyBzZXRDb250ZW50Vmlldzpnc3RHd29ybGQtPnBsYXRmb3JtVmlkZW9XaW5k b3coKS0+d2luZG93KCldOworICAgIH0KKyNlbHNlCisgICAgW1t3aW5kb3cgY29udGVudFZpZXdd IHNldExheWVyOmxheWVyXTsKKyAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0V2FudHNMYXll cjpZRVNdOworICAgIGlmIChfbWVkaWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3Jt TWVkaWEoKS50eXBlID09IFdlYkNvcmU6OlBsYXRmb3JtTWVkaWE6OlFUTW92aWVUeXBlKQorICAg ICAgICBbbGF5ZXIgc2V0TW92aWU6X21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLm1lZGlh LnF0TW92aWVdOworI2VuZGlmCit9CisKIC0gKHZvaWQpd2luZG93RGlkTG9hZAogewogI2lmZGVm IEJVSUxESU5HX09OX1RJR0VSCkBAIC0xMDMsMTggKzEyNCwxOCBAQCBzdGF0aWMgY29uc3QgTlNU aW1lSW50ZXJ2YWwgdGlja2xlVGltZXJJbnRlcnZhbCA9IDEuMDsKICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKICNlbHNlCiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuV2luZG93ICp3aW5kb3cgPSBb c2VsZiBmdWxsc2NyZWVuV2luZG93XTsKLSAgICBRVE1vdmllTGF5ZXIgKmxheWVyID0gW1tnZXRR VE1vdmllTGF5ZXJDbGFzcygpIGFsbG9jXSBpbml0XTsKLSAgICBbW3dpbmRvdyBjb250ZW50Vmll d10gc2V0TGF5ZXI6bGF5ZXJdOwotICAgIFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRXYW50c0xh eWVyOllFU107Ci0gICAgaWYgKF9tZWRpYUVsZW1lbnQgJiYgX21lZGlhRWxlbWVudC0+cGxhdGZv cm1NZWRpYSgpLnR5cGUgPT0gV2ViQ29yZTo6UGxhdGZvcm1NZWRpYTo6UVRNb3ZpZVR5cGUpCi0g ICAgICAgIFtsYXllciBzZXRNb3ZpZTpfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkubWVk aWEucXRNb3ZpZV07CiAgICAgW3dpbmRvdyBzZXRIYXNTaGFkb3c6WUVTXTsgLy8gVGhpcyBpcyBu aWNlciB3aXRoIGEgc2hhZG93LgogICAgIFt3aW5kb3cgc2V0TGV2ZWw6TlNQb3BVcE1lbnVXaW5k b3dMZXZlbC0xXTsKKworICAgIFFUTW92aWVMYXllciAqbGF5ZXIgPSBbW2dldFFUTW92aWVMYXll ckNsYXNzKCkgYWxsb2NdIGluaXRdOworICAgIFtzZWxmIHNldHVwVmlkZW9PdmVybGF5OmxheWVy XTsKICAgICBbbGF5ZXIgcmVsZWFzZV07Ci0gICAgCisKKyNpZiAhVVNFKEdTVFJFQU1FUikKICAg ICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYg c2VsZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlOikgbmFtZTpOU0Fw cGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiAgICAg W1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNl bGVjdG9yOkBzZWxlY3RvcihhcHBsaWNhdGlvbkRpZENoYW5nZVNjcmVlblBhcmFtZXRlcnM6KSBu YW1lOk5TQXBwbGljYXRpb25EaWRDaGFuZ2VTY3JlZW5QYXJhbWV0ZXJzTm90aWZpY2F0aW9uIG9i amVjdDpOU0FwcF07CiAjZW5kaWYKKyNlbmRpZgogfQogCiAtIChXZWJDb3JlOjpIVE1MTWVkaWFF bGVtZW50KiltZWRpYUVsZW1lbnQKQEAgLTEzMCwxNiArMTUxLDE3IEBAIHN0YXRpYyBjb25zdCBO U1RpbWVJbnRlcnZhbCB0aWNrbGVUaW1lckludGVydmFsID0gMS4wOwogI2Vsc2UKICAgICBfbWVk aWFFbGVtZW50ID0gbWVkaWFFbGVtZW50OwogICAgIGlmIChbc2VsZiBpc1dpbmRvd0xvYWRlZF0p IHsKLSAgICAgICAgUVRNb3ZpZSAqbW92aWUgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlh KCkudHlwZSA9PSBXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhOjpRVE1vdmllVHlwZSA/IF9tZWRpYUVs ZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5xdE1vdmllIDogMDsKICAgICAgICAgUVRNb3Zp ZUxheWVyICptb3ZpZUxheWVyID0gKFFUTW92aWVMYXllciAqKVtbW3NlbGYgZnVsbHNjcmVlbldp bmRvd10gY29udGVudFZpZXddIGxheWVyXTsKIAogICAgICAgICBBU1NFUlQobW92aWVMYXllciAm JiBbbW92aWVMYXllciBpc0tpbmRPZkNsYXNzOltnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGNsYXNz XV0pOwotICAgICAgICBBU1NFUlQobW92aWUpOwotICAgICAgICBbbW92aWVMYXllciBzZXRNb3Zp ZTptb3ZpZV07CisgICAgICAgIFtzZWxmIHNldHVwVmlkZW9PdmVybGF5Om1vdmllTGF5ZXJdOwor I2lmICFVU0UoR1NUUkVBTUVSKQorICAgICAgICBBU1NFUlQoW21vdmllTGF5ZXIgbW92aWVdKTsK ICAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZl cjpzZWxmCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VsZWN0b3I6QHNlbGVjdG9yKHJhdGVDaGFuZ2VkOikgCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU6UVRNb3ZpZVJhdGVEaWRDaGFuZ2VO b3RpZmljYXRpb24gCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBvYmplY3Q6bW92aWVdOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgb2JqZWN0Olttb3ZpZUxheWVyIG1vdmllXV07CisjZW5kaWYKICAg ICB9CiAjZW5kaWYKIH0KQEAgLTE2Niw2ICsxODgsMTAgQEAgc3RhdGljIGNvbnN0IE5TVGltZUlu dGVydmFsIHRpY2tsZVRpbWVySW50ZXJ2YWwgPSAxLjA7CiAKIC0gKHZvaWQpd2luZG93RGlkRXhp dEZ1bGxzY3JlZW4KIHsKKyNpZiBVU0UoR1NUUkVBTUVSKQorICAgIGlmIChfbWVkaWFFbGVtZW50 ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS50eXBlID09IFdlYkNvcmU6OlBsYXRm b3JtTWVkaWE6OkdTdHJlYW1lckdXb3JsZFR5cGUpCisgICAgICAgIF9tZWRpYUVsZW1lbnQtPnBs YXRmb3JtTWVkaWEoKS5tZWRpYS5nc3RyZWFtZXJHV29ybGQtPmV4aXRGdWxsc2NyZWVuKCk7Cisj ZW5kaWYKICAgICBbc2VsZiBjbGVhckZhZGVBbmltYXRpb25dOwogICAgIFtbc2VsZiB3aW5kb3dd IGNsb3NlXTsKICAgICBbc2VsZiBzZXRXaW5kb3c6bmlsXTsKLS0gCjEuNy40LjE=