67451 2011-09-01 16:07:25 -0700 Add a test for going back to a cached page after changing the device scale factor 2011-09-02 11:54:44 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin bdakin oldest_to_newest 460880 0 bdakin 2011-09-01 16:07:25 -0700 https://bugs.webkit.org/show_bug.cgi?id=66244 should have a corresponding TestWebKitAPI test. Patch forthcoming. 460891 1 106057 bdakin 2011-09-01 16:15:38 -0700 Created attachment 106057 Patch 461175 2 106057 aroben 2011-09-02 05:44:42 -0700 Comment on attachment 106057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=106057&action=review Yay tests! (Bug 67150 is next!) > Tools/ChangeLog:21 > + Added new functions to WebKitAgnosticTest to goBack and goForward. Separated > + waitForLoadToFinish() into its own function (instead of being a part of > + loadAndWaitUntilFinished()) so that it can be called from goBack and goForward as > + well. Also added initializeView() so we can set the cache model. Since you never use goForward, maybe we shouldn't add it? > Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm:64 > +void DeviceScaleFactorOnBack::initializeView(WebView *view) > +{ > + [[view preferences] setCacheModel:WebCacheModelDocumentBrowser]; > +} > + > +void DeviceScaleFactorOnBack::initializeView(WKView *view) > +{ > + WKContextSetCacheModel(WKPageGetContext([view pageRef]), kWKCacheModelDocumentBrowser); > +} It's probably worth adding a comment here explaining why we do this. 461399 3 bdakin 2011-09-02 11:54:44 -0700 I removed goForward and added comments to both implementations of initializeWebView, and I committed the test with revision 94437. Thanks Adam!!! 106057 2011-09-01 16:15:38 -0700 2011-09-02 05:44:42 -0700 Patch for-review.txt text/plain 13533 bdakin SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDk0MzU3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMzUgQEAKKzIwMTEtMDktMDEgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NzQ1MQorICAg ICAgICBBZGQgYSB0ZXN0IGZvciBnb2luZyBiYWNrIHRvIGEgY2FjaGVkIHBhZ2UgYWZ0ZXIgY2hh bmdpbmcgdGhlIGRldmljZSBzY2FsZSBmYWN0b3IKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBOZXcgdGVzdCBEZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5t bSBpbmhlcml0cyBmcm9tIFdlYktpdEFnbm9zdGljVGVzdC4KKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBU ZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9EZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5tbTogQWRkZWQu CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpEZXZpY2VTY2FsZUZhY3Rvck9uQmFjazo6dXJsKToK KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkRldmljZVNjYWxlRmFjdG9yT25CYWNrOjpkaWRMb2Fk VVJMKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkRldmljZVNjYWxlRmFjdG9yT25CYWNrOjpj cmVhdGVXaW5kb3cpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6RGV2aWNlU2NhbGVGYWN0b3JP bkJhY2s6OmluaXRpYWxpemVWaWV3KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkRldmljZVNj YWxlRmFjdG9yT25CYWNrOjpydW5UZXN0KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1Rf Rik6CisKKyAgICAgICAgQWRkZWQgbmV3IGZ1bmN0aW9ucyB0byBXZWJLaXRBZ25vc3RpY1Rlc3Qg dG8gZ29CYWNrIGFuZCBnb0ZvcndhcmQuIFNlcGFyYXRlZCAKKyAgICAgICAgd2FpdEZvckxvYWRU b0ZpbmlzaCgpIGludG8gaXRzIG93biBmdW5jdGlvbiAoaW5zdGVhZCBvZiBiZWluZyBhIHBhcnQg b2YgCisgICAgICAgIGxvYWRBbmRXYWl0VW50aWxGaW5pc2hlZCgpKSBzbyB0aGF0IGl0IGNhbiBi ZSBjYWxsZWQgZnJvbSBnb0JhY2sgYW5kIGdvRm9yd2FyZCBhcyAKKyAgICAgICAgd2VsbC4gQWxz byBhZGRlZCBpbml0aWFsaXplVmlldygpIHNvIHdlIGNhbiBzZXQgdGhlIGNhY2hlIG1vZGVsLgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvbWFjL1dlYktpdEFnbm9zdGljVGVzdC5oOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6V2ViS2l0QWdub3N0aWNUZXN0Ojppbml0aWFsaXplVmlldyk6Cisg ICAgICAgICogVGVzdFdlYktpdEFQSS9tYWMvV2ViS2l0QWdub3N0aWNUZXN0Lm1tOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6V2ViS2l0QWdub3N0aWNUZXN0OjpXZWJLaXRBZ25vc3RpY1Rlc3Qp OgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6V2ViS2l0QWdub3N0aWNUZXN0OjpydW5XZWJLaXQx VGVzdCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpXZWJLaXRBZ25vc3RpY1Rlc3Q6OnJ1bldl YktpdDJUZXN0KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OldlYktpdEFnbm9zdGljVGVzdDo6 bG9hZFVSTCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpXZWJLaXRBZ25vc3RpY1Rlc3Q6Omdv QmFjayk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpXZWJLaXRBZ25vc3RpY1Rlc3Q6OmdvRm9y d2FyZCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpXZWJLaXRBZ25vc3RpY1Rlc3Q6OndhaXRG b3JMb2FkVG9GaW5pc2gpOgorCiAyMDExLTA5LTAxICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChOUldUKTogTGVha3MgVmlld2VyIGNhbid0IGxv YWQgbGVha3MgZnJvbSB0ZXN0IHJ1bnMgdGhhdCB1c2VkIE5SV1QKSW5kZXg6IFRvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCShyZXZpc2lvbiA5NDM0OCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdl YktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yMyw2 ICsyMyw3IEBACiAJCTM3REM2NzkxMTQwRDdENzYwMEFCQ0NEQiAvKiBET01SYW5nZU9mU3RyaW5n Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMzdEQzY3OEYxNDBEN0QzQTAwQUJDQ0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcuaHRtbCAqLzsg fTsKIAkJNEJGREZGQTcxMzE0Nzc2QzAwNjFGMjRCIC8qIEhpdFRlc3RSZXN1bHROb2RlSGFuZGxl X0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA0QkZERkZBNjEzMTQ3NzZDMDA2MUYyNEIgLyogSGl0VGVzdFJlc3VsdE5vZGVIYW5kbGVfQnVu ZGxlLmNwcCAqLzsgfTsKIAkJNEJGREZGQTkxMzE0Nzc3NzAwNjFGMjRCIC8qIEhpdFRlc3RSZXN1 bHROb2RlSGFuZGxlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDRCRkRGRkE4MTMxNDc3NzcwMDYxRjI0QiAvKiBIaXRUZXN0UmVzdWx0Tm9kZUhhbmRs ZS5jcHAgKi87IH07CisJCTkzOUJBOTE3MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VTY2FsZUZh Y3Rvck9uQmFjay5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDkzOUJBOTE2MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5t bSAqLzsgfTsKIAkJQTdBOTY2REIxNDBFQ0NDODAwNUVGOUI0IC8qIENoZWNrZWRBcml0aG1ldGlj T3BlcmF0aW9ucy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBBN0E5NjZEQTE0MEVDQ0M4MDA1RUY5QjQgLyogQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRp b25zLmNwcCAqLzsgfTsKIAkJQkMxMzE4ODUxMTcxMTRCNjAwQjY5NzI3IC8qIFBsYXRmb3JtVXRp bGl0aWVzTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkMxMzE4ODQxMTcxMTRCNjAwQjY5NzI3IC8qIFBsYXRmb3JtVXRpbGl0aWVzTWFjLm1tICov OyB9OwogCQlCQzEzMUE5QjExNzEzMTY5MDBCNjk3MjcgLyogbWFpbi5tbSBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDMTMxQTlBMTE3MTMxNjkwMEI2OTcy NyAvKiBtYWluLm1tICovOyB9OwpAQCAtMTQwLDYgKzE0MSw3IEBACiAJCTRCRkRGRkE2MTMxNDc3 NkMwMDYxRjI0QiAvKiBIaXRUZXN0UmVzdWx0Tm9kZUhhbmRsZV9CdW5kbGUuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSGl0VGVzdFJlc3VsdE5vZGVIYW5kbGVfQnVu ZGxlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNEJGREZGQTgxMzE0Nzc3NzAw NjFGMjRCIC8qIEhpdFRlc3RSZXN1bHROb2RlSGFuZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IEhpdFRlc3RSZXN1bHROb2RlSGFuZGxlLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOERENzZGQTEwNDg2QUE3NjAwRDk2QjVFIC8qIFRlc3RXZWJL aXRBUEkgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZXhwbGljaXRGaWxlVHlwZSA9ICJj b21waWxlZC5tYWNoLW8uZXhlY3V0YWJsZSI7IGluY2x1ZGVJbkluZGV4ID0gMDsgcGF0aCA9IFRl c3RXZWJLaXRBUEk7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CisJCTkzOUJB OTE2MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5tbSAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IERldmljZVNjYWxlRmFjdG9yT25CYWNr Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBN0E5NjZEQTE0MEVDQ0M4MDA1RUY5 QjQgLyogQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRpb25zLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgbmFtZSA9IENoZWNrZWRBcml0aG1ldGljT3BlcmF0aW9ucy5jcHA7IHBhdGgg PSBXVEYvQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRpb25zLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJQkMxMzE4ODMxMTcxMTRBODAwQjY5NzI3IC8qIFBsYXRmb3JtVXRpbGl0aWVz LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsYXRmb3JtVXRpbGl0aWVzLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDMTMxODg0MTE3MTE0QjYwMEI2OTcyNyAv KiBQbGF0Zm9ybVV0aWxpdGllc01hYy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNw cDsgcGF0aCA9IFBsYXRmb3JtVXRpbGl0aWVzTWFjLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwpAQCAtNDEzLDYgKzQxNSw3IEBACiAJCQkJQzA3RTZDQjAxM0ZENzM3QzAwMzhCMjJCIC8q IFJlc291cmNlcyAqLywKIAkJCQkzN0RDNjc4QjE0MEQ3QzUwMDBBQkNDREIgLyogRE9NUmFuZ2VP ZlN0cmluZy5tbSAqLywKIAkJCQlDMDdFNkNBRTEzRkQ2NzY1MDAzOEIyMkIgLyogRHluYW1pY0Rl dmljZVNjYWxlRmFjdG9yLm1tICovLAorCQkJCTkzOUJBOTE2MTQxMDM0MTIwMDFBMDFCRCAvKiBE ZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5tbSAqLywKIAkJCSk7CiAJCQlwYXRoID0gbWFjOwogCQkJ c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKQEAgLTU2Miw2ICs1NjUsNyBAQAogCQkJCUMwODU4ODAw MTNGRUMzQTYwMDFFRjRFNSAvKiBJbnN0YW5jZU1ldGhvZFN3aXp6bGVyLm1tIGluIFNvdXJjZXMg Ki8sCiAJCQkJMzdEQzY3OEQxNDBEN0M1MDAwQUJDQ0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcubW0g aW4gU291cmNlcyAqLywKIAkJCQlBN0E5NjZEQjE0MEVDQ0M4MDA1RUY5QjQgLyogQ2hlY2tlZEFy aXRobWV0aWNPcGVyYXRpb25zLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTkzOUJBOTE3MTQxMDM0 MTIwMDFBMDFCRCAvKiBEZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5tbSBpbiBTb3VyY2VzICovLAog CQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpJ bmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvRGV2aWNlU2NhbGVGYWN0b3JPbkJh Y2subW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvRGV2aWNl U2NhbGVGYWN0b3JPbkJhY2subW0JKHJldmlzaW9uIDApCisrKyBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL21hYy9EZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5tbQkocmV2aXNpb24gMCkKQEAgLTAs MCArMSwxMDMgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0 OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g dGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks IE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiV2ViS2l0QWdub3N0aWNUZXN0Lmgi CisKKyNpbmNsdWRlICJKYXZhU2NyaXB0VGVzdC5oIgorI2luY2x1ZGUgIlBsYXRmb3JtVXRpbGl0 aWVzLmgiCisjaW5jbHVkZSAiU3ludGhldGljQmFja2luZ1NjYWxlRmFjdG9yV2luZG93LmgiCisj aW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorCituYW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7CisK K2NsYXNzIERldmljZVNjYWxlRmFjdG9yT25CYWNrIDogcHVibGljIFdlYktpdEFnbm9zdGljVGVz dCB7CitwdWJsaWM6CisgICAgUmV0YWluUHRyPFN5bnRoZXRpY0JhY2tpbmdTY2FsZUZhY3Rvcldp bmRvdz4gY3JlYXRlV2luZG93KCk7CisKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVmlldz4gdm9p ZCBydW5UZXN0KFZpZXcpOworCisgICAgLy8gV2ViS2l0QWdub3N0aWNUZXN0CisgICAgdmlydHVh bCBOU1VSTCAqdXJsKCkgY29uc3QgeyByZXR1cm4gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxG b3JSZXNvdXJjZTpAImRldmljZVBpeGVsUmF0aW8iIHdpdGhFeHRlbnNpb246QCJodG1sIl07IH0K KyAgICB2aXJ0dWFsIHZvaWQgZGlkTG9hZFVSTChXZWJWaWV3ICp3ZWJWaWV3KSB7IHJ1blRlc3Qo d2ViVmlldyk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGlkTG9hZFVSTChXS1ZpZXcgKndrVmlldykg eyBydW5UZXN0KHdrVmlldyk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZVZpZXcoV2Vi VmlldyAqKTsKKyAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZVZpZXcoV0tWaWV3ICopOworfTsK KworUmV0YWluUHRyPFN5bnRoZXRpY0JhY2tpbmdTY2FsZUZhY3RvcldpbmRvdz4gRGV2aWNlU2Nh bGVGYWN0b3JPbkJhY2s6OmNyZWF0ZVdpbmRvdygpCit7CisgICAgUmV0YWluUHRyPFN5bnRoZXRp Y0JhY2tpbmdTY2FsZUZhY3RvcldpbmRvdz4gd2luZG93KEFkb3B0TlMsIFtbU3ludGhldGljQmFj a2luZ1NjYWxlRmFjdG9yV2luZG93IGFsbG9jXSBpbml0V2l0aENvbnRlbnRSZWN0OnZpZXdGcmFt ZSBzdHlsZU1hc2s6TlNCb3JkZXJsZXNzV2luZG93TWFzayBiYWNraW5nOk5TQmFja2luZ1N0b3Jl QnVmZmVyZWQgZGVmZXI6WUVTXSk7CisgICAgW3dpbmRvdy5nZXQoKSBzZXRSZWxlYXNlZFdoZW5D bG9zZWQ6Tk9dOworICAgIHJldHVybiB3aW5kb3c7Cit9CisKK3ZvaWQgRGV2aWNlU2NhbGVGYWN0 b3JPbkJhY2s6OmluaXRpYWxpemVWaWV3KFdlYlZpZXcgKnZpZXcpCit7CisgICAgW1t2aWV3IHBy ZWZlcmVuY2VzXSBzZXRDYWNoZU1vZGVsOldlYkNhY2hlTW9kZWxEb2N1bWVudEJyb3dzZXJdOwor fQorCit2b2lkIERldmljZVNjYWxlRmFjdG9yT25CYWNrOjppbml0aWFsaXplVmlldyhXS1ZpZXcg KnZpZXcpCit7CisgICAgV0tDb250ZXh0U2V0Q2FjaGVNb2RlbChXS1BhZ2VHZXRDb250ZXh0KFt2 aWV3IHBhZ2VSZWZdKSwga1dLQ2FjaGVNb2RlbERvY3VtZW50QnJvd3Nlcik7Cit9CisKK3RlbXBs YXRlIDx0eXBlbmFtZSBWaWV3Pgordm9pZCBEZXZpY2VTY2FsZUZhY3Rvck9uQmFjazo6cnVuVGVz dChWaWV3IHZpZXcpCit7CisgICAgRVhQRUNUX0pTX0VRKHZpZXcsICJ3aW5kb3cuZGV2aWNlUGl4 ZWxSYXRpbyIsICIxIik7CisgICAgRVhQRUNUX0pTX0VRKHZpZXcsICJkZXZpY2VQaXhlbFJhdGlv RnJvbVN0eWxlKCkiLCAiMSIpOworCisgICAgLy8gTmF2aWdhdGUgdG8gbmV3IFVSTAorICAgIGxv YWRVUkwodmlldywgW05TVVJMIFVSTFdpdGhTdHJpbmc6QCJhYm91dDpibGFuayJdKTsKKyAgICB3 YWl0Rm9yTG9hZFRvRmluaXNoKCk7CisKKyAgICAvLyBDaGFuZ2UgdGhlIHNjYWxlIGZhY3Rvcgor ICAgIFJldGFpblB0cjxTeW50aGV0aWNCYWNraW5nU2NhbGVGYWN0b3JXaW5kb3c+IHdpbmRvdzEg PSBjcmVhdGVXaW5kb3coKTsKKyAgICBbd2luZG93MS5nZXQoKSBzZXRCYWNraW5nU2NhbGVGYWN0 b3I6M107CisKKyAgICBbW3dpbmRvdzEuZ2V0KCkgY29udGVudFZpZXddIGFkZFN1YnZpZXc6dmll d107CisKKyAgICAvLyBOYXZpZ2F0ZSBiYWNrIHRvIHRoZSBmaXJzdCBwYWdlCisgICAgZ29CYWNr KHZpZXcpOworICAgIHdhaXRGb3JMb2FkVG9GaW5pc2goKTsKKworICAgIC8vIEVuc3VyZSB0aGF0 IHRoZSBjYWNoZWQgcGFnZSBoYXMgdXBkYXRlZCBpdHMgc2NhbGUgZmFjdG9yCisgICAgRVhQRUNU X0pTX0VRKHZpZXcsICJ3aW5kb3cuZGV2aWNlUGl4ZWxSYXRpbyIsICIzIik7CisgICAgRVhQRUNU X0pTX0VRKHZpZXcsICJkZXZpY2VQaXhlbFJhdGlvRnJvbVN0eWxlKCkiLCAiMyIpOworCisgICAg W3ZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107Cit9CisKK1RFU1RfRihEZXZpY2VTY2FsZUZhY3Rv ck9uQmFjaywgV2ViS2l0KQoreworICAgIHJ1bldlYktpdDFUZXN0KCk7Cit9CisKK1RFU1RfRihE ZXZpY2VTY2FsZUZhY3Rvck9uQmFjaywgV2ViS2l0MikKK3sKKyAgICBydW5XZWJLaXQyVGVzdCgp OworfQorCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCkluZGV4OiBUb29scy9UZXN0V2Vi S2l0QVBJL21hYy9XZWJLaXRBZ25vc3RpY1Rlc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0 V2ViS2l0QVBJL21hYy9XZWJLaXRBZ25vc3RpY1Rlc3QuaAkocmV2aXNpb24gOTQzNDgpCisrKyBU b29scy9UZXN0V2ViS2l0QVBJL21hYy9XZWJLaXRBZ25vc3RpY1Rlc3QuaAkod29ya2luZyBjb3B5 KQpAQCAtNDIsMjQgKzQyLDI3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgbG9hZFVSTChXZWJWaWV3 ICosIE5TVVJMICopOwogICAgIHZvaWQgbG9hZFVSTChXS1ZpZXcgKiwgTlNVUkwgKik7Ci0gICAg dGVtcGxhdGUgPHR5cGVuYW1lIFZpZXc+IHZvaWQgbG9hZEFuZFdhaXRVbnRpbEZpbmlzaGVkKFZp ZXcsIE5TVVJMICopOwogCi0gICAgYm9vbCBkaWRGaW5pc2hMb2FkOworICAgIHZvaWQgZ29CYWNr KFdlYlZpZXcgKik7CisgICAgdm9pZCBnb0JhY2soV0tWaWV3ICopOworCisgICAgdm9pZCBnb0Zv cndhcmQoV2ViVmlldyAqKTsKKyAgICB2b2lkIGdvRm9yd2FyZChXS1ZpZXcgKik7CisKKyAgICB2 b2lkIHdhaXRGb3JMb2FkVG9GaW5pc2goKTsKKwogICAgIE5TUmVjdCB2aWV3RnJhbWU7CiAKK3By aXZhdGU6CiAgICAgdmlydHVhbCBOU1VSTCAqdXJsKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwg dm9pZCBkaWRMb2FkVVJMKFdlYlZpZXcgKikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRMb2Fk VVJMKFdLVmlldyAqKSA9IDA7Ci19OwogCi10ZW1wbGF0ZSA8dHlwZW5hbWUgVmlldz4KLXZvaWQg V2ViS2l0QWdub3N0aWNUZXN0Ojpsb2FkQW5kV2FpdFVudGlsRmluaXNoZWQoVmlldyB2aWV3LCBO U1VSTCAqdXJsKQotewotICAgIEVYUEVDVF9GQUxTRShkaWRGaW5pc2hMb2FkKTsKLSAgICBsb2Fk VVJMKHZpZXcsIHVybCk7Ci0gICAgVXRpbDo6cnVuKCZkaWRGaW5pc2hMb2FkKTsKLSAgICBkaWRG aW5pc2hMb2FkID0gZmFsc2U7Ci19CisgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemVWaWV3KFdl YlZpZXcgKikgeyB9CisgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemVWaWV3KFdLVmlldyAqKSB7 IH0KKworICAgIGJvb2wgZGlkRmluaXNoTG9hZDsKK307CiAKIH0gLy8gbmFtZXNwYWNlIFRlc3RX ZWJLaXRBUEkKIApJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9tYWMvV2ViS2l0QWdub3N0aWNU ZXN0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvbWFjL1dlYktpdEFnbm9z dGljVGVzdC5tbQkocmV2aXNpb24gOTQzNDgpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL21hYy9X ZWJLaXRBZ25vc3RpY1Rlc3QubW0JKHdvcmtpbmcgY29weSkKQEAgLTc0LDggKzc0LDggQEAgc3Rh dGljIHZvaWQgc2V0UGFnZUxvYWRlckNsaWVudChXS1BhZ2VSZQogfQogCiBXZWJLaXRBZ25vc3Rp Y1Rlc3Q6OldlYktpdEFnbm9zdGljVGVzdCgpCi0gICAgOiBkaWRGaW5pc2hMb2FkKGZhbHNlKQot ICAgICwgdmlld0ZyYW1lKE5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApKQorICAgIDogdmlld0Zy YW1lKE5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApKQorICAgICwgZGlkRmluaXNoTG9hZChmYWxz ZSkKIHsKIH0KIApAQCAtODQsOCArODQsMTAgQEAgdm9pZCBXZWJLaXRBZ25vc3RpY1Rlc3Q6OnJ1 bldlYktpdDFUZXN0KAogICAgIFJldGFpblB0cjxXZWJWaWV3PiB3ZWJWaWV3KEFkb3B0TlMsIFtb V2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTp2aWV3RnJhbWVdKTsKICAgICBSZXRhaW5QdHI8 RnJhbWVMb2FkRGVsZWdhdGU+IGRlbGVnYXRlKEFkb3B0TlMsIFtbRnJhbWVMb2FkRGVsZWdhdGUg YWxsb2NdIGluaXRXaXRoRGlkRmluaXNoTG9hZEJvb2xlYW46JmRpZEZpbmlzaExvYWRdKTsKICAg ICBbd2ViVmlldy5nZXQoKSBzZXRGcmFtZUxvYWREZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07Cisg ICAgaW5pdGlhbGl6ZVZpZXcod2ViVmlldy5nZXQoKSk7CiAKLSAgICBsb2FkQW5kV2FpdFVudGls RmluaXNoZWQod2ViVmlldy5nZXQoKSwgdXJsKCkpOworICAgIGxvYWRVUkwod2ViVmlldy5nZXQo KSwgdXJsKCkpOworICAgIHdhaXRGb3JMb2FkVG9GaW5pc2goKTsKICAgICBkaWRMb2FkVVJMKHdl YlZpZXcuZ2V0KCkpOwogfQogCkBAIC05NCwxOSArOTYsNTMgQEAgdm9pZCBXZWJLaXRBZ25vc3Rp Y1Rlc3Q6OnJ1bldlYktpdDJUZXN0KAogICAgIFdLUmV0YWluUHRyPFdLQ29udGV4dFJlZj4gY29u dGV4dCA9IGFkb3B0V0soV0tDb250ZXh0Q3JlYXRlKCkpOwogICAgIFJldGFpblB0cjxXS1ZpZXc+ IHZpZXcoQWRvcHROUywgW1tXS1ZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6dmlld0ZyYW1lIGNv bnRleHRSZWY6Y29udGV4dC5nZXQoKV0pOwogICAgIHNldFBhZ2VMb2FkZXJDbGllbnQoW3ZpZXcu Z2V0KCkgcGFnZVJlZl0sICZkaWRGaW5pc2hMb2FkKTsKKyAgICBpbml0aWFsaXplVmlldyh2aWV3 LmdldCgpKTsKIAotICAgIGxvYWRBbmRXYWl0VW50aWxGaW5pc2hlZCh2aWV3LmdldCgpLCB1cmwo KSk7CisgICAgbG9hZFVSTCh2aWV3LmdldCgpLCB1cmwoKSk7CisgICAgd2FpdEZvckxvYWRUb0Zp bmlzaCgpOwogICAgIGRpZExvYWRVUkwodmlldy5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViS2l0QWdu b3N0aWNUZXN0Ojpsb2FkVVJMKFdlYlZpZXcgKndlYlZpZXcsIE5TVVJMICp1cmwpCiB7CisgICAg RVhQRUNUX0ZBTFNFKGRpZEZpbmlzaExvYWQpOwogICAgIFtbd2ViVmlldyBtYWluRnJhbWVdIGxv YWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6dXJsXV07CiB9CiAKIHZvaWQg V2ViS2l0QWdub3N0aWNUZXN0Ojpsb2FkVVJMKFdLVmlldyAqdmlldywgTlNVUkwgKnVybCkKIHsK KyAgICBFWFBFQ1RfRkFMU0UoZGlkRmluaXNoTG9hZCk7CiAgICAgV0tQYWdlTG9hZFVSTChbdmll dyBwYWdlUmVmXSwgYWRvcHRXSyhXS1VSTENyZWF0ZVdpdGhDRlVSTCgoQ0ZVUkxSZWYpdXJsKSku Z2V0KCkpOwogfQogCit2b2lkIFdlYktpdEFnbm9zdGljVGVzdDo6Z29CYWNrKFdlYlZpZXcgKndl YlZpZXcpCit7CisgICAgRVhQRUNUX0ZBTFNFKGRpZEZpbmlzaExvYWQpOworICAgIFt3ZWJWaWV3 IGdvQmFja107Cit9CisKK3ZvaWQgV2ViS2l0QWdub3N0aWNUZXN0Ojpnb0JhY2soV0tWaWV3ICp2 aWV3KQoreworICAgIEVYUEVDVF9GQUxTRShkaWRGaW5pc2hMb2FkKTsKKyAgICBXS1BhZ2VHb0Jh Y2soW3ZpZXcgcGFnZVJlZl0pOworfQorCit2b2lkIFdlYktpdEFnbm9zdGljVGVzdDo6Z29Gb3J3 YXJkKFdlYlZpZXcgKndlYlZpZXcpCit7CisgICAgRVhQRUNUX0ZBTFNFKGRpZEZpbmlzaExvYWQp OworICAgIFt3ZWJWaWV3IGdvRm9yd2FyZF07Cit9CisKK3ZvaWQgV2ViS2l0QWdub3N0aWNUZXN0 Ojpnb0ZvcndhcmQoV0tWaWV3ICp2aWV3KQoreworICAgIEVYUEVDVF9GQUxTRShkaWRGaW5pc2hM b2FkKTsKKyAgICBXS1BhZ2VHb0ZvcndhcmQoW3ZpZXcgcGFnZVJlZl0pOworfQorCit2b2lkIFdl YktpdEFnbm9zdGljVGVzdDo6d2FpdEZvckxvYWRUb0ZpbmlzaCgpCit7CisgICAgVXRpbDo6cnVu KCZkaWRGaW5pc2hMb2FkKTsKKyAgICBkaWRGaW5pc2hMb2FkID0gZmFsc2U7Cit9CisKIH0gLy8g bmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkK