123214 2013-10-23 12:35:24 -0700 CA should be separated from ACCELERATED_COMPOSITING on Windows 2019-09-12 19:50:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201749 P2 Normal --- 0 alex.christensen webkit-unassigned bfulgham commit-queue eric.carlson glenn jer.noble oldest_to_newest 942784 0 alex.christensen 2013-10-23 12:35:24 -0700 I got WinCairo to compile and run without crashing using ACCELERATED_COMPOSITING. The poster circle example (https://www.webkit.org/blog-files/3d-transforms/poster-circle.html) runs the cpu, but doesn't draw anything, so I'm still missing something, but I'll start uploading my changes for review. Until now, AppleWin was the only port using ACCELERATED_COMPOSITING, so no effort was given to distinguish between the CA code and the ACCELERATED_COMPOSITING code. I've separated the two. 942786 1 214982 alex.christensen 2013-10-23 12:41:13 -0700 Created attachment 214982 Patch 942808 2 214982 bfulgham 2013-10-23 13:31:42 -0700 Comment on attachment 214982 Patch r=me 942828 3 214982 commit-queue 2013-10-23 13:57:37 -0700 Comment on attachment 214982 Patch Clearing flags on attachment: 214982 Committed r157884: <http://trac.webkit.org/changeset/157884> 942829 4 commit-queue 2013-10-23 13:57:38 -0700 All reviewed patches have been landed. Closing bug. 214982 2013-10-23 12:41:13 -0700 2013-10-23 13:57:36 -0700 Patch bug-123214-20131023134113.patch text/plain 10848 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Nzg3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTIzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2VwYXJhdGVk IFVTRShDQSkgZnJvbSBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpIHRvIHByZXBhcmUgV2lu Q2Fpcm8gZm9yIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzMjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybUxh eWVyLmg6CisgICAgICAgIEFkZGVkIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyIFBsYXRmb3Jt TGF5ZXIgZGVjbGFyYXRpb24gZm9yIFdpbkNhaXJvLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVGdWxsc2NyZWVuV2luZG93LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUZ1bGxzY3JlZW5XaW5kb3c6OmNyZWF0ZVdpbmRv dyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVGdWxsc2NyZWVuV2luZG93 Ojp3bmRQcm9jKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQ cml2YXRlRnVsbHNjcmVlbldpbmRvdy5oOgorICAgICAgICBBZGRlZCBVU0UoQ0EpIHdoZXJlIG5l Y2Vzc2FyeSB0byBjb21waWxlIFdpbkNhaXJvIHdpdGggYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcu CisKIDIwMTMtMTAtMjMgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFJlLWluc3RhdGUgUHJvcG9zZWREYXRhYmFzZXMgbmVlZGVkIGJ5IGRldGFpbHNGb3JOYW1lQW5k T3JpZ2luKCkuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9y bUxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv UGxhdGZvcm1MYXllci5oCShyZXZpc2lvbiAxNTc4MjApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybUxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDggKzMx LDEzIEBACiAjaWYgUExBVEZPUk0oTUFDKQogT0JKQ19DTEFTUyBDQUxheWVyOwogdHlwZWRlZiBD QUxheWVyIFBsYXRmb3JtTGF5ZXI7Ci0jZWxpZiBQTEFURk9STShXSU4pCisjZWxpZiBQTEFURk9S TShXSU4pICYmIFVTRShDQSkKIHR5cGVkZWYgc3RydWN0IF9DQUNGTGF5ZXIgUGxhdGZvcm1MYXll cjsKKyNlbGlmIFBMQVRGT1JNKFdJTikgJiYgVVNFKFRFWFRVUkVfTUFQUEVSKQorbmFtZXNwYWNl IFdlYkNvcmUgeworY2xhc3MgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXI7Cit0eXBlZGVmIFRl eHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyIFBsYXRmb3JtTGF5ZXI7Cit9OwogI2VsaWYgUExBVEZP Uk0oR1RLKQogI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKIG5hbWVzcGFjZSBXZWJDb3JlIHsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclBy aXZhdGVGdWxsc2NyZWVuV2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlRnVsbHNjcmVlbldpbmRvdy5j cHAJKHJldmlzaW9uIDE1NzgyMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3dpbi9NZWRpYVBsYXllclByaXZhdGVGdWxsc2NyZWVuV2luZG93LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzQsNyArMzQsNyBAQAogI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0NvbG9yLmg+CiAj ZW5kaWYKIAotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpICYmIFVTRShDQSkKICNpbmNsdWRlICJDQUNGTGF5ZXJUcmVlSG9z dC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtQ0FMYXllci5oIgogI2VuZGlmCkBAIC04NCw3ICs4NCw3 IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlRnVsbHNjcmVlbldpbmRvdzoKICAgICAgICAgcGFy ZW50SHduZCwgMCwgaW5zdGFuY2VIYW5kbGUoKSwgdGhpcyk7CiAgICAgQVNTRVJUKElzV2luZG93 KG1faHduZCkpOwogCi0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNFKENBKQogICAgIGlmIChtX2xheWVyVHJlZUhv c3QpCiAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0V2luZG93KG1faHduZCk7CiAjZW5kaWYK QEAgLTkyLDcgKzkyLDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVGdWxsc2NyZWVuV2luZG93 OgogICAgIDo6U2V0Rm9jdXMobV9od25kKTsKIH0KIAotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFVTRShDQSkKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlRnVsbHNjcmVlbldpbmRvdzo6c2V0Um9vdENoaWxkTGF5ZXIo UGFzc1JlZlB0cjxQbGF0Zm9ybUNBTGF5ZXI+IHJvb3RDaGlsZCkKIHsKICAgICBpZiAobV9yb290 Q2hpbGQgPT0gcm9vdENoaWxkKQpAQCAtMTU2LDcgKzE1Niw3IEBAIExSRVNVTFQgTWVkaWFQbGF5 ZXJQcml2YXRlRnVsbHNjcmVlbldpbmQKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXTV9ERVNU Uk9ZOgogICAgICAgICBtX2h3bmQgPSAwOwotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFVTRShDQSkKICAgICAgICAg aWYgKG1fbGF5ZXJUcmVlSG9zdCkKICAgICAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0V2lu ZG93KDApOwogI2VuZGlmCkBAIC0xNjYsNyArMTY2LDcgQEAgTFJFU1VMVCBNZWRpYVBsYXllclBy aXZhdGVGdWxsc2NyZWVuV2luZAogICAgICAgICAgICAgTFBXSU5ET1dQT1Mgd3AgPSByZWludGVy cHJldF9jYXN0PExQV0lORE9XUE9TPihsUGFyYW0pOwogICAgICAgICAgICAgaWYgKHdwLT5mbGFn cyAmIFNXUF9OT1NJWkUpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0jaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNF KENBKQogICAgICAgICAgICAgaWYgKG1fbGF5ZXJUcmVlSG9zdCkgewogICAgICAgICAgICAgICAg IG1fbGF5ZXJUcmVlSG9zdC0+cmVzaXplKCk7CiAgICAgICAgICAgICAgICAgUGxhdGZvcm1DQUxh eWVyKiByb290TGF5ZXIgPSBtX3Jvb3RDaGlsZC0+cm9vdExheWVyKCk7CkBAIC0xNzksNyArMTc5 LDcgQEAgTFJFU1VMVCBNZWRpYVBsYXllclByaXZhdGVGdWxsc2NyZWVuV2luZAogICAgICAgICB9 CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV01fUEFJTlQ6Ci0jaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKQorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNFKENB KQogICAgICAgICBpZiAobV9sYXllclRyZWVIb3N0KSB7CiAgICAgICAgICAgICBtX2xheWVyVHJl ZUhvc3QtPnBhaW50KCk7CiAgICAgICAgICAgICA6OlZhbGlkYXRlUmVjdChtX2h3bmQsIDApOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJp dmF0ZUZ1bGxzY3JlZW5XaW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlRnVsbHNjcmVlbldpbmRvdy5oCShy ZXZpc2lvbiAxNTc4MjApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4v TWVkaWFQbGF5ZXJQcml2YXRlRnVsbHNjcmVlbldpbmRvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC0y OSwxMyArMjksMTMgQEAKICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1dp bmRvd3NFeHRyYXMuaD4KIAotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFVTRShDQSkKICNpbmNsdWRlICJDQUNGTGF5 ZXJUcmVlSG9zdENsaWVudC5oIgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpICYmIFVTRShDQSkKIGNsYXNzIENBQ0ZMYXllclRyZWVIb3N0OwogY2xhc3MgUGxhdGZv cm1DQUxheWVyOwogI2VuZGlmCkBAIC01Niw3ICs1Niw3IEBAIHB1YmxpYzoKICAgICAKICAgICBI V05EIGh3bmQoKSBjb25zdCB7IHJldHVybiBtX2h3bmQ7IH0KIAotI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFVTRShD QSkKICAgICBQbGF0Zm9ybUNBTGF5ZXIqIHJvb3RDaGlsZExheWVyKCkgY29uc3QgeyByZXR1cm4g bV9yb290Q2hpbGQuZ2V0KCk7IH0KICAgICB2b2lkIHNldFJvb3RDaGlsZExheWVyKFBhc3NSZWZQ dHI8UGxhdGZvcm1DQUxheWVyPik7CiAjZW5kaWYKQEAgLTY2LDcgKzY2LDcgQEAgcHJpdmF0ZToK ICAgICBMUkVTVUxUIHduZFByb2MoSFdORCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0sIExQQVJBTSk7 CiAKICAgICBNZWRpYVBsYXllclByaXZhdGVGdWxsc2NyZWVuQ2xpZW50KiBtX2NsaWVudDsKLSNp ZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKSAmJiBVU0UoQ0EpCiAgICAgUmVmUHRyPENBQ0ZMYXllclRyZWVIb3N0PiBtX2xheWVy VHJlZUhvc3Q7CiAgICAgUmVmUHRyPFBsYXRmb3JtQ0FMYXllcj4gbV9yb290Q2hpbGQ7CiAjZW5k aWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Nzg3NykKKysrIFNvdXJjZS9XZWJL aXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEzLTEw LTIzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgU2VwYXJhdGVkIFVTRShDQSkgZnJvbSBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpIHRv IHByZXBhcmUgV2luQ2Fpcm8gZm9yIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzMjE0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9X ZWJDaHJvbWVDbGllbnQuaDoKKyAgICAgICAgKFdlYkNocm9tZUNsaWVudDo6ZGVsZWdhdGVkU2Ny b2xsUmVxdWVzdGVkKTogQWRkZWQgZW1wdHkgZnVuY3Rpb24uCisgICAgICAgICogV2ViUHJlZmVy ZW5jZXMuY3BwOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OmFjY2VsZXJhdGVkQ29tcG9zaXRp bmdFbmFibGVkKToKKyAgICAgICAgUmV0dXJuIHRydWUgZm9yIG5vbi1DQSBwb3J0cyB1c2luZyBh Y2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAg KFdlYlZpZXc6On5XZWJWaWV3KToKKyAgICAgICAgKFdlYlZpZXc6OnNpemVDaGFuZ2VkKToKKyAg ICAgICAgKFdlYlZpZXc6OnBhaW50KToKKyAgICAgICAgKFdlYlZpZXc6OnNldFNob3VsZEludmVy dENvbG9ycyk6CisgICAgICAgIChXZWJWaWV3OjpmbHVzaFBlbmRpbmdHcmFwaGljc0xheWVyQ2hh bmdlc1Nvb24pOgorICAgICAgICAoV2ViVmlldzo6c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZyk6 CisgICAgICAgICogV2ViVmlldy5oOgorICAgICAgICBBZGRlZCBVU0UoQ0EpIHdoZXJlIG5lY2Vz c2FyeSB0byBjb21waWxlIFdpbkNhaXJvIHdpdGggYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcuCisK IDIwMTMtMTAtMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAg ICAgICAgQXR0ZW1wdCB0byBmaXggdGhlIFdpbmRvd3MgYnVpbGQgYWZ0ZXIgaHR0cDovL3RyYWMu d2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTU3NTQ3LgpJbmRleDogU291cmNlL1dlYktpdC93aW4vV2Vi UHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYlByZWZl cmVuY2VzLmNwcAkocmV2aXNpb24gMTU3ODIwKQorKysgU291cmNlL1dlYktpdC93aW4vV2ViUHJl ZmVyZW5jZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTQwLDggKzE1NDAsMTIgQEAgSFJFU1VM VCBXZWJQcmVmZXJlbmNlczo6c2V0QWNjZWxlcmF0ZWRDbwogSFJFU1VMVCBXZWJQcmVmZXJlbmNl czo6YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoQk9PTCogZW5hYmxlZCkKIHsKICNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisjaWYgVVNFKENBKQogICAgICplbmFibGVkID0g Q0FDRkxheWVyVHJlZUhvc3Q6OmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdBdmFpbGFibGUoKSAmJiBi b29sVmFsdWVGb3JLZXkoQ0ZTVFIoV2ViS2l0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRQ cmVmZXJlbmNlS2V5KSk7CiAjZWxzZQorICAgICplbmFibGVkID0gVFJVRTsKKyNlbmRpZgorI2Vs c2UKICAgICAqZW5hYmxlZCA9IEZBTFNFOwogI2VuZGlmCiAgICAgcmV0dXJuIFNfT0s7CkluZGV4 OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gMTU3ODIwKQorKysgU291cmNlL1dlYktpdC93 aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Miw3ICsxNjIsNyBAQAogI2luY2x1 ZGUgPFdlYktpdFN5c3RlbUludGVyZmFjZS9XZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4gCiAjZW5k aWYKIAotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpICYmIFVTRShDQSkKICNpbmNsdWRlIDxXZWJDb3JlL0NBQ0ZMYXllclRy ZWVIb3N0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybUNBTGF5ZXIuaD4KICNlbmRpZgpA QCAtNDMyLDcgKzQzMiw5IEBAIFdlYlZpZXc6On5XZWJWaWV3KCkKICAgICBBU1NFUlQoIW1fdmll d1dpbmRvdyk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisjaWYgVVNFKENB KQogICAgIEFTU0VSVCghbV9sYXllclRyZWVIb3N0KTsKKyNlbmRpZgogICAgIEFTU0VSVCghbV9i YWNraW5nTGF5ZXIpOwogI2VuZGlmCiAKQEAgLTkzNiw3ICs5MzgsNyBAQCB2b2lkIFdlYlZpZXc6 OnNpemVDaGFuZ2VkKGNvbnN0IEludFNpemUmCiAgICAgaWYgKEZyYW1lKiBjb3JlRnJhbWUgPSBj b3JlKHRvcExldmVsRnJhbWUoKSkpCiAgICAgICAgIGNvcmVGcmFtZS0+dmlldygpLT5yZXNpemUo bmV3U2l6ZSk7CiAKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKSAmJiBVU0UoQ0EpCiAgICAgaWYgKG1fbGF5ZXJUcmVlSG9z dCkKICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5yZXNpemUoKTsKICAgICBpZiAobV9iYWNraW5n TGF5ZXIpIHsKQEAgLTEwNzMsNyArMTA3NSw3IEBAIHZvaWQgV2ViVmlldzo6cGFpbnQoSERDIGRj LCBMUEFSQU0gb3B0aW8KIHsKICAgICBMT0NBTF9HRElfQ09VTlRFUigwLCBfX0ZVTkNUSU9OX18p OwogCi0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykgJiYgVVNFKENBKQogICAgIGlmIChpc0FjY2VsZXJhdGVkQ29tcG9zaXRp bmcoKSAmJiAhdXNlc0xheWVyZWRXaW5kb3coKSkgewogICAgICAgICBtX2xheWVyVHJlZUhvc3Qt PmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlc05vdygpOwogICAgICAgICAvLyBGbHVzaGluZyBtaWdo dCBoYXZlIHRha2VuIHVzIG91dCBvZiBjb21wb3NpdGluZyBtb2RlLgpAQCAtMjEzOCw3ICsyMTQw LDcgQEAgdm9pZCBXZWJWaWV3OjpzZXRTaG91bGRJbnZlcnRDb2xvcnMoYm9vbAogCiAgICAgbV9z aG91bGRJbnZlcnRDb2xvcnMgPSBzaG91bGRJbnZlcnRDb2xvcnM7CiAKLSNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKSAmJiBV U0UoQ0EpCiAgICAgaWYgKG1fbGF5ZXJUcmVlSG9zdCkKICAgICAgICAgbV9sYXllclRyZWVIb3N0 LT5zZXRTaG91bGRJbnZlcnRDb2xvcnMoc2hvdWxkSW52ZXJ0Q29sb3JzKTsKICNlbmRpZgpAQCAt NjU2NiwxMyArNjU2OCwxNiBAQCB2b2lkIFdlYlZpZXc6OnNldFJvb3RDaGlsZExheWVyKEdyYXBo aWNzCiAKIHZvaWQgV2ViVmlldzo6Zmx1c2hQZW5kaW5nR3JhcGhpY3NMYXllckNoYW5nZXNTb29u KCkKIHsKKyNpZiBVU0UoQ0EpCiAgICAgaWYgKCFtX2xheWVyVHJlZUhvc3QpCiAgICAgICAgIHJl dHVybjsKICAgICBtX2xheWVyVHJlZUhvc3QtPmZsdXNoUGVuZGluZ0dyYXBoaWNzTGF5ZXJDaGFu Z2VzU29vbigpOworI2VuZGlmCiB9CiAKIHZvaWQgV2ViVmlldzo6c2V0QWNjZWxlcmF0ZWRDb21w b3NpdGluZyhib29sIGFjY2VsZXJhdGVkKQogeworI2lmIFVTRShDQSkKICAgICBpZiAobV9pc0Fj Y2VsZXJhdGVkQ29tcG9zaXRpbmcgPT0gYWNjZWxlcmF0ZWQgfHwgIUNBQ0ZMYXllclRyZWVIb3N0 OjphY2NlbGVyYXRlZENvbXBvc2l0aW5nQXZhaWxhYmxlKCkpCiAgICAgICAgIHJldHVybjsKIApA QCAtNjYxMyw2ICs2NjE4LDcgQEAgdm9pZCBXZWJWaWV3OjpzZXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKAogICAgICAgICBtX2JhY2tpbmdMYXllciA9IG51bGxwdHI7CiAgICAgICAgIG1faXNBY2Nl bGVyYXRlZENvbXBvc2l0aW5nID0gZmFsc2U7CiAgICAgfQorI2VuZGlmCiB9CiAjZW5kaWYKIApJ bmRleDogU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvd2luL1dlYlZpZXcuaAkocmV2aXNpb24gMTU3ODIwKQorKysgU291cmNlL1dlYktpdC93 aW4vV2ViVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw3IEBACiAjZW5kaWYKIAog bmFtZXNwYWNlIFdlYkNvcmUgewotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyNp ZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFVTRShDQSkKICAgICBjbGFzcyBDQUNG TGF5ZXJUcmVlSG9zdDsKICNlbmRpZgogICAgIGNsYXNzIEZ1bGxTY3JlZW5Db250cm9sbGVyOwpA QCAtMTE1NSw4ICsxMTU1LDkgQEAgcHJvdGVjdGVkOgogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKICAgICBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0IHsgcmV0 dXJuIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nOyB9CiAgICAgdm9pZCBzZXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nKGJvb2wpOwotCisjaWYgVVNFKENBKQogICAgIFJlZlB0cjxXZWJDb3JlOjpD QUNGTGF5ZXJUcmVlSG9zdD4gbV9sYXllclRyZWVIb3N0OworI2VuZGlmCiAgICAgc3RkOjp1bmlx dWVfcHRyPFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI+IG1fYmFja2luZ0xheWVyOwogICAgIGJvb2wg bV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmc7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQv d2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCShyZXZpc2lvbiAx NTc4MjApCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDYgKzE0MSwxMCBAQCBwdWJsaWM6CiAgICAgICAg IHZpcnR1YWwgdm9pZCBzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJGbHVzaCgpOwogI2VuZGlmCiAK KyNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKKyAgICB2aXJ0dWFsIHZvaWQgZGVsZWdhdGVk U2Nyb2xsUmVxdWVzdGVkKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JikgeyB9CisjZW5kaWYKKwog I2lmIFBMQVRGT1JNKFdJTikgJiYgVVNFKEFWRk9VTkRBVElPTikKICAgICB2aXJ0dWFsIFdlYkNv cmU6OkdyYXBoaWNzRGV2aWNlQWRhcHRlciogZ3JhcGhpY3NEZXZpY2VBZGFwdGVyKCkgY29uc3Qg T1ZFUlJJREU7CiAjZW5kaWYK