23854 2009-02-09 14:01:32 -0800 DumpRenderTree window needs to be autodisplaying when displaying accelerated content 2009-03-02 11:51:54 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 23359 1 simon.fraser simon.fraser mitz oldest_to_newest 109027 0 simon.fraser 2009-02-09 14:01:32 -0800 When running tests that rely on accelerated compositing, the DumpRenderTree window needs to be setAutodisplay:YES, otherwise the underlying engine does not start accelerated animations correctly. 109045 1 27499 simon.fraser 2009-02-09 15:34:16 -0800 Created attachment 27499 Patch 110997 2 27499 mitz 2009-02-25 11:55:21 -0800 Comment on attachment 27499 Patch In pointers to Objective-C instances, the space should go before the * (including in static_cast<>s). I am not sure why you are checking that the WebView responds to _isUsingAcceleratedCompositing. DumpRenderTree is not expected to be used with old WebKit. You don't need to declare and initialize the firstView variable outside the if statement. r=me 110999 3 simon.fraser 2009-02-25 12:12:52 -0800 http://trac.webkit.org/changeset/41224 27499 2009-02-09 15:34:16 -0800 2009-02-25 11:55:21 -0800 Patch 23854_patch.txt text/plain 14807 simon.fraser ZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggNjhmZTA4Ny4uYmE5ODA1MSAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAwOS0wMi0wOSAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIGFuIG9ic2VydmFibGUgcHJvcGVy dHksIF9pc1VzaW5nQWNjZWxlcmF0ZWRDb21wb3NpdGluZywgb24KKyAgICAgICAgV2ViVmlldyB0 aGF0IER1bXBSZW5kZXJUcmVlIGNhbiB1c2UgdG8gc3BlY2lhbGl6ZSBiZWhhdmlvci4KKyAgICAg ICAgCisgICAgICAgIFRoaXMgaXMgaW1wbGVtZW50ZWQgdmlhIGEgY291bnQgb2YgRnJhbWVzIHRo YXQgYXJlIHVzaW5nCisgICAgICAgIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nLgorICAgICAgICAK KyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmll d1ByaXZhdGUgY2xlYXJdKToKKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgY2xvc2VdKToKKyAgICAg ICAgKC1bV2ViSFRNTFZpZXcgYXR0YWNoUm9vdExheWVyOl0pOgorICAgICAgICAoLVtXZWJIVE1M VmlldyBkZXRhY2hSb290TGF5ZXJdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06Cisg ICAgICAgICgrW1dlYlZpZXcgYXV0b21hdGljYWxseU5vdGlmaWVzT2JzZXJ2ZXJzRm9yS2V5Ol0p OgorICAgICAgICAoLVtXZWJWaWV3IF9zdGFydGVkQWNjZWxlcmF0ZWRDb21wb3NpdGluZzpdKToK KyAgICAgICAgKC1bV2ViVmlldyBfc3RvcHBlZEFjY2VsZXJhdGVkQ29tcG9zaXRpbmc6XSk6Cisg ICAgICAgICgtW1dlYlZpZXcgX2lzVXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nXSk6CisgICAg ICAgICogV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZXdQcml2YXRlLmg6CisKIDIwMDktMDItMDkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQuCmRpZmYgLS1naXQgYS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0gYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZp ZXcubW0KaW5kZXggYjYyMGQ4NS4uNDkzZTIxMCAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkhUTUxWaWV3Lm1tCisrKyBiL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5t bQpAQCAtNTM5LDcgKzUzOSw3IEBAIHN0YXRpYyBOU0NlbGxTdGF0ZVZhbHVlIGtpdChUcmlTdGF0 ZSBzdGF0ZSkKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBsYXllckhv c3RpbmdWaWV3ID0gbmlsOwotI2VuZGlmICAgIAorI2VuZGlmCiB9CiAKIEBlbmQKQEAgLTE5MTQs NyArMTkxNCw3IEBAIHN0YXRpYyB2b2lkIF91cGRhdGVNb3VzZW92ZXJUaW1lckNhbGxiYWNrKENG UnVuTG9vcFRpbWVyUmVmIHRpbWVyLCB2b2lkICppbmZvKQogCiAtICh2b2lkKWNsb3NlCiB7Ci0g ICAgLy8gQ2hlY2sgZm9yIGEgbmlsIF9wcml2YXRlIGhlcmUgaW5jYXNlIHdlIHdlcmUgY3JlYXRl ZCB3aXRoIGluaXRXaXRoQ29kZXIuIEluIHRoYXQgY2FzZSwgdGhlIFdlYlZpZXcgaXMganVzdCB0 aHJvd2luZworICAgIC8vIENoZWNrIGZvciBhIG5pbCBfcHJpdmF0ZSBoZXJlIGluIGNhc2Ugd2Ug d2VyZSBjcmVhdGVkIHdpdGggaW5pdFdpdGhDb2Rlci4gSW4gdGhhdCBjYXNlLCB0aGUgV2ViVmll dyBpcyBqdXN0IHRocm93aW5nCiAgICAgLy8gb3V0IHRoZSBhcmNoaXZlZCBXZWJIVE1MVmlldyBh bmQgcmVjcmVhdGluZyBhIG5ldyBvbmUgaWYgbmVlZGVkLiBTbyBjbG9zZSBkb2Vzbid0IG5lZWQg dG8gZG8gYW55dGhpbmcgaW4gdGhhdCBjYXNlLgogICAgIGlmICghX3ByaXZhdGUgfHwgX3ByaXZh dGUtPmNsb3NlZCkKICAgICAgICAgcmV0dXJuOwpAQCAtMTkzMSw4ICsxOTMxLDE0IEBAIHN0YXRp YyB2b2lkIF91cGRhdGVNb3VzZW92ZXJUaW1lckNhbGxiYWNrKENGUnVuTG9vcFRpbWVyUmVmIHRp bWVyLCB2b2lkICppbmZvKQogICAgIFtfcHJpdmF0ZS0+cGx1Z2luQ29udHJvbGxlciBzZXREYXRh U291cmNlOm5pbF07CiAgICAgLy8gcmVtb3ZlIHRvb2x0aXBzIGJlZm9yZSBjbGVhcmluZyBfcHJp dmF0ZSBzbyByZW1vdmVUcmFja2luZ1JlY3Q6IHdpbGwgd29yayBjb3JyZWN0bHkKICAgICBbc2Vs ZiByZW1vdmVBbGxUb29sVGlwc107CisKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp CisgICAgaWYgKF9wcml2YXRlLT5sYXllckhvc3RpbmdWaWV3KQorICAgICAgICBbW3NlbGYgX3dl YlZpZXddIF9zdG9wcGVkQWNjZWxlcmF0ZWRDb21wb3NpdGluZzpbc2VsZiBfZnJhbWVdXTsKKyNl bmRpZgorCiAgICAgW19wcml2YXRlIGNsZWFyXTsKLSAgICAKKwogICAgIFBhZ2UqIHBhZ2UgPSBj b3JlKFtzZWxmIF93ZWJWaWV3XSk7CiAgICAgaWYgKHBhZ2UpCiAgICAgICAgIHBhZ2UtPmRyYWdD b250cm9sbGVyKCktPnNldERyYWdnaW5nSW1hZ2VVUkwoS1VSTCgpKTsKQEAgLTUwMzUsNiArNTA0 MSw3IEBAIHN0YXRpYyBDR1BvaW50IGNvcmVHcmFwaGljc1NjcmVlblBvaW50Rm9yQXBwS2l0U2Ny ZWVuUG9pbnQoTlNQb2ludCBwb2ludCkKICAgICAgICAgW2hvc3RpbmdWaWV3IHJlbGVhc2VdOwog ICAgICAgICAvLyBob3N0aW5nVmlldyBpcyBvd25lZCBieSBiZWluZyBhIHN1YnZpZXcgb2Ygc2Vs ZgogICAgICAgICBfcHJpdmF0ZS0+bGF5ZXJIb3N0aW5nVmlldyA9IGhvc3RpbmdWaWV3OworICAg ICAgICBbW3NlbGYgX3dlYlZpZXddIF9zdGFydGVkQWNjZWxlcmF0ZWRDb21wb3NpdGluZzpbc2Vs ZiBfZnJhbWVdXTsKICAgICB9CiAKICAgICAvLyBNYWtlIGEgY29udGFpbmVyIGxheWVyLCB3aGlj aCB3aWxsIGdldCBzaXplZC9wb3NpdGlvbmVkIGJ5IEFwcEtpdCBhbmQgQ0EKQEAgLTUwNTMsNiAr NTA2MCw3IEBAIHN0YXRpYyBDR1BvaW50IGNvcmVHcmFwaGljc1NjcmVlblBvaW50Rm9yQXBwS2l0 U2NyZWVuUG9pbnQoTlNQb2ludCBwb2ludCkKICAgICAgICAgW19wcml2YXRlLT5sYXllckhvc3Rp bmdWaWV3IHNldFdhbnRzTGF5ZXI6Tk9dOwogICAgICAgICBbX3ByaXZhdGUtPmxheWVySG9zdGlu Z1ZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgICAgIF9wcml2YXRlLT5sYXllckhvc3Rp bmdWaWV3ID0gbmlsOworICAgICAgICBbW3NlbGYgX3dlYlZpZXddIF9zdG9wcGVkQWNjZWxlcmF0 ZWRDb21wb3NpdGluZzpbc2VsZiBfZnJhbWVdXTsKICAgICB9CiB9CiAjZW5kaWYKZGlmZiAtLWdp dCBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZXcubW0KaW5kZXggMDliZjMzZS4uNDEwZjAxYiAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAg LTI4Nyw2ICsyODcsMTEgQEAgbWFjcm8oeWFua0FuZFNlbGVjdCkgXAogI2RlZmluZSBBcHBsZUtl eWJvYXJkVUlNb2RlIENGU1RSKCJBcHBsZUtleWJvYXJkVUlNb2RlIikKICNkZWZpbmUgVW5pdmVy c2FsQWNjZXNzRG9tYWluIENGU1RSKCJjb20uYXBwbGUudW5pdmVyc2FsYWNjZXNzIikKIAorI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNkZWZpbmUgVXNpbmdBY2NlbGVyYXRlZENv bXBvc2l0aW5nUHJvcGVydHkgQCJfaXNVc2luZ0FjY2VsZXJhdGVkQ29tcG9zaXRpbmciCisjZW5k aWYgICAgICAgICAgICAKKworCiBzdGF0aWMgQk9PTCBzX2RpZFNldENhY2hlTW9kZWw7CiBzdGF0 aWMgV2ViQ2FjaGVNb2RlbCBzX2NhY2hlTW9kZWwgPSBXZWJDYWNoZU1vZGVsRG9jdW1lbnRWaWV3 ZXI7CiAKQEAgLTQxMSw2ICs0MTYsOCBAQCBzdGF0aWMgY29uc3QgY2hhciB3ZWJWaWV3SXNPcGVu W10gPSAiQXQgbGVhc3Qgb25lIFdlYlZpZXcgaXMgc3RpbGwgb3Blbi4iOwogICAgIC8vIFdoZW4g dGhpcyBmbGFnIGlzIHNldCwgbmV4dCB0aW1lIGEgV2ViSFRNTFZpZXcgZHJhd3MsIGl0IG5lZWRz IHRvIHRlbXBvcmFyaWx5IGRpc2FibGUgc2NyZWVuIHVwZGF0ZXMKICAgICAvLyBzbyB0aGF0IHRo ZSBOU1ZpZXcgZHJhd2luZyBpcyB2aXN1YWxseSBzeW5jaHJvbml6ZWQgd2l0aCBDQUxheWVyIHVw ZGF0ZXMuCiAgICAgQk9PTCBuZWVkc09uZVNob3REcmF3aW5nU3luY2hyb25pemF0aW9uOworICAg IC8vIE51bWJlciBvZiBXZWJIVE1MVmlld3MgdXNpbmcgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcu IFVzZWQgdG8gaW1wbGVtZW50IF9pc1VzaW5nQWNjZWxlcmF0ZWRDb21wb3NpdGluZy4KKyAgICBp bnQgY29tcG9zaXRlZEZyYW1lc0NvdW50OwogI2VuZGlmICAgIAogfQogQGVuZApAQCAtMTU4Niw3 ICsxNTkzLDExIEBAIFdlYlNjcmlwdERlYnVnRGVsZWdhdGVJbXBsZW1lbnRhdGlvbkNhY2hlKiBX ZWJWaWV3R2V0U2NyaXB0RGVidWdEZWxlZ2F0ZUltcGxlbWVuCiAgICAgc3RhdGljIE5TU2V0ICpt YW51YWxOb3RpZnlLZXlzID0gbmlsOwogICAgIGlmICghbWFudWFsTm90aWZ5S2V5cykKICAgICAg ICAgbWFudWFsTm90aWZ5S2V5cyA9IFtbTlNTZXQgYWxsb2NdIGluaXRXaXRoT2JqZWN0czpfV2Vi TWFpbkZyYW1lVVJMS2V5LCBfV2ViSXNMb2FkaW5nS2V5LCBfV2ViRXN0aW1hdGVkUHJvZ3Jlc3NL ZXksCi0gICAgICAgICAgICBfV2ViQ2FuR29CYWNrS2V5LCBfV2ViQ2FuR29Gb3J3YXJkS2V5LCBf V2ViTWFpbkZyYW1lVGl0bGVLZXksIF9XZWJNYWluRnJhbWVJY29uS2V5LCBfV2ViTWFpbkZyYW1l RG9jdW1lbnRLZXksIG5pbF07CisgICAgICAgICAgICBfV2ViQ2FuR29CYWNrS2V5LCBfV2ViQ2Fu R29Gb3J3YXJkS2V5LCBfV2ViTWFpbkZyYW1lVGl0bGVLZXksIF9XZWJNYWluRnJhbWVJY29uS2V5 LCBfV2ViTWFpbkZyYW1lRG9jdW1lbnRLZXksCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQorICAgICAgICAgICAgVXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nUHJvcGVydHksIC8v IHVzZWQgYnkgRFJUCisjZW5kaWYgICAgICAgICAgICAKKyAgICAgICAgICAgIG5pbF07CiAgICAg aWYgKFttYW51YWxOb3RpZnlLZXlzIGNvbnRhaW5zT2JqZWN0OmtleV0pCiAgICAgICAgIHJldHVy biBOTzsKICAgICByZXR1cm4gWUVTOwpAQCAtMjEwOCw4ICsyMTE5LDM5IEBAIFdlYlNjcmlwdERl YnVnRGVsZWdhdGVJbXBsZW1lbnRhdGlvbkNhY2hlKiBXZWJWaWV3R2V0U2NyaXB0RGVidWdEZWxl Z2F0ZUltcGxlbWVuCiB7CiAgICAgX3ByaXZhdGUtPm5lZWRzT25lU2hvdERyYXdpbmdTeW5jaHJv bml6YXRpb24gPSBuZWVkc1N5bmNocm9uaXphdGlvbjsKIH0KKworLSAodm9pZClfc3RhcnRlZEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmc6KFdlYkZyYW1lKil3ZWJGcmFtZQoreworICAgIEJPT0wgZW50 ZXJpbmcgPSBfcHJpdmF0ZS0+Y29tcG9zaXRlZEZyYW1lc0NvdW50ID09IDA7CisgICAgaWYgKGVu dGVyaW5nKQorICAgICAgICBbc2VsZiB3aWxsQ2hhbmdlVmFsdWVGb3JLZXk6VXNpbmdBY2NlbGVy YXRlZENvbXBvc2l0aW5nUHJvcGVydHldOworICAgICsrX3ByaXZhdGUtPmNvbXBvc2l0ZWRGcmFt ZXNDb3VudDsKKyAgICBpZiAoZW50ZXJpbmcpCisgICAgICAgIFtzZWxmIGRpZENoYW5nZVZhbHVl Rm9yS2V5OlVzaW5nQWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Byb3BlcnR5XTsKK30KKworLSAodm9p ZClfc3RvcHBlZEFjY2VsZXJhdGVkQ29tcG9zaXRpbmc6KFdlYkZyYW1lKil3ZWJGcmFtZQorewor ICAgIEJPT0wgbGVhdmluZyA9IF9wcml2YXRlLT5jb21wb3NpdGVkRnJhbWVzQ291bnQgPT0gMTsK KyAgICBBU1NFUlQoX3ByaXZhdGUtPmNvbXBvc2l0ZWRGcmFtZXNDb3VudCA+IDApOworICAgIAor ICAgIGlmIChsZWF2aW5nKQorICAgICAgICBbc2VsZiB3aWxsQ2hhbmdlVmFsdWVGb3JLZXk6VXNp bmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nUHJvcGVydHldOworICAgIC0tX3ByaXZhdGUtPmNvbXBv c2l0ZWRGcmFtZXNDb3VudDsKKyAgICBpZiAobGVhdmluZykKKyAgICAgICAgW3NlbGYgZGlkQ2hh bmdlVmFsdWVGb3JLZXk6VXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nUHJvcGVydHldOworfQog I2VuZGlmICAgIAogCistIChCT09MKV9pc1VzaW5nQWNjZWxlcmF0ZWRDb21wb3NpdGluZworewor I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICByZXR1cm4gX3ByaXZhdGUtPmNv bXBvc2l0ZWRGcmFtZXNDb3VudCA+IDA7CisjZWxzZQorICAgIHJldHVybiBOTzsKKyNlbmRpZgor fQorCiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBfV2ViU2FmZUZvcndhcmRlcgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oIGIvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXdJbnRlcm5hbC5oCmluZGV4IDM1YjVjMzguLjZhYjA4OTcgMTAwNjQ0Ci0tLSBh L1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaAorKysgYi9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVmlld0ludGVybmFsLmgKQEAgLTE0Nyw3ICsxNDcsOSBAQCB0eXBlZGVmIFdlYkNv cmU6OlBhZ2UgV2ViQ29yZVBhZ2U7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQog LSAoQk9PTClfbmVlZHNPbmVTaG90RHJhd2luZ1N5bmNocm9uaXphdGlvbjsKIC0gKHZvaWQpX3Nl dE5lZWRzT25lU2hvdERyYXdpbmdTeW5jaHJvbml6YXRpb246KEJPT0wpbmVlZHNTeW5jaHJvbml6 YXRpb247Ci0jZW5kaWYgICAgCistICh2b2lkKV9zdGFydGVkQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZzooV2ViRnJhbWUqKXdlYkZyYW1lOworLSAodm9pZClfc3RvcHBlZEFjY2VsZXJhdGVkQ29tcG9z aXRpbmc6KFdlYkZyYW1lKil3ZWJGcmFtZTsKKyNlbmRpZgogCiBAZW5kCiAKZGlmZiAtLWdpdCBh L1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5oIGIvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXdQcml2YXRlLmgKaW5kZXggOTVlMTI0OS4uYjhlOTg1NSAxMDA2NDQKLS0tIGEvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgKKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXdQcml2YXRlLmgKQEAgLTQwNiw2ICs0MDYsOSBAQCBDb3VsZCBiZSB3b3J0aCBhZGRp bmcgdG8gdGhlIEFQSS4KIC0gKHZvaWQpc2V0TWVtb3J5Q2FjaGVEZWxlZ2F0ZUNhbGxzRW5hYmxl ZDooQk9PTClzdXNwZW5kOwogLSAoQk9PTClhcmVNZW1vcnlDYWNoZURlbGVnYXRlQ2FsbHNFbmFi bGVkOwogCisvLyBTUEkgZm9yIER1bXBSZW5kZXJUcmVlCistIChCT09MKV9pc1VzaW5nQWNjZWxl cmF0ZWRDb21wb3NpdGluZzsKKwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYlZpZXcgKFdlYlZpZXdQ cmludGluZ1ByaXZhdGUpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJL aXRUb29scy9DaGFuZ2VMb2cKaW5kZXggZjRjMmI2Yy4uNjlhYmMwMSAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDI1IEBACisyMDA5LTAyLTA5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhdmUg dGhlIER1bXBSZW5kZXJUcmVlV2luZG93IG9ic2VydmUgdGhlIC1faXNVc2luZ0FjY2VsZXJhdGVk Q29tcG9zaXRpbmcKKyAgICAgICAgcHJvcGVydHkgb2YgdGhlIFdlYlZpZXcsIGFuZCB1c2UgdGhh dCB0byB0dXJuIC1hdXRvZGlzcGxheSBvbiBhbmQgb2ZmLgorICAgICAgICBUaGlzIGlzIG5lY2Vz c2FyeSBzbyB0aGF0IGFjY2VsZXJhdGVkIGFuaW1hdGlvbnMgc3RhcnQgY29ycmVjdGx5LgorICAg ICAgICBXZSBjYW4gdGh1cyByZW1vdmUgdGhlIC1kaXNwbGF5IGhhY2sgaW4gY3JlYXRlQml0bWFw Q29udGV4dEZyb21XZWJWaWV3KCkuCisgICAgICAgIAorICAgICAgICAqIER1bXBSZW5kZXJUcmVl L21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAgICAgICAgKGNyZWF0ZVdlYlZpZXdBbmRPZmZzY3Jl ZW5XaW5kb3cpOgorICAgICAgICAoZHVtcFJlbmRlclRyZWUpOgorICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZVdpbmRvdy5oOgorICAgICAgICAqIER1bXBSZW5kZXJU cmVlL21hYy9EdW1wUmVuZGVyVHJlZVdpbmRvdy5tbToKKyAgICAgICAgKC1bRHVtcFJlbmRlclRy ZWVXaW5kb3cgY2xvc2VdKToKKyAgICAgICAgKC1bRHVtcFJlbmRlclRyZWVXaW5kb3cgd2ViVmll d10pOgorICAgICAgICAoLVtEdW1wUmVuZGVyVHJlZVdpbmRvdyBzdGFydE9ic2VydmluZ1dlYlZp ZXddKToKKyAgICAgICAgKC1bRHVtcFJlbmRlclRyZWVXaW5kb3cgc3RvcE9ic2VydmluZ1dlYlZp ZXddKToKKyAgICAgICAgKC1bRHVtcFJlbmRlclRyZWVXaW5kb3cgb2JzZXJ2ZVZhbHVlRm9yS2V5 UGF0aDpvZk9iamVjdDpjaGFuZ2U6Y29udGV4dDpdKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJl ZS9tYWMvUGl4ZWxEdW1wU3VwcG9ydE1hYy5tbToKKyAgICAgICAgKGNyZWF0ZUJpdG1hcENvbnRl eHRGcm9tV2ViVmlldyk6CisKIDIwMDktMDItMDUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSAjaW5jbHVkZSBmaWxlIG9yZGVyLCBwZXIg cmV2aWV3IGNvbW1lbnRzLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL0R1bXBSZW5kZXJUcmVlLm1tIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1 bXBSZW5kZXJUcmVlLm1tCmluZGV4IDg2Y2YxMDUuLmY1NGQwZWIgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQorKysgYi9XZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KQEAgLTI1Niw2ICsyNTYs OCBAQCBXZWJWaWV3ICpjcmVhdGVXZWJWaWV3QW5kT2Zmc2NyZWVuV2luZG93KCkKICAgICBbW3dp bmRvdyBjb250ZW50Vmlld10gYWRkU3Vidmlldzp3ZWJWaWV3XTsKICAgICBbd2luZG93IG9yZGVy QmFjazpuaWxdOwogICAgIFt3aW5kb3cgc2V0QXV0b2Rpc3BsYXk6Tk9dOworCisgICAgW3dpbmRv dyBzdGFydE9ic2VydmluZ1dlYlZpZXddOwogICAgIAogICAgIC8vIEZvciByZWFzb25zIHRoYXQg YXJlIG5vdCBlbnRpcmVseSBjbGVhciwgdGhlIGZvbGxvd2luZyBwYWlyIG9mIGNhbGxzIG1ha2Vz IFdlYlZpZXcgaGFuZGxlIGl0cwogICAgIC8vIGR5bmFtaWMgc2Nyb2xsYmFycyBwcm9wZXJseS4g V2l0aG91dCBpdCwgZXZlcnkgZnJhbWUgd2lsbCBhbHdheXMgaGF2ZSBzY3JvbGxiYXJzLgpAQCAt NTExLDYgKzUxMyw4IEBAIHZvaWQgZHVtcFJlbmRlclRyZWUoaW50IGFyZ2MsIGNvbnN0IGNoYXIg KmFyZ3ZbXSkKICAgICBpZiAodGhyZWFkZWQpCiAgICAgICAgIHN0b3BKYXZhU2NyaXB0VGhyZWFk cygpOwogCisgICAgRHVtcFJlbmRlclRyZWVXaW5kb3cgKndpbmRvdyA9IHN0YXRpY19jYXN0PER1 bXBSZW5kZXJUcmVlV2luZG93Kj4oW3dlYlZpZXcgd2luZG93XSk7CisgICAgW3dpbmRvdyBzdG9w T2JzZXJ2aW5nV2ViVmlld107CiAgICAgW3dlYlZpZXcgY2xvc2VdOwogICAgIG1haW5GcmFtZSA9 IG5pbDsKIApAQCAtNTE4LDcgKzUyMiw2IEBAIHZvaWQgZHVtcFJlbmRlclRyZWUoaW50IGFyZ2Ms IGNvbnN0IGNoYXIgKmFyZ3ZbXSkKICAgICAvLyAicGVyZm9ybSBzZWxlY3RvciIgb24gdGhlIHdp bmRvdywgd2hpY2ggcmV0YWlucyB0aGUgd2luZG93LiBJdCdzIGEgYml0CiAgICAgLy8gaW5lbGVn YW50IGFuZCBwZXJoYXBzIGRhbmdlcm91cyB0byBqdXN0IGJsb3cgdGhlbSBhbGwgYXdheSwgYnV0 IGluIHByYWN0aWNlCiAgICAgLy8gaXQgcHJvYmFibHkgd29uJ3QgY2F1c2UgYW55IHRyb3VibGUg KGFuZCB0aGlzIGlzIGp1c3QgYSB0ZXN0IHRvb2wsIGFmdGVyIGFsbCkuCi0gICAgTlNXaW5kb3cg KndpbmRvdyA9IFt3ZWJWaWV3IHdpbmRvd107CiAgICAgW05TT2JqZWN0IGNhbmNlbFByZXZpb3Vz UGVyZm9ybVJlcXVlc3RzV2l0aFRhcmdldDp3aW5kb3ddOwogICAgIAogICAgIFt3aW5kb3cgY2xv c2VdOyAvLyByZWxlYXNlcyB3aGVuIGNsb3NlZApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlV2luZG93LmggYi9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWVXaW5kb3cuaAppbmRleCAzYWMzMjIzLi42YTNh MjRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRl clRyZWVXaW5kb3cuaAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJl bmRlclRyZWVXaW5kb3cuaApAQCAtMzAsNyArMzAsMTUgQEAKIAogI2ltcG9ydCA8QXBwS2l0L0Fw cEtpdC5oPgogCitAY2xhc3MgV2ViVmlldzsKKwogQGludGVyZmFjZSBEdW1wUmVuZGVyVHJlZVdp bmRvdyA6IE5TV2luZG93CiAvLyBJJ20gbm90IHN1cmUgd2h5IHdlIGNhbid0IGp1c3QgdXNlIFtO U0FwcCB3aW5kb3dzXQogKyAoTlNBcnJheSAqKW9wZW5XaW5kb3dzOworCistIChXZWJWaWV3Kil3 ZWJWaWV3OworCistICh2b2lkKXN0YXJ0T2JzZXJ2aW5nV2ViVmlldzsKKy0gKHZvaWQpc3RvcE9i c2VydmluZ1dlYlZpZXc7CisKIEBlbmQKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZVdpbmRvdy5tbSBiL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZVdpbmRvdy5tbQppbmRleCBiM2ZjNWE3Li41OGVkODI5 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRy ZWVXaW5kb3cubW0KKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5k ZXJUcmVlV2luZG93Lm1tCkBAIC0zNCw2ICszNCw3IEBACiAKIC8vIEZJWE1FOiBUaGlzIGZpbGUg aXMgT2JqQysrIG9ubHkgYmVjYXVzZSBvZiB0aGlzIGluY2x1ZGUuIDooCiAjaW1wb3J0ICJMYXlv dXRUZXN0Q29udHJvbGxlci5oIgorI2ltcG9ydCA8V2ViS2l0L1dlYlZpZXdQcml2YXRlLmg+CiAj aW1wb3J0IDxXZWJLaXQvV2ViVHlwZXNJbnRlcm5hbC5oPgogCiBDRk11dGFibGVBcnJheVJlZiBv cGVuV2luZG93c1JlZiA9IDA7CkBAIC02OSw2ICs3MCw3IEBAIHN0YXRpYyBDRkFycmF5Q2FsbEJh Y2tzIE5vblJldGFpbmluZ0FycmF5Q2FsbGJhY2tzID0gewogICAgIENGSW5kZXggaSA9IENGQXJy YXlHZXRGaXJzdEluZGV4T2ZWYWx1ZShvcGVuV2luZG93c1JlZiwgYXJyYXlSYW5nZSwgc2VsZik7 CiAgICAgYXNzZXJ0KGkgIT0gLTEpOwogICAgIENGQXJyYXlSZW1vdmVWYWx1ZUF0SW5kZXgob3Bl bldpbmRvd3NSZWYsIGkpOworICAgIAogICAgIFtzdXBlciBjbG9zZV07CiB9CiAKQEAgLTgzLDQg Kzg1LDM4IEBAIHN0YXRpYyBDRkFycmF5Q2FsbEJhY2tzIE5vblJldGFpbmluZ0FycmF5Q2FsbGJh Y2tzID0gewogICAgIC8vIG9uY2Ugd2UgZ2V0IHRvIHRoZSBlbmQgb2YgdGhlIHJlc3BvbmRlciBj aGFpbi4KIH0KIAorLSAoV2ViVmlldyopd2ViVmlldworeworICAgIE5TVmlldyogZmlyc3RWaWV3 ID0gbmlsOworICAgIGlmIChbW1tzZWxmIGNvbnRlbnRWaWV3XSBzdWJ2aWV3c10gY291bnRdID4g MCkgeworICAgICAgICBmaXJzdFZpZXcgPSBbW1tzZWxmIGNvbnRlbnRWaWV3XSBzdWJ2aWV3c10g b2JqZWN0QXRJbmRleDowXTsKKyAgICAgICAgaWYgKFtmaXJzdFZpZXcgaXNLaW5kT2ZDbGFzczpb V2ViVmlldyBjbGFzc11dKQorICAgICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYlZpZXcq PihmaXJzdFZpZXcpOworICAgIH0KKyAgICByZXR1cm4gbmlsOworfQorCistICh2b2lkKXN0YXJ0 T2JzZXJ2aW5nV2ViVmlldworeworICAgIFtbc2VsZiB3ZWJWaWV3XSBhZGRPYnNlcnZlcjpzZWxm IGZvcktleVBhdGg6QCJfaXNVc2luZ0FjY2VsZXJhdGVkQ29tcG9zaXRpbmciIG9wdGlvbnM6MCBj b250ZXh0OjBdOworfQorCistICh2b2lkKXN0b3BPYnNlcnZpbmdXZWJWaWV3Cit7CisgICAgW1tz ZWxmIHdlYlZpZXddIHJlbW92ZU9ic2VydmVyOnNlbGYgZm9yS2V5UGF0aDpAIl9pc1VzaW5nQWNj ZWxlcmF0ZWRDb21wb3NpdGluZyJdOworfQorCistICh2b2lkKW9ic2VydmVWYWx1ZUZvcktleVBh dGg6KE5TU3RyaW5nICopa2V5UGF0aCBvZk9iamVjdDooaWQpb2JqZWN0IGNoYW5nZTooTlNEaWN0 aW9uYXJ5ICopY2hhbmdlIGNvbnRleHQ6KHZvaWQgKiljb250ZXh0Cit7CisgICAgaWYgKFtrZXlQ YXRoIGlzRXF1YWxUb1N0cmluZzpAIl9pc1VzaW5nQWNjZWxlcmF0ZWRDb21wb3NpdGluZyJdKSB7 CisgICAgICAgIC8vIFdoZW4gdXNpbmcgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcsIHRoZSB3aW5k b3cgbmVlZHMgdG8gYmUgYXV0b2Rpc3BsYXkgZm9yIEFwcEtpdC9DQSB0bworICAgICAgICAvLyBz dGFydCBhY2NlbGVyYXRlZCBhbmltYXRpb25zIGNvcnJlY3RseS4KKyAgICAgICAgQk9PTCBpc0Fj Y2VsZXJhdGVkID0gW1tzZWxmIHdlYlZpZXddIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io X2lzVXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nKV0gJiYgW1tzZWxmIHdlYlZpZXddIF9pc1Vz aW5nQWNjZWxlcmF0ZWRDb21wb3NpdGluZ107CisgICAgICAgIFtzZWxmIHNldEF1dG9kaXNwbGF5 OmlzQWNjZWxlcmF0ZWRdOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAorICAgIFtzdXBl ciBvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOmtleVBhdGggb2ZPYmplY3Q6b2JqZWN0IGNoYW5nZTpj aGFuZ2UgY29udGV4dDpjb250ZXh0XTsKK30KKwogQGVuZApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL1BpeGVsRHVtcFN1cHBvcnRNYWMubW0gYi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9tYWMvUGl4ZWxEdW1wU3VwcG9ydE1hYy5tbQppbmRleCA4NzZjMzcx Li40YTZmOGI3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvUGl4 ZWxEdW1wU3VwcG9ydE1hYy5tbQorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMv UGl4ZWxEdW1wU3VwcG9ydE1hYy5tbQpAQCAtNDQsNiArNDQsNyBAQAogI2ltcG9ydCA8V2ViS2l0 L1dlYkRvY3VtZW50UHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkhUTUxWaWV3UHJpdmF0 ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYktpdC5oPgorI2ltcG9ydCA8V2ViS2l0L1dlYlZpZXdQ cml2YXRlLmg+CiAKIC8vIFRvIGVuc3VyZSBwaXhlbCB0ZXN0cyBjb25zaXN0ZW5jeSwgd2UgbmVl ZCB0byBhbHdheXMgcmVuZGVyIGluIHRoZSBzYW1lIGNvbG9yc3BhY2UuCiAvLyBVbmZvcnR1bmF0 ZWx5LCBiZWNhdXNlIG9mIEFwcEtpdCAvIFdlYktpdCBjb25zdHJhaW50cywgd2UgY2FuJ3QgcmVu ZGVyIGRpcmVjdGx5IGluIHRoZSBjb2xvcnNwYWNlIG9mIG91ciBjaG9pY2UuCkBAIC0xMDMsMTgg KzEwNCwxMyBAQCB2b2lkIHNldHVwTWFpbkRpc3BsYXlDb2xvclByb2ZpbGUoKQogCiBQYXNzUmVm UHRyPEJpdG1hcENvbnRleHQ+IGNyZWF0ZUJpdG1hcENvbnRleHRGcm9tV2ViVmlldyhib29sIG9u c2NyZWVuLCBib29sIGluY3JlbWVudGFsUmVwYWludCwgYm9vbCBzd2VlcEhvcml6b250YWxseSwg Ym9vbCBkcmF3U2VsZWN0aW9uUmVjdCkKIHsKKyAgICBXZWJWaWV3KiB2aWV3ID0gW21haW5GcmFt ZSB3ZWJWaWV3XTsKKwogICAgIC8vIElmIHRoZSBXZWJIVE1MVmlldyB1c2VzIGFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nLCB3ZSBuZWVkIGZvciBmb3JjZSB0aGUgb24tc2NyZWVuIGNhcHR1cmUgcGF0 aAogICAgIC8vIGFuZCBhbHNvIGZvcmNlIENvcmUgQW5pbWF0aW9uIHRvIHN0YXJ0IGl0cyBhbmlt YXRpb25zIHdpdGggLWRpc3BsYXkgc2luY2UgdGhlIERSVCB3aW5kb3cgaGFzIGF1dG9kaXNwbGF5 IGRpc2FibGVkLgotICAgIE5TVmlldyogZG9jdW1lbnRWaWV3ID0gW1ttYWluRnJhbWUgZnJhbWVW aWV3XSBkb2N1bWVudFZpZXddOwotICAgIGlmIChbZG9jdW1lbnRWaWV3IGlzS2luZE9mQ2xhc3M6 W1dlYkhUTUxWaWV3IGNsYXNzXV0pIHsKLSAgICAgICAgV2ViSFRNTFZpZXcqIGh0bWxWaWV3ID0g KFdlYkhUTUxWaWV3Kilkb2N1bWVudFZpZXc7Ci0gICAgICAgIGlmIChbaHRtbFZpZXcgcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfaXNVc2luZ0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcpXSAm JiBbaHRtbFZpZXcgX2lzVXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nXSkgewotICAgICAgICAg ICAgW1todG1sVmlldyB3aW5kb3ddIGRpc3BsYXldOwotICAgICAgICAgICAgb25zY3JlZW4gPSBZ RVM7Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKFt2aWV3IHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX2lzVXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nKV0gJiYgW3ZpZXcgX2lzVXNp bmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nXSkKKyAgICAgICAgb25zY3JlZW4gPSBZRVM7CiAKLSAg ICBXZWJWaWV3KiB2aWV3ID0gW21haW5GcmFtZSB3ZWJWaWV3XTsKICAgICBOU1NpemUgd2ViVmll d1NpemUgPSBbdmlldyBmcmFtZV0uc2l6ZTsKICAgICBzaXplX3QgcGl4ZWxzV2lkZSA9IHN0YXRp Y19jYXN0PHNpemVfdD4od2ViVmlld1NpemUud2lkdGgpOwogICAgIHNpemVfdCBwaXhlbHNIaWdo ID0gc3RhdGljX2Nhc3Q8c2l6ZV90Pih3ZWJWaWV3U2l6ZS5oZWlnaHQpOwo=