102424 2012-11-15 13:40:37 -0800 [chromium] Add unit tests for ChromeClientImpl::getNavigationPolicy 2012-11-28 11:31:46 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ericu ericu abarth webkit.review.bot oldest_to_newest 768437 0 ericu 2012-11-15 13:40:37 -0800 As mentioned in https://bugs.webkit.org/show_bug.cgi?id=102254, we have no tests for this function. It would be good to make sure that we know if its behavior changes. 768480 1 174514 ericu 2012-11-15 14:16:03 -0800 Created attachment 174514 Patch 768485 2 174514 abarth 2012-11-15 14:20:07 -0800 Comment on attachment 174514 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174514&action=review > Source/WebKit/chromium/tests/ChromeClientImplTest.cpp:62 > + TestWebViewClient(WebNavigationPolicy* target) : m_target(target) { } explicit 768487 3 webkit.review.bot 2012-11-15 14:20:20 -0800 Attachment 174514 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/tests/ChromeClientImplTest.cpp:35: Found header this file implements after other header. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 768488 4 174516 ericu 2012-11-15 14:23:07 -0800 Created attachment 174516 Patch 768490 5 ericu 2012-11-15 14:23:51 -0800 Added the explicit. I'll log a bug against check-webkit-style for the style nit. 768491 6 174516 abarth 2012-11-15 14:24:36 -0800 Comment on attachment 174516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174516&action=review > Source/WebKit/chromium/tests/ChromeClientImplTest.cpp:49 > +void setCurrentInputEventForTest(const WebInputEvent* event) > +{ > + WebViewImpl::m_currentInputEvent = event; > +} Would you be willing to put this in WebViewImpl.cpp? The friend trick is nice, but having some distant file poke at private member variables seems worse that linking an extra one-line function into the production build. 768494 7 webkit.review.bot 2012-11-15 14:27:10 -0800 Attachment 174516 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/tests/ChromeClientImplTest.cpp:35: Found header this file implements after other header. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 768497 8 ericu 2012-11-15 14:29:53 -0800 (In reply to comment #6) > (From update of attachment 174516 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=174516&action=review > > > Source/WebKit/chromium/tests/ChromeClientImplTest.cpp:49 > > +void setCurrentInputEventForTest(const WebInputEvent* event) > > +{ > > + WebViewImpl::m_currentInputEvent = event; > > +} > > Would you be willing to put this in WebViewImpl.cpp? The friend trick is nice, but having some distant file poke at private member variables seems worse that linking an extra one-line function into the production build. Really? It's a function that nobody should call, ever, in a production binary, and it's going to take up just that extra little bit of space, so I figured that keeping it in test code only was cleaner. You're the reviewer, so I'll do it if you want, but it feels wrong to me. 768503 9 abarth 2012-11-15 14:34:59 -0800 > Really? It's a function that nobody should call, ever, in a production binary, and it's going to take up just that extra little bit of space, so I figured that keeping it in test code only was cleaner. Ok, let's try it the way you've got it in the patch. 778108 10 174516 webkit.review.bot 2012-11-28 11:31:43 -0800 Comment on attachment 174516 Patch Clearing flags on attachment: 174516 Committed r136032: <http://trac.webkit.org/changeset/136032> 778110 11 webkit.review.bot 2012-11-28 11:31:46 -0800 All reviewed patches have been landed. Closing bug. 174514 2012-11-15 14:16:03 -0800 2012-11-15 14:23:06 -0800 Patch bug-102424-20121115141400.patch text/plain 11036 ericu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDFmOTY1MzY4OGZhNTkwOWVkZjdmOGExZTVhOWMyZDcwZGUzNzZiZGUuLjI2NzAzM2E4NGQyZGQz NmIxNDBhNzYzOTJiZDc1ODhlY2U0ZjhjYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMTEtMTUgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVt Lm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB1bml0IHRlc3RzIGZvciBDaHJvbWVDbGll bnRJbXBsOjpnZXROYXZpZ2F0aW9uUG9saWN5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI0MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHRlc3RzIGEgYnVuY2ggb2YgYmFzaWMgc2NlbmFyaW9z IHJlZ2FyZGluZyB3aGF0IHdpbGwgcHJvZHVjZSBhCisgICAgICAgIHBvcHVwLCBhIG5ldyBmb3Jl Z3JvdW5kL2JhY2tncm91bmQgdGFiLCBvciBhIG5ldyB3aW5kb3cuCisKKyAgICAgICAgKiBXZWJL aXQuZ3lwaTogQWRkZWQgdGVzdCBmaWxlLgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgor ICAgICAgICAoV2ViVmlld0ltcGwpOiBBZGRlZCBmcmllbmQgZGVjbGFyYXRpb24gZm9yIHNldEN1 cnJlbnRJbnB1dEV2ZW50Rm9yVGVzdC4KKyAgICAgICAgKiB0ZXN0cy9DaHJvbWVDbGllbnRJbXBs VGVzdC5jcHA6IEFkZGVkLgorCiAyMDEyLTExLTE0ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgSW5kZXhlZERCOiBSZW1vdmUgbWFnaWMgbnVtYmVycyBpbiBy ZWNvcmQgY29tcGFyYXRvciwgaGFuZGxlIG1pc3NpbmcgY2FzZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwaSBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lmd5cGkKaW5kZXggMDAyOWRhNGIwNzVlMDczY2JmZDY0MWIwMjA0YmMwMDgwM2M0MWY0Ny4u NTlkYjJmMzk2NDM1MzljNGJkMjQ4YTI0MWRlMDFhZmVjMGFiZTRmOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwaQorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL1dlYktpdC5neXBpCkBAIC01Nyw2ICs1Nyw3IEBACiAgICAgICAgICAgICAndGVzdHMvQXNz b2NpYXRlZFVSTExvYWRlclRlc3QuY3BwJywKICAgICAgICAgICAgICd0ZXN0cy9DYW52YXMyRExh eWVyQnJpZGdlVGVzdC5jcHAnLAogICAgICAgICAgICAgJ3Rlc3RzL0NhbnZhczJETGF5ZXJNYW5h Z2VyVGVzdC5jcHAnLAorICAgICAgICAgICAgJ3Rlc3RzL0Nocm9tZUNsaWVudEltcGxUZXN0LmNw cCcsCiAgICAgICAgICAgICAndGVzdHMvQ2xpcGJvYXJkQ2hyb21pdW1UZXN0LmNwcCcsCiAgICAg ICAgICAgICAndGVzdHMvQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRC5oJywKICAg ICAgICAgICAgICd0ZXN0cy9EYXRlVGltZUZvcm1hdFRlc3QuY3BwJywKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDlmMDU2MTgwYjM4OTA2NGM4NTBkNDdlNTQx OWY5N2YyOTZmOGVjNDQuLmQ2MjUxMGNkZGVkNTNkYTU3MGE1Y2E3OGM0OTQ4N2IyN2YwZjc3YWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtNjEwLDYgKzYx MCw3IEBAIHByaXZhdGU6CiAKICAgICBmcmllbmQgY2xhc3MgV2ViVmlldzsgIC8vIFNvIFdlYlZp ZXc6OkNyZWF0ZSBjYW4gY2FsbCBvdXIgY29uc3RydWN0b3IKICAgICBmcmllbmQgY2xhc3MgV1RG OjpSZWZDb3VudGVkPFdlYlZpZXdJbXBsPjsKKyAgICBmcmllbmQgdm9pZCBzZXRDdXJyZW50SW5w dXRFdmVudEZvclRlc3QoY29uc3QgV2ViSW5wdXRFdmVudCopOwogCiAgICAgZW51bSBEcmFnQWN0 aW9uIHsKICAgICAgIERyYWdFbnRlciwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ2hyb21lQ2xpZW50SW1wbFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9DaHJvbWVDbGllbnRJbXBsVGVzdC5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTE1N2IyMGYwYWU2 MjhmOWQ2NWIwNTQxMjMwOWYxNzVjODI4OTUzYQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ2hyb21lQ2xpZW50SW1wbFRlc3QuY3BwCkBAIC0wLDAgKzEs MjY4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6Cisg KgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAq IGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29v Z2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNl ZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNv ZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBD T05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hU CisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisg Ki8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorCisjaW5jbHVkZSA8Z3Rlc3QvZ3Rlc3QuaD4KKwor I2luY2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIldlYkZyYW1lQ2xpZW50LmgiCisjaW5jbHVk ZSAiV2ViSW5wdXRFdmVudC5oIgorI2luY2x1ZGUgIldlYlZpZXcuaCIKKyNpbmNsdWRlICJXZWJW aWV3Q2xpZW50LmgiCisjaW5jbHVkZSAiV2ViVmlld0ltcGwuaCIKKwordXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK3ZvaWQgc2V0Q3VycmVudElucHV0RXZl bnRGb3JUZXN0KGNvbnN0IFdlYklucHV0RXZlbnQqIGV2ZW50KQoreworICAgIFdlYlZpZXdJbXBs OjptX2N1cnJlbnRJbnB1dEV2ZW50ID0gZXZlbnQ7Cit9CisKK30KKworbmFtZXNwYWNlIHsKKwor Y2xhc3MgVGVzdFdlYldpZGdldENsaWVudCA6IHB1YmxpYyBXZWJXaWRnZXRDbGllbnQgeworcHVi bGljOgorICAgIH5UZXN0V2ViV2lkZ2V0Q2xpZW50KCkgeyB9Cit9OworCitjbGFzcyBUZXN0V2Vi Vmlld0NsaWVudCA6IHB1YmxpYyBXZWJWaWV3Q2xpZW50IHsKK3B1YmxpYzoKKyAgICBUZXN0V2Vi Vmlld0NsaWVudChXZWJOYXZpZ2F0aW9uUG9saWN5KiB0YXJnZXQpIDogbV90YXJnZXQodGFyZ2V0 KSB7IH0KKyAgICB+VGVzdFdlYlZpZXdDbGllbnQoKSB7IH0KKworICAgIHZpcnR1YWwgdm9pZCBz aG93KFdlYk5hdmlnYXRpb25Qb2xpY3kgcG9saWN5KQorICAgIHsKKyAgICAgICAgKm1fdGFyZ2V0 ID0gcG9saWN5OworICAgIH0KKworcHJpdmF0ZToKKyAgICBXZWJOYXZpZ2F0aW9uUG9saWN5KiBt X3RhcmdldDsKK307CisKK2NsYXNzIFRlc3RXZWJGcmFtZUNsaWVudCA6IHB1YmxpYyBXZWJGcmFt ZUNsaWVudCB7CitwdWJsaWM6CisgICAgflRlc3RXZWJGcmFtZUNsaWVudCgpIHsgfQorfTsKKwor Y2xhc3MgR2V0TmF2aWdhdGlvblBvbGljeVRlc3QgOiBwdWJsaWMgdGVzdGluZzo6VGVzdCB7Citw dWJsaWM6CisgICAgR2V0TmF2aWdhdGlvblBvbGljeVRlc3QoKQorICAgICAgICA6IG1fcmVzdWx0 KFdlYk5hdmlnYXRpb25Qb2xpY3lJZ25vcmUpCisgICAgICAgICwgbV93ZWJWaWV3Q2xpZW50KCZt X3Jlc3VsdCkKKyAgICB7CisgICAgfQorCitwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCB2b2lkIFNl dFVwKCkKKyAgICB7CisgICAgICAgIG1fd2ViVmlldyA9IHN0YXRpY19jYXN0PFdlYlZpZXdJbXBs Kj4oV2ViVmlldzo6Y3JlYXRlKCZtX3dlYlZpZXdDbGllbnQpKTsKKyAgICAgICAgbV93ZWJWaWV3 LT5pbml0aWFsaXplTWFpbkZyYW1lKCZtX3dlYkZyYW1lQ2xpZW50KTsKKyAgICAgICAgbV9jaHJv bWVDbGllbnRJbXBsID0gc3RhdGljX2Nhc3Q8Q2hyb21lQ2xpZW50SW1wbCo+KG1fd2ViVmlldy0+ cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCkpOworICAgICAgICBtX3Jlc3VsdCA9IFdlYk5hdmln YXRpb25Qb2xpY3lJZ25vcmU7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIFRlYXJEb3duKCkK KyAgICB7CisgICAgICAgIG1fd2ViVmlldy0+Y2xvc2UoKTsKKyAgICB9CisKKyAgICBXZWJOYXZp Z2F0aW9uUG9saWN5IGdldE5hdmlnYXRpb25Qb2xpY3lXaXRoTW91c2VFdmVudChpbnQgbW9kaWZp ZXJzLCBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uLCBib29sIGFzUG9wdXApCisgICAgewor ICAgICAgICBXZWJNb3VzZUV2ZW50IGV2ZW50OworICAgICAgICBldmVudC5tb2RpZmllcnMgPSBt b2RpZmllcnM7CisgICAgICAgIGV2ZW50LnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpNb3VzZVVwOwor ICAgICAgICBldmVudC5idXR0b24gPSBidXR0b247CisgICAgICAgIHNldEN1cnJlbnRJbnB1dEV2 ZW50Rm9yVGVzdCgmZXZlbnQpOworICAgICAgICBtX2Nocm9tZUNsaWVudEltcGwtPnNldFNjcm9s bGJhcnNWaXNpYmxlKCFhc1BvcHVwKTsKKyAgICAgICAgbV9jaHJvbWVDbGllbnRJbXBsLT5zaG93 KCk7CisgICAgICAgIHNldEN1cnJlbnRJbnB1dEV2ZW50Rm9yVGVzdCgwKTsKKyAgICAgICAgcmV0 dXJuIG1fcmVzdWx0OworICAgIH0KKworICAgIGJvb2wgaXNOYXZpZ2F0aW9uUG9saWN5UG9wdXAo KQorICAgIHsKKyAgICAgICAgbV9jaHJvbWVDbGllbnRJbXBsLT5zaG93KCk7CisgICAgICAgIHJl dHVybiBtX3Jlc3VsdCA9PSBXZWJOYXZpZ2F0aW9uUG9saWN5TmV3UG9wdXA7CisgICAgfQorCitw cm90ZWN0ZWQ6CisgICAgV2ViTmF2aWdhdGlvblBvbGljeSBtX3Jlc3VsdDsKKyAgICBUZXN0V2Vi Vmlld0NsaWVudCBtX3dlYlZpZXdDbGllbnQ7CisgICAgV2ViVmlld0ltcGwqIG1fd2ViVmlldzsK KyAgICBUZXN0V2ViRnJhbWVDbGllbnQgbV93ZWJGcmFtZUNsaWVudDsKKyAgICBDaHJvbWVDbGll bnRJbXBsKiBtX2Nocm9tZUNsaWVudEltcGw7Cit9OworCitURVNUX0YoR2V0TmF2aWdhdGlvblBv bGljeVRlc3QsIExlZnRDbGljaykKK3sKKyAgICBpbnQgbW9kaWZpZXJzID0gMDsKKyAgICBXZWJN b3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91c2VFdmVudDo6QnV0dG9uTGVmdDsKKyAg ICBib29sIGFzUG9wdXAgPSBmYWxzZTsKKyAgICBFWFBFQ1RfRVEoV2ViTmF2aWdhdGlvblBvbGlj eU5ld0ZvcmVncm91bmRUYWIsCisgICAgICAgIGdldE5hdmlnYXRpb25Qb2xpY3lXaXRoTW91c2VF dmVudChtb2RpZmllcnMsIGJ1dHRvbiwgYXNQb3B1cCkpOworfQorCitURVNUX0YoR2V0TmF2aWdh dGlvblBvbGljeVRlc3QsIExlZnRDbGlja1BvcHVwKQoreworICAgIGludCBtb2RpZmllcnMgPSAw OworICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50OjpCdXR0 b25MZWZ0OworICAgIGJvb2wgYXNQb3B1cCA9IHRydWU7CisgICAgRVhQRUNUX0VRKFdlYk5hdmln YXRpb25Qb2xpY3lOZXdQb3B1cCwKKyAgICAgICAgZ2V0TmF2aWdhdGlvblBvbGljeVdpdGhNb3Vz ZUV2ZW50KG1vZGlmaWVycywgYnV0dG9uLCBhc1BvcHVwKSk7Cit9CisKK1RFU1RfRihHZXROYXZp Z2F0aW9uUG9saWN5VGVzdCwgU2hpZnRMZWZ0Q2xpY2spCit7CisgICAgaW50IG1vZGlmaWVycyA9 IFdlYklucHV0RXZlbnQ6OlNoaWZ0S2V5OworICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0 b24gPSBXZWJNb3VzZUV2ZW50OjpCdXR0b25MZWZ0OworICAgIGJvb2wgYXNQb3B1cCA9IGZhbHNl OworICAgIEVYUEVDVF9FUShXZWJOYXZpZ2F0aW9uUG9saWN5TmV3V2luZG93LAorICAgICAgICBn ZXROYXZpZ2F0aW9uUG9saWN5V2l0aE1vdXNlRXZlbnQobW9kaWZpZXJzLCBidXR0b24sIGFzUG9w dXApKTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBTaGlmdExlZnRDbGlj a1BvcHVwKQoreworICAgIGludCBtb2RpZmllcnMgPSBXZWJJbnB1dEV2ZW50OjpTaGlmdEtleTsK KyAgICBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91c2VFdmVudDo6QnV0dG9u TGVmdDsKKyAgICBib29sIGFzUG9wdXAgPSB0cnVlOworICAgIEVYUEVDVF9FUShXZWJOYXZpZ2F0 aW9uUG9saWN5TmV3UG9wdXAsCisgICAgICAgIGdldE5hdmlnYXRpb25Qb2xpY3lXaXRoTW91c2VF dmVudChtb2RpZmllcnMsIGJ1dHRvbiwgYXNQb3B1cCkpOworfQorCitURVNUX0YoR2V0TmF2aWdh dGlvblBvbGljeVRlc3QsIENvbnRyb2xPck1ldGFMZWZ0Q2xpY2spCit7CisjaWYgT1MoREFSV0lO KQorICAgIGludCBtb2RpZmllcnMgPSBXZWJJbnB1dEV2ZW50OjpNZXRhS2V5OworI2Vsc2UKKyAg ICBpbnQgbW9kaWZpZXJzID0gV2ViSW5wdXRFdmVudDo6Q29udHJvbEtleTsKKyNlbmRpZgorICAg IFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50OjpCdXR0b25MZWZ0 OworICAgIGJvb2wgYXNQb3B1cCA9IGZhbHNlOworICAgIEVYUEVDVF9FUShXZWJOYXZpZ2F0aW9u UG9saWN5TmV3QmFja2dyb3VuZFRhYiwKKyAgICAgICAgZ2V0TmF2aWdhdGlvblBvbGljeVdpdGhN b3VzZUV2ZW50KG1vZGlmaWVycywgYnV0dG9uLCBhc1BvcHVwKSk7Cit9CisKK1RFU1RfRihHZXRO YXZpZ2F0aW9uUG9saWN5VGVzdCwgQ29udHJvbE9yTWV0YUxlZnRDbGlja1BvcHVwKQoreworI2lm IE9TKERBUldJTikKKyAgICBpbnQgbW9kaWZpZXJzID0gV2ViSW5wdXRFdmVudDo6TWV0YUtleTsK KyNlbHNlCisgICAgaW50IG1vZGlmaWVycyA9IFdlYklucHV0RXZlbnQ6OkNvbnRyb2xLZXk7Cisj ZW5kaWYKKyAgICBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91c2VFdmVudDo6 QnV0dG9uTGVmdDsKKyAgICBib29sIGFzUG9wdXAgPSB0cnVlOworICAgIEVYUEVDVF9FUShXZWJO YXZpZ2F0aW9uUG9saWN5TmV3QmFja2dyb3VuZFRhYiwKKyAgICAgICAgZ2V0TmF2aWdhdGlvblBv bGljeVdpdGhNb3VzZUV2ZW50KG1vZGlmaWVycywgYnV0dG9uLCBhc1BvcHVwKSk7Cit9CisKK1RF U1RfRihHZXROYXZpZ2F0aW9uUG9saWN5VGVzdCwgQ29udHJvbE9yTWV0YUFuZFNoaWZ0TGVmdENs aWNrKQoreworI2lmIE9TKERBUldJTikKKyAgICBpbnQgbW9kaWZpZXJzID0gV2ViSW5wdXRFdmVu dDo6TWV0YUtleTsKKyNlbHNlCisgICAgaW50IG1vZGlmaWVycyA9IFdlYklucHV0RXZlbnQ6OkNv bnRyb2xLZXk7CisjZW5kaWYKKyAgICBtb2RpZmllcnMgfD0gV2ViSW5wdXRFdmVudDo6U2hpZnRL ZXk7CisgICAgV2ViTW91c2VFdmVudDo6QnV0dG9uIGJ1dHRvbiA9IFdlYk1vdXNlRXZlbnQ6OkJ1 dHRvbkxlZnQ7CisgICAgYm9vbCBhc1BvcHVwID0gZmFsc2U7CisgICAgRVhQRUNUX0VRKFdlYk5h dmlnYXRpb25Qb2xpY3lOZXdGb3JlZ3JvdW5kVGFiLAorICAgICAgICBnZXROYXZpZ2F0aW9uUG9s aWN5V2l0aE1vdXNlRXZlbnQobW9kaWZpZXJzLCBidXR0b24sIGFzUG9wdXApKTsKK30KKworVEVT VF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBDb250cm9sT3JNZXRhQW5kU2hpZnRMZWZ0Q2xp Y2tQb3B1cCkKK3sKKyNpZiBPUyhEQVJXSU4pCisgICAgaW50IG1vZGlmaWVycyA9IFdlYklucHV0 RXZlbnQ6Ok1ldGFLZXk7CisjZWxzZQorICAgIGludCBtb2RpZmllcnMgPSBXZWJJbnB1dEV2ZW50 OjpDb250cm9sS2V5OworI2VuZGlmCisgICAgbW9kaWZpZXJzIHw9IFdlYklucHV0RXZlbnQ6OlNo aWZ0S2V5OworICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50 OjpCdXR0b25MZWZ0OworICAgIGJvb2wgYXNQb3B1cCA9IHRydWU7CisgICAgRVhQRUNUX0VRKFdl Yk5hdmlnYXRpb25Qb2xpY3lOZXdGb3JlZ3JvdW5kVGFiLAorICAgICAgICBnZXROYXZpZ2F0aW9u UG9saWN5V2l0aE1vdXNlRXZlbnQobW9kaWZpZXJzLCBidXR0b24sIGFzUG9wdXApKTsKK30KKwor VEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBNaWRkbGVDbGljaykKK3sKKyAgICBpbnQg bW9kaWZpZXJzID0gMDsKKyAgICBib29sIGFzUG9wdXAgPSBmYWxzZTsKKyAgICBXZWJNb3VzZUV2 ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91c2VFdmVudDo6QnV0dG9uTWlkZGxlOworICAgIEVY UEVDVF9FUShXZWJOYXZpZ2F0aW9uUG9saWN5TmV3QmFja2dyb3VuZFRhYiwKKyAgICAgICAgZ2V0 TmF2aWdhdGlvblBvbGljeVdpdGhNb3VzZUV2ZW50KG1vZGlmaWVycywgYnV0dG9uLCBhc1BvcHVw KSk7Cit9CisKK1RFU1RfRihHZXROYXZpZ2F0aW9uUG9saWN5VGVzdCwgTWlkZGxlQ2xpY2tQb3B1 cCkKK3sKKyAgICBpbnQgbW9kaWZpZXJzID0gMDsKKyAgICBib29sIGFzUG9wdXAgPSB0cnVlOwor ICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50OjpCdXR0b25N aWRkbGU7CisgICAgRVhQRUNUX0VRKFdlYk5hdmlnYXRpb25Qb2xpY3lOZXdCYWNrZ3JvdW5kVGFi LAorICAgICAgICBnZXROYXZpZ2F0aW9uUG9saWN5V2l0aE1vdXNlRXZlbnQobW9kaWZpZXJzLCBi dXR0b24sIGFzUG9wdXApKTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBO b1Rvb2xiYXJzRm9yY2VzUG9wdXApCit7CisgICAgbV9jaHJvbWVDbGllbnRJbXBsLT5zZXRUb29s YmFyc1Zpc2libGUoZmFsc2UpOworICAgIEVYUEVDVF9UUlVFKGlzTmF2aWdhdGlvblBvbGljeVBv cHVwKCkpOworICAgIG1fY2hyb21lQ2xpZW50SW1wbC0+c2V0VG9vbGJhcnNWaXNpYmxlKHRydWUp OworICAgIEVYUEVDVF9GQUxTRShpc05hdmlnYXRpb25Qb2xpY3lQb3B1cCgpKTsKK30KKworVEVT VF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBOb1N0YXR1c2JhckZvcmNlc1BvcHVwKQorewor ICAgIG1fY2hyb21lQ2xpZW50SW1wbC0+c2V0U3RhdHVzYmFyVmlzaWJsZShmYWxzZSk7CisgICAg RVhQRUNUX1RSVUUoaXNOYXZpZ2F0aW9uUG9saWN5UG9wdXAoKSk7CisgICAgbV9jaHJvbWVDbGll bnRJbXBsLT5zZXRTdGF0dXNiYXJWaXNpYmxlKHRydWUpOworICAgIEVYUEVDVF9GQUxTRShpc05h dmlnYXRpb25Qb2xpY3lQb3B1cCgpKTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lU ZXN0LCBOb01lbnViYXJGb3JjZXNQb3B1cCkKK3sKKyAgICBtX2Nocm9tZUNsaWVudEltcGwtPnNl dE1lbnViYXJWaXNpYmxlKGZhbHNlKTsKKyAgICBFWFBFQ1RfVFJVRShpc05hdmlnYXRpb25Qb2xp Y3lQb3B1cCgpKTsKKyAgICBtX2Nocm9tZUNsaWVudEltcGwtPnNldE1lbnViYXJWaXNpYmxlKHRy dWUpOworICAgIEVYUEVDVF9GQUxTRShpc05hdmlnYXRpb25Qb2xpY3lQb3B1cCgpKTsKK30KKwor VEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBOb3RSZXNpemFibGVGb3JjZXNQb3B1cCkK K3sKKyAgICBtX2Nocm9tZUNsaWVudEltcGwtPnNldFJlc2l6YWJsZShmYWxzZSk7CisgICAgRVhQ RUNUX1RSVUUoaXNOYXZpZ2F0aW9uUG9saWN5UG9wdXAoKSk7CisgICAgbV9jaHJvbWVDbGllbnRJ bXBsLT5zZXRSZXNpemFibGUodHJ1ZSk7CisgICAgRVhQRUNUX0ZBTFNFKGlzTmF2aWdhdGlvblBv bGljeVBvcHVwKCkpOworfQorCit9IC8vIG5hbWVzcGFjZQo= 174516 2012-11-15 14:23:07 -0800 2012-11-28 11:31:42 -0800 Patch bug-102424-20121115142104.patch text/plain 11045 ericu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDFmOTY1MzY4OGZhNTkwOWVkZjdmOGExZTVhOWMyZDcwZGUzNzZiZGUuLjI2NzAzM2E4NGQyZGQz NmIxNDBhNzYzOTJiZDc1ODhlY2U0ZjhjYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMTEtMTUgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVt Lm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCB1bml0IHRlc3RzIGZvciBDaHJvbWVDbGll bnRJbXBsOjpnZXROYXZpZ2F0aW9uUG9saWN5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI0MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHRlc3RzIGEgYnVuY2ggb2YgYmFzaWMgc2NlbmFyaW9z IHJlZ2FyZGluZyB3aGF0IHdpbGwgcHJvZHVjZSBhCisgICAgICAgIHBvcHVwLCBhIG5ldyBmb3Jl Z3JvdW5kL2JhY2tncm91bmQgdGFiLCBvciBhIG5ldyB3aW5kb3cuCisKKyAgICAgICAgKiBXZWJL aXQuZ3lwaTogQWRkZWQgdGVzdCBmaWxlLgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgor ICAgICAgICAoV2ViVmlld0ltcGwpOiBBZGRlZCBmcmllbmQgZGVjbGFyYXRpb24gZm9yIHNldEN1 cnJlbnRJbnB1dEV2ZW50Rm9yVGVzdC4KKyAgICAgICAgKiB0ZXN0cy9DaHJvbWVDbGllbnRJbXBs VGVzdC5jcHA6IEFkZGVkLgorCiAyMDEyLTExLTE0ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgSW5kZXhlZERCOiBSZW1vdmUgbWFnaWMgbnVtYmVycyBpbiBy ZWNvcmQgY29tcGFyYXRvciwgaGFuZGxlIG1pc3NpbmcgY2FzZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwaSBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lmd5cGkKaW5kZXggMDAyOWRhNGIwNzVlMDczY2JmZDY0MWIwMjA0YmMwMDgwM2M0MWY0Ny4u NTlkYjJmMzk2NDM1MzljNGJkMjQ4YTI0MWRlMDFhZmVjMGFiZTRmOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwaQorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL1dlYktpdC5neXBpCkBAIC01Nyw2ICs1Nyw3IEBACiAgICAgICAgICAgICAndGVzdHMvQXNz b2NpYXRlZFVSTExvYWRlclRlc3QuY3BwJywKICAgICAgICAgICAgICd0ZXN0cy9DYW52YXMyRExh eWVyQnJpZGdlVGVzdC5jcHAnLAogICAgICAgICAgICAgJ3Rlc3RzL0NhbnZhczJETGF5ZXJNYW5h Z2VyVGVzdC5jcHAnLAorICAgICAgICAgICAgJ3Rlc3RzL0Nocm9tZUNsaWVudEltcGxUZXN0LmNw cCcsCiAgICAgICAgICAgICAndGVzdHMvQ2xpcGJvYXJkQ2hyb21pdW1UZXN0LmNwcCcsCiAgICAg ICAgICAgICAndGVzdHMvQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRC5oJywKICAg ICAgICAgICAgICd0ZXN0cy9EYXRlVGltZUZvcm1hdFRlc3QuY3BwJywKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDlmMDU2MTgwYjM4OTA2NGM4NTBkNDdlNTQx OWY5N2YyOTZmOGVjNDQuLmQ2MjUxMGNkZGVkNTNkYTU3MGE1Y2E3OGM0OTQ4N2IyN2YwZjc3YWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtNjEwLDYgKzYx MCw3IEBAIHByaXZhdGU6CiAKICAgICBmcmllbmQgY2xhc3MgV2ViVmlldzsgIC8vIFNvIFdlYlZp ZXc6OkNyZWF0ZSBjYW4gY2FsbCBvdXIgY29uc3RydWN0b3IKICAgICBmcmllbmQgY2xhc3MgV1RG OjpSZWZDb3VudGVkPFdlYlZpZXdJbXBsPjsKKyAgICBmcmllbmQgdm9pZCBzZXRDdXJyZW50SW5w dXRFdmVudEZvclRlc3QoY29uc3QgV2ViSW5wdXRFdmVudCopOwogCiAgICAgZW51bSBEcmFnQWN0 aW9uIHsKICAgICAgIERyYWdFbnRlciwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ2hyb21lQ2xpZW50SW1wbFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9DaHJvbWVDbGllbnRJbXBsVGVzdC5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzc5YzFjZGQyNmMz MTZiZDQ5NmE0OGU1ZGFjYmI2ODEwMzQ0NDY5NQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ2hyb21lQ2xpZW50SW1wbFRlc3QuY3BwCkBAIC0wLDAgKzEs MjY4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6Cisg KgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAq IGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29v Z2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNl ZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNv ZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBD T05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hU CisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisg Ki8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorCisjaW5jbHVkZSA8Z3Rlc3QvZ3Rlc3QuaD4KKwor I2luY2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIldlYkZyYW1lQ2xpZW50LmgiCisjaW5jbHVk ZSAiV2ViSW5wdXRFdmVudC5oIgorI2luY2x1ZGUgIldlYlZpZXcuaCIKKyNpbmNsdWRlICJXZWJW aWV3Q2xpZW50LmgiCisjaW5jbHVkZSAiV2ViVmlld0ltcGwuaCIKKwordXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK3ZvaWQgc2V0Q3VycmVudElucHV0RXZl bnRGb3JUZXN0KGNvbnN0IFdlYklucHV0RXZlbnQqIGV2ZW50KQoreworICAgIFdlYlZpZXdJbXBs OjptX2N1cnJlbnRJbnB1dEV2ZW50ID0gZXZlbnQ7Cit9CisKK30KKworbmFtZXNwYWNlIHsKKwor Y2xhc3MgVGVzdFdlYldpZGdldENsaWVudCA6IHB1YmxpYyBXZWJXaWRnZXRDbGllbnQgeworcHVi bGljOgorICAgIH5UZXN0V2ViV2lkZ2V0Q2xpZW50KCkgeyB9Cit9OworCitjbGFzcyBUZXN0V2Vi Vmlld0NsaWVudCA6IHB1YmxpYyBXZWJWaWV3Q2xpZW50IHsKK3B1YmxpYzoKKyAgICBleHBsaWNp dCBUZXN0V2ViVmlld0NsaWVudChXZWJOYXZpZ2F0aW9uUG9saWN5KiB0YXJnZXQpIDogbV90YXJn ZXQodGFyZ2V0KSB7IH0KKyAgICB+VGVzdFdlYlZpZXdDbGllbnQoKSB7IH0KKworICAgIHZpcnR1 YWwgdm9pZCBzaG93KFdlYk5hdmlnYXRpb25Qb2xpY3kgcG9saWN5KQorICAgIHsKKyAgICAgICAg Km1fdGFyZ2V0ID0gcG9saWN5OworICAgIH0KKworcHJpdmF0ZToKKyAgICBXZWJOYXZpZ2F0aW9u UG9saWN5KiBtX3RhcmdldDsKK307CisKK2NsYXNzIFRlc3RXZWJGcmFtZUNsaWVudCA6IHB1Ymxp YyBXZWJGcmFtZUNsaWVudCB7CitwdWJsaWM6CisgICAgflRlc3RXZWJGcmFtZUNsaWVudCgpIHsg fQorfTsKKworY2xhc3MgR2V0TmF2aWdhdGlvblBvbGljeVRlc3QgOiBwdWJsaWMgdGVzdGluZzo6 VGVzdCB7CitwdWJsaWM6CisgICAgR2V0TmF2aWdhdGlvblBvbGljeVRlc3QoKQorICAgICAgICA6 IG1fcmVzdWx0KFdlYk5hdmlnYXRpb25Qb2xpY3lJZ25vcmUpCisgICAgICAgICwgbV93ZWJWaWV3 Q2xpZW50KCZtX3Jlc3VsdCkKKyAgICB7CisgICAgfQorCitwcm90ZWN0ZWQ6CisgICAgdmlydHVh bCB2b2lkIFNldFVwKCkKKyAgICB7CisgICAgICAgIG1fd2ViVmlldyA9IHN0YXRpY19jYXN0PFdl YlZpZXdJbXBsKj4oV2ViVmlldzo6Y3JlYXRlKCZtX3dlYlZpZXdDbGllbnQpKTsKKyAgICAgICAg bV93ZWJWaWV3LT5pbml0aWFsaXplTWFpbkZyYW1lKCZtX3dlYkZyYW1lQ2xpZW50KTsKKyAgICAg ICAgbV9jaHJvbWVDbGllbnRJbXBsID0gc3RhdGljX2Nhc3Q8Q2hyb21lQ2xpZW50SW1wbCo+KG1f d2ViVmlldy0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCkpOworICAgICAgICBtX3Jlc3VsdCA9 IFdlYk5hdmlnYXRpb25Qb2xpY3lJZ25vcmU7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIFRl YXJEb3duKCkKKyAgICB7CisgICAgICAgIG1fd2ViVmlldy0+Y2xvc2UoKTsKKyAgICB9CisKKyAg ICBXZWJOYXZpZ2F0aW9uUG9saWN5IGdldE5hdmlnYXRpb25Qb2xpY3lXaXRoTW91c2VFdmVudChp bnQgbW9kaWZpZXJzLCBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uLCBib29sIGFzUG9wdXAp CisgICAgeworICAgICAgICBXZWJNb3VzZUV2ZW50IGV2ZW50OworICAgICAgICBldmVudC5tb2Rp ZmllcnMgPSBtb2RpZmllcnM7CisgICAgICAgIGV2ZW50LnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpN b3VzZVVwOworICAgICAgICBldmVudC5idXR0b24gPSBidXR0b247CisgICAgICAgIHNldEN1cnJl bnRJbnB1dEV2ZW50Rm9yVGVzdCgmZXZlbnQpOworICAgICAgICBtX2Nocm9tZUNsaWVudEltcGwt PnNldFNjcm9sbGJhcnNWaXNpYmxlKCFhc1BvcHVwKTsKKyAgICAgICAgbV9jaHJvbWVDbGllbnRJ bXBsLT5zaG93KCk7CisgICAgICAgIHNldEN1cnJlbnRJbnB1dEV2ZW50Rm9yVGVzdCgwKTsKKyAg ICAgICAgcmV0dXJuIG1fcmVzdWx0OworICAgIH0KKworICAgIGJvb2wgaXNOYXZpZ2F0aW9uUG9s aWN5UG9wdXAoKQorICAgIHsKKyAgICAgICAgbV9jaHJvbWVDbGllbnRJbXBsLT5zaG93KCk7Cisg ICAgICAgIHJldHVybiBtX3Jlc3VsdCA9PSBXZWJOYXZpZ2F0aW9uUG9saWN5TmV3UG9wdXA7Cisg ICAgfQorCitwcm90ZWN0ZWQ6CisgICAgV2ViTmF2aWdhdGlvblBvbGljeSBtX3Jlc3VsdDsKKyAg ICBUZXN0V2ViVmlld0NsaWVudCBtX3dlYlZpZXdDbGllbnQ7CisgICAgV2ViVmlld0ltcGwqIG1f d2ViVmlldzsKKyAgICBUZXN0V2ViRnJhbWVDbGllbnQgbV93ZWJGcmFtZUNsaWVudDsKKyAgICBD aHJvbWVDbGllbnRJbXBsKiBtX2Nocm9tZUNsaWVudEltcGw7Cit9OworCitURVNUX0YoR2V0TmF2 aWdhdGlvblBvbGljeVRlc3QsIExlZnRDbGljaykKK3sKKyAgICBpbnQgbW9kaWZpZXJzID0gMDsK KyAgICBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91c2VFdmVudDo6QnV0dG9u TGVmdDsKKyAgICBib29sIGFzUG9wdXAgPSBmYWxzZTsKKyAgICBFWFBFQ1RfRVEoV2ViTmF2aWdh dGlvblBvbGljeU5ld0ZvcmVncm91bmRUYWIsCisgICAgICAgIGdldE5hdmlnYXRpb25Qb2xpY3lX aXRoTW91c2VFdmVudChtb2RpZmllcnMsIGJ1dHRvbiwgYXNQb3B1cCkpOworfQorCitURVNUX0Yo R2V0TmF2aWdhdGlvblBvbGljeVRlc3QsIExlZnRDbGlja1BvcHVwKQoreworICAgIGludCBtb2Rp ZmllcnMgPSAwOworICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2 ZW50OjpCdXR0b25MZWZ0OworICAgIGJvb2wgYXNQb3B1cCA9IHRydWU7CisgICAgRVhQRUNUX0VR KFdlYk5hdmlnYXRpb25Qb2xpY3lOZXdQb3B1cCwKKyAgICAgICAgZ2V0TmF2aWdhdGlvblBvbGlj eVdpdGhNb3VzZUV2ZW50KG1vZGlmaWVycywgYnV0dG9uLCBhc1BvcHVwKSk7Cit9CisKK1RFU1Rf RihHZXROYXZpZ2F0aW9uUG9saWN5VGVzdCwgU2hpZnRMZWZ0Q2xpY2spCit7CisgICAgaW50IG1v ZGlmaWVycyA9IFdlYklucHV0RXZlbnQ6OlNoaWZ0S2V5OworICAgIFdlYk1vdXNlRXZlbnQ6OkJ1 dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50OjpCdXR0b25MZWZ0OworICAgIGJvb2wgYXNQb3B1 cCA9IGZhbHNlOworICAgIEVYUEVDVF9FUShXZWJOYXZpZ2F0aW9uUG9saWN5TmV3V2luZG93LAor ICAgICAgICBnZXROYXZpZ2F0aW9uUG9saWN5V2l0aE1vdXNlRXZlbnQobW9kaWZpZXJzLCBidXR0 b24sIGFzUG9wdXApKTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBTaGlm dExlZnRDbGlja1BvcHVwKQoreworICAgIGludCBtb2RpZmllcnMgPSBXZWJJbnB1dEV2ZW50OjpT aGlmdEtleTsKKyAgICBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91c2VFdmVu dDo6QnV0dG9uTGVmdDsKKyAgICBib29sIGFzUG9wdXAgPSB0cnVlOworICAgIEVYUEVDVF9FUShX ZWJOYXZpZ2F0aW9uUG9saWN5TmV3UG9wdXAsCisgICAgICAgIGdldE5hdmlnYXRpb25Qb2xpY3lX aXRoTW91c2VFdmVudChtb2RpZmllcnMsIGJ1dHRvbiwgYXNQb3B1cCkpOworfQorCitURVNUX0Yo R2V0TmF2aWdhdGlvblBvbGljeVRlc3QsIENvbnRyb2xPck1ldGFMZWZ0Q2xpY2spCit7CisjaWYg T1MoREFSV0lOKQorICAgIGludCBtb2RpZmllcnMgPSBXZWJJbnB1dEV2ZW50OjpNZXRhS2V5Owor I2Vsc2UKKyAgICBpbnQgbW9kaWZpZXJzID0gV2ViSW5wdXRFdmVudDo6Q29udHJvbEtleTsKKyNl bmRpZgorICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50OjpC dXR0b25MZWZ0OworICAgIGJvb2wgYXNQb3B1cCA9IGZhbHNlOworICAgIEVYUEVDVF9FUShXZWJO YXZpZ2F0aW9uUG9saWN5TmV3QmFja2dyb3VuZFRhYiwKKyAgICAgICAgZ2V0TmF2aWdhdGlvblBv bGljeVdpdGhNb3VzZUV2ZW50KG1vZGlmaWVycywgYnV0dG9uLCBhc1BvcHVwKSk7Cit9CisKK1RF U1RfRihHZXROYXZpZ2F0aW9uUG9saWN5VGVzdCwgQ29udHJvbE9yTWV0YUxlZnRDbGlja1BvcHVw KQoreworI2lmIE9TKERBUldJTikKKyAgICBpbnQgbW9kaWZpZXJzID0gV2ViSW5wdXRFdmVudDo6 TWV0YUtleTsKKyNlbHNlCisgICAgaW50IG1vZGlmaWVycyA9IFdlYklucHV0RXZlbnQ6OkNvbnRy b2xLZXk7CisjZW5kaWYKKyAgICBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91 c2VFdmVudDo6QnV0dG9uTGVmdDsKKyAgICBib29sIGFzUG9wdXAgPSB0cnVlOworICAgIEVYUEVD VF9FUShXZWJOYXZpZ2F0aW9uUG9saWN5TmV3QmFja2dyb3VuZFRhYiwKKyAgICAgICAgZ2V0TmF2 aWdhdGlvblBvbGljeVdpdGhNb3VzZUV2ZW50KG1vZGlmaWVycywgYnV0dG9uLCBhc1BvcHVwKSk7 Cit9CisKK1RFU1RfRihHZXROYXZpZ2F0aW9uUG9saWN5VGVzdCwgQ29udHJvbE9yTWV0YUFuZFNo aWZ0TGVmdENsaWNrKQoreworI2lmIE9TKERBUldJTikKKyAgICBpbnQgbW9kaWZpZXJzID0gV2Vi SW5wdXRFdmVudDo6TWV0YUtleTsKKyNlbHNlCisgICAgaW50IG1vZGlmaWVycyA9IFdlYklucHV0 RXZlbnQ6OkNvbnRyb2xLZXk7CisjZW5kaWYKKyAgICBtb2RpZmllcnMgfD0gV2ViSW5wdXRFdmVu dDo6U2hpZnRLZXk7CisgICAgV2ViTW91c2VFdmVudDo6QnV0dG9uIGJ1dHRvbiA9IFdlYk1vdXNl RXZlbnQ6OkJ1dHRvbkxlZnQ7CisgICAgYm9vbCBhc1BvcHVwID0gZmFsc2U7CisgICAgRVhQRUNU X0VRKFdlYk5hdmlnYXRpb25Qb2xpY3lOZXdGb3JlZ3JvdW5kVGFiLAorICAgICAgICBnZXROYXZp Z2F0aW9uUG9saWN5V2l0aE1vdXNlRXZlbnQobW9kaWZpZXJzLCBidXR0b24sIGFzUG9wdXApKTsK K30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBDb250cm9sT3JNZXRhQW5kU2hp ZnRMZWZ0Q2xpY2tQb3B1cCkKK3sKKyNpZiBPUyhEQVJXSU4pCisgICAgaW50IG1vZGlmaWVycyA9 IFdlYklucHV0RXZlbnQ6Ok1ldGFLZXk7CisjZWxzZQorICAgIGludCBtb2RpZmllcnMgPSBXZWJJ bnB1dEV2ZW50OjpDb250cm9sS2V5OworI2VuZGlmCisgICAgbW9kaWZpZXJzIHw9IFdlYklucHV0 RXZlbnQ6OlNoaWZ0S2V5OworICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJN b3VzZUV2ZW50OjpCdXR0b25MZWZ0OworICAgIGJvb2wgYXNQb3B1cCA9IHRydWU7CisgICAgRVhQ RUNUX0VRKFdlYk5hdmlnYXRpb25Qb2xpY3lOZXdGb3JlZ3JvdW5kVGFiLAorICAgICAgICBnZXRO YXZpZ2F0aW9uUG9saWN5V2l0aE1vdXNlRXZlbnQobW9kaWZpZXJzLCBidXR0b24sIGFzUG9wdXAp KTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBNaWRkbGVDbGljaykKK3sK KyAgICBpbnQgbW9kaWZpZXJzID0gMDsKKyAgICBib29sIGFzUG9wdXAgPSBmYWxzZTsKKyAgICBX ZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uID0gV2ViTW91c2VFdmVudDo6QnV0dG9uTWlkZGxl OworICAgIEVYUEVDVF9FUShXZWJOYXZpZ2F0aW9uUG9saWN5TmV3QmFja2dyb3VuZFRhYiwKKyAg ICAgICAgZ2V0TmF2aWdhdGlvblBvbGljeVdpdGhNb3VzZUV2ZW50KG1vZGlmaWVycywgYnV0dG9u LCBhc1BvcHVwKSk7Cit9CisKK1RFU1RfRihHZXROYXZpZ2F0aW9uUG9saWN5VGVzdCwgTWlkZGxl Q2xpY2tQb3B1cCkKK3sKKyAgICBpbnQgbW9kaWZpZXJzID0gMDsKKyAgICBib29sIGFzUG9wdXAg PSB0cnVlOworICAgIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50 OjpCdXR0b25NaWRkbGU7CisgICAgRVhQRUNUX0VRKFdlYk5hdmlnYXRpb25Qb2xpY3lOZXdCYWNr Z3JvdW5kVGFiLAorICAgICAgICBnZXROYXZpZ2F0aW9uUG9saWN5V2l0aE1vdXNlRXZlbnQobW9k aWZpZXJzLCBidXR0b24sIGFzUG9wdXApKTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xp Y3lUZXN0LCBOb1Rvb2xiYXJzRm9yY2VzUG9wdXApCit7CisgICAgbV9jaHJvbWVDbGllbnRJbXBs LT5zZXRUb29sYmFyc1Zpc2libGUoZmFsc2UpOworICAgIEVYUEVDVF9UUlVFKGlzTmF2aWdhdGlv blBvbGljeVBvcHVwKCkpOworICAgIG1fY2hyb21lQ2xpZW50SW1wbC0+c2V0VG9vbGJhcnNWaXNp YmxlKHRydWUpOworICAgIEVYUEVDVF9GQUxTRShpc05hdmlnYXRpb25Qb2xpY3lQb3B1cCgpKTsK K30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBOb1N0YXR1c2JhckZvcmNlc1Bv cHVwKQoreworICAgIG1fY2hyb21lQ2xpZW50SW1wbC0+c2V0U3RhdHVzYmFyVmlzaWJsZShmYWxz ZSk7CisgICAgRVhQRUNUX1RSVUUoaXNOYXZpZ2F0aW9uUG9saWN5UG9wdXAoKSk7CisgICAgbV9j aHJvbWVDbGllbnRJbXBsLT5zZXRTdGF0dXNiYXJWaXNpYmxlKHRydWUpOworICAgIEVYUEVDVF9G QUxTRShpc05hdmlnYXRpb25Qb2xpY3lQb3B1cCgpKTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRp b25Qb2xpY3lUZXN0LCBOb01lbnViYXJGb3JjZXNQb3B1cCkKK3sKKyAgICBtX2Nocm9tZUNsaWVu dEltcGwtPnNldE1lbnViYXJWaXNpYmxlKGZhbHNlKTsKKyAgICBFWFBFQ1RfVFJVRShpc05hdmln YXRpb25Qb2xpY3lQb3B1cCgpKTsKKyAgICBtX2Nocm9tZUNsaWVudEltcGwtPnNldE1lbnViYXJW aXNpYmxlKHRydWUpOworICAgIEVYUEVDVF9GQUxTRShpc05hdmlnYXRpb25Qb2xpY3lQb3B1cCgp KTsKK30KKworVEVTVF9GKEdldE5hdmlnYXRpb25Qb2xpY3lUZXN0LCBOb3RSZXNpemFibGVGb3Jj ZXNQb3B1cCkKK3sKKyAgICBtX2Nocm9tZUNsaWVudEltcGwtPnNldFJlc2l6YWJsZShmYWxzZSk7 CisgICAgRVhQRUNUX1RSVUUoaXNOYXZpZ2F0aW9uUG9saWN5UG9wdXAoKSk7CisgICAgbV9jaHJv bWVDbGllbnRJbXBsLT5zZXRSZXNpemFibGUodHJ1ZSk7CisgICAgRVhQRUNUX0ZBTFNFKGlzTmF2 aWdhdGlvblBvbGljeVBvcHVwKCkpOworfQorCit9IC8vIG5hbWVzcGFjZQo=