52020 2011-01-06 14:44:59 -0800 Member variables do not begin with m_ in QPageClientWidgetQt and QPageClientGraphicsWidgetQt 2011-01-07 09:24:44 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED INVALID P2 Trivial --- 49184 1 carol carol oldest_to_newest 330439 0 carol 2011-01-06 14:44:59 -0800 Naming a member variable "view" is not correct according to the WebKit style guidelines. Furthermore makes it difficult to distinguish such a member from an argument named "view". 330487 1 78176 carol 2011-01-06 15:26:49 -0800 Created attachment 78176 Proposed Patch 330722 2 78176 kling 2011-01-07 03:58:24 -0800 Comment on attachment 78176 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78176&action=review The general rule is that public member variables don't have an "m_" prefix. You could make them private and add setters/getters as needed. > WebKit/qt/WebCoreSupport/PageClientQt.h:58 > - : view(newView) > - , page(newPage) > + : m_view(newView) > + , m_page(newPage) > #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) > , syncTimer(this, &PageClientQWidget::syncLayers) > , platformLayerProxy(0) > #endif Looks like you missed 'syncTimer' and 'platformLayerProxy'. 78176 2011-01-06 15:26:49 -0800 2011-01-07 03:58:24 -0800 Proposed Patch patchFor52020.patch text/plain 16810 carol ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAKaW5kZXggNDgzYzhiNi4uMzQ0Zjg1MiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTIw MTcsNyArMjAxNyw3IEBAIHZvaWQgUVdlYlBhZ2U6OnNldFZpZXcoUVdpZGdldCogdmlldykKIAog ICAgIGlmIChkLT5jbGllbnQpIHsKICAgICAgICAgaWYgKGQtPmNsaWVudC0+aXNRV2lkZ2V0Q2xp ZW50KCkpCi0gICAgICAgICAgICBzdGF0aWNfY2FzdDxQYWdlQ2xpZW50UVdpZGdldCo+KGQtPmNs aWVudC5nZXQoKSktPnZpZXcgPSB2aWV3OworICAgICAgICAgICAgc3RhdGljX2Nhc3Q8UGFnZUNs aWVudFFXaWRnZXQqPihkLT5jbGllbnQuZ2V0KCkpLT5tX3ZpZXcgPSB2aWV3OwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0 L3F0L0NoYW5nZUxvZwppbmRleCAxYzEzM2FiLi5lMWFmNjRmIDEwMDY0NAotLS0gYS9XZWJLaXQv cXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSw2MiBAQAor MjAxMS0wMS0wNiAgQ2Fyb2wgU3phYm8gIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlZCBtZW1iZXIg dmFyaWFibGVzOgorICAgICAgICAgICAgUGFnZUNsaWVudFdpZGdldFF0OjpwYWdlLAorICAgICAg ICAgICAgUGFnZUNsaWVudFdpZGdldFF0Ojp2aWV3LAorICAgICAgICAgICAgUGFnZUNsaWVudEdy YXBoaWNzV2lkZ2V0UXQ6OnBhZ2UsCisgICAgICAgICAgICBQYWdlQ2xpZW50R3JhcGhpY3NXaWRn ZXRRdDo6dmlldworICAgICAgICB0byBtYXRjaCBzdHlsZSByZXF1aXJlbWVudHMgKG1fKikuCisK KyAgICAgICAgTWVtYmVyIHZhcmlhYmxlcyBkbyBub3QgYmVnaW4gd2l0aCBtXyBpbiBRUGFnZUNs aWVudFdpZGdldFF0IGFuZAorICAgICAgICBRUGFnZUNsaWVudEdyYXBoaWNzV2lkZ2V0UXQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMDIwCisKKyAg ICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OnNldFZpZXcpOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQYWdlQ2xpZW50UVdpZGdldDo6c2V0Um9vdEdyYXBoaWNzTGF5ZXIpOgorICAgICAgICAo V2ViQ29yZTo6UGFnZUNsaWVudFFXaWRnZXQ6OnN5bmNMYXllcnMpOgorICAgICAgICAoV2ViQ29y ZTo6UGFnZUNsaWVudFFXaWRnZXQ6OnNjcm9sbCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xp ZW50UVdpZGdldDo6dXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRV2lkZ2V0 OjpzZXRJbnB1dE1ldGhvZEVuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFX aWRnZXQ6OmlucHV0TWV0aG9kRW5hYmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50 UVdpZGdldDo6c2V0SW5wdXRNZXRob2RIaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xp ZW50UVdpZGdldDo6Y3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRV2lkZ2V0 Ojp1cGRhdGVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFXaWRnZXQ6OnBh bGV0dGUpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFXaWRnZXQ6OnNjcmVlbk51bWJl cik6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UVdpZGdldDo6b3duZXJXaWRnZXQpOgor ICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFXaWRnZXQ6Omdlb21ldHJ5UmVsYXRpdmVUb093 bmVyV2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRV2lkZ2V0OjpwbHVnaW5Q YXJlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFXaWRnZXQ6OnN0eWxlKToKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRV2lkZ2V0Ojp3aW5kb3dSZWN0KToKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6On5QYWdlQ2xpZW50UUdyYXBoaWNz V2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6OnNj cm9sbCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0Ojp1cGRh dGUpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6Y3JlYXRl T3JEZWxldGVPdmVybGF5KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NX aWRnZXQ6OnN5bmNMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFHcmFwaGlj c1dpZGdldDo6c2V0Um9vdEdyYXBoaWNzTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNs aWVudFFHcmFwaGljc1dpZGdldDo6bWFya0ZvclN5bmMpOgorICAgICAgICAoV2ViQ29yZTo6UGFn ZUNsaWVudFFHcmFwaGljc1dpZGdldDo6dXBkYXRlVGlsZWRCYWNraW5nU3RvcmVTY2FsZSk6Cisg ICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpzZXRJbnB1dE1ldGhv ZEVuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6 aW5wdXRNZXRob2RFbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhp Y3NXaWRnZXQ6OnNldElucHV0TWV0aG9kSGludHMpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNs aWVudFFHcmFwaGljc1dpZGdldDo6Y3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGll bnRRR3JhcGhpY3NXaWRnZXQ6OnVwZGF0ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpQYWdl Q2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpwYWxldHRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VD bGllbnRRR3JhcGhpY3NXaWRnZXQ6OnNjcmVlbk51bWJlcik6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0Ojpvd25lcldpZGdldCk6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpnZW9tZXRyeVJlbGF0aXZlVG9Pd25lcldpZGdl dCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpncmFwaGlj c0l0ZW1WaXNpYmxlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNz V2lkZ2V0OjpwbHVnaW5QYXJlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFHcmFw aGljc1dpZGdldDo6c3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFHcmFwaGlj c1dpZGdldDo6d2luZG93UmVjdCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVu dFF0Lmg6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UVdpZGdldDo6UGFnZUNsaWVudFFX aWRnZXQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6UGFn ZUNsaWVudFFHcmFwaGljc1dpZGdldCk6CisKIDIwMTEtMDEtMDYgIFJvYmVydCBIb2dhbiAgPHJv YmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCmRp ZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcCBiL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCmluZGV4IDlmYTViZjcuLjcz MTZlNDcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQu Y3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCkBAIC0x NTQsNyArMTU0LDcgQEAgcHJpdmF0ZToKIHZvaWQgUGFnZUNsaWVudFFXaWRnZXQ6OnNldFJvb3RH cmFwaGljc0xheWVyKFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyKiBsYXllcikKIHsKICAgICBp ZiAobGF5ZXIpIHsKLSAgICAgICAgcGxhdGZvcm1MYXllclByb3h5ID0gbmV3IFBsYXRmb3JtTGF5 ZXJQcm94eVFXaWRnZXQocGFnZS0+bWFpbkZyYW1lKCksIHN0YXRpY19jYXN0PFRleHR1cmVNYXBw ZXJDb250ZW50TGF5ZXIqPihsYXllciksIHZpZXcpOworICAgICAgICBwbGF0Zm9ybUxheWVyUHJv eHkgPSBuZXcgUGxhdGZvcm1MYXllclByb3h5UVdpZGdldChtX3BhZ2UtPm1haW5GcmFtZSgpLCBz dGF0aWNfY2FzdDxUZXh0dXJlTWFwcGVyQ29udGVudExheWVyKj4obGF5ZXIpLCBtX3ZpZXcpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGRlbGV0ZSBwbGF0Zm9ybUxheWVyUHJveHk7CkBA IC0xNjgsMzMgKzE2OCwzMyBAQCB2b2lkIFBhZ2VDbGllbnRRV2lkZ2V0OjptYXJrRm9yU3luYyhi b29sIHNjaGVkdWxlU3luYykKIAogdm9pZCBQYWdlQ2xpZW50UVdpZGdldDo6c3luY0xheWVycyhU aW1lcjxQYWdlQ2xpZW50UVdpZGdldD4qKQogewotICAgIFFXZWJGcmFtZVByaXZhdGU6OmNvcmUo cGFnZS0+bWFpbkZyYW1lKCkpLT52aWV3KCktPnN5bmNDb21wb3NpdGluZ1N0YXRlUmVjdXJzaXZl KCk7CisgICAgUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShtX3BhZ2UtPm1haW5GcmFtZSgpKS0+dmll dygpLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZVJlY3Vyc2l2ZSgpOwogfQogI2VuZGlmCiAKIHZvaWQg UGFnZUNsaWVudFFXaWRnZXQ6OnNjcm9sbChpbnQgZHgsIGludCBkeSwgY29uc3QgUVJlY3QmIHJl Y3RUb1Njcm9sbCkKIHsKLSAgICB2aWV3LT5zY3JvbGwocXJlYWwoZHgpLCBxcmVhbChkeSksIHJl Y3RUb1Njcm9sbCk7CisgICAgbV92aWV3LT5zY3JvbGwocXJlYWwoZHgpLCBxcmVhbChkeSksIHJl Y3RUb1Njcm9sbCk7CiB9CiAKIHZvaWQgUGFnZUNsaWVudFFXaWRnZXQ6OnVwZGF0ZShjb25zdCBR UmVjdCAmIGRpcnR5UmVjdCkKIHsKLSAgICB2aWV3LT51cGRhdGUoZGlydHlSZWN0KTsKKyAgICBt X3ZpZXctPnVwZGF0ZShkaXJ0eVJlY3QpOwogfQogCiB2b2lkIFBhZ2VDbGllbnRRV2lkZ2V0Ojpz ZXRJbnB1dE1ldGhvZEVuYWJsZWQoYm9vbCBlbmFibGUpCiB7Ci0gICAgdmlldy0+c2V0QXR0cmli dXRlKFF0OjpXQV9JbnB1dE1ldGhvZEVuYWJsZWQsIGVuYWJsZSk7CisgICAgbV92aWV3LT5zZXRB dHRyaWJ1dGUoUXQ6OldBX0lucHV0TWV0aG9kRW5hYmxlZCwgZW5hYmxlKTsKIH0KIAogYm9vbCBQ YWdlQ2xpZW50UVdpZGdldDo6aW5wdXRNZXRob2RFbmFibGVkKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gdmlldy0+dGVzdEF0dHJpYnV0ZShRdDo6V0FfSW5wdXRNZXRob2RFbmFibGVkKTsKKyAgICBy ZXR1cm4gbV92aWV3LT50ZXN0QXR0cmlidXRlKFF0OjpXQV9JbnB1dE1ldGhvZEVuYWJsZWQpOwog fQogCiB2b2lkIFBhZ2VDbGllbnRRV2lkZ2V0OjpzZXRJbnB1dE1ldGhvZEhpbnRzKFF0OjpJbnB1 dE1ldGhvZEhpbnRzIGhpbnRzKQogewotICAgIHZpZXctPnNldElucHV0TWV0aG9kSGludHMoaGlu dHMpOworICAgIG1fdmlldy0+c2V0SW5wdXRNZXRob2RIaW50cyhoaW50cyk7CiB9CiAKIFBhZ2VD bGllbnRRV2lkZ2V0Ojp+UGFnZUNsaWVudFFXaWRnZXQoKQpAQCAtMjA3LDUxICsyMDcsNTEgQEAg UGFnZUNsaWVudFFXaWRnZXQ6On5QYWdlQ2xpZW50UVdpZGdldCgpCiAjaWZuZGVmIFFUX05PX0NV UlNPUgogUUN1cnNvciBQYWdlQ2xpZW50UVdpZGdldDo6Y3Vyc29yKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gdmlldy0+Y3Vyc29yKCk7CisgICAgcmV0dXJuIG1fdmlldy0+Y3Vyc29yKCk7CiB9CiAK IHZvaWQgUGFnZUNsaWVudFFXaWRnZXQ6OnVwZGF0ZUN1cnNvcihjb25zdCBRQ3Vyc29yJiBjdXJz b3IpCiB7Ci0gICAgdmlldy0+c2V0Q3Vyc29yKGN1cnNvcik7CisgICAgbV92aWV3LT5zZXRDdXJz b3IoY3Vyc29yKTsKIH0KICNlbmRpZgogCiBRUGFsZXR0ZSBQYWdlQ2xpZW50UVdpZGdldDo6cGFs ZXR0ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHZpZXctPnBhbGV0dGUoKTsKKyAgICByZXR1cm4g bV92aWV3LT5wYWxldHRlKCk7CiB9CiAKIGludCBQYWdlQ2xpZW50UVdpZGdldDo6c2NyZWVuTnVt YmVyKCkgY29uc3QKIHsKICNpZiBkZWZpbmVkKFFfV1NfWDExKQotICAgIHJldHVybiB2aWV3LT54 MTFJbmZvKCkuc2NyZWVuKCk7CisgICAgcmV0dXJuIG1fdmlldy0+eDExSW5mbygpLnNjcmVlbigp OwogI2VuZGlmCiAgICAgcmV0dXJuIDA7CiB9CiAKIFFXaWRnZXQqIFBhZ2VDbGllbnRRV2lkZ2V0 Ojpvd25lcldpZGdldCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHZpZXc7CisgICAgcmV0dXJuIG1f dmlldzsKIH0KIAogUVJlY3QgUGFnZUNsaWVudFFXaWRnZXQ6Omdlb21ldHJ5UmVsYXRpdmVUb093 bmVyV2lkZ2V0KCkgY29uc3QKIHsKLSAgICByZXR1cm4gdmlldy0+Z2VvbWV0cnkoKTsKKyAgICBy ZXR1cm4gbV92aWV3LT5nZW9tZXRyeSgpOwogfQogCiBRT2JqZWN0KiBQYWdlQ2xpZW50UVdpZGdl dDo6cGx1Z2luUGFyZW50KCkgY29uc3QKIHsKLSAgICByZXR1cm4gdmlldzsKKyAgICByZXR1cm4g bV92aWV3OwogfQogCiBRU3R5bGUqIFBhZ2VDbGllbnRRV2lkZ2V0OjpzdHlsZSgpIGNvbnN0CiB7 Ci0gICAgcmV0dXJuIHZpZXctPnN0eWxlKCk7CisgICAgcmV0dXJuIG1fdmlldy0+c3R5bGUoKTsK IH0KIAogUVJlY3RGIFBhZ2VDbGllbnRRV2lkZ2V0Ojp3aW5kb3dSZWN0KCkgY29uc3QKIHsKLSAg ICByZXR1cm4gUVJlY3RGKHZpZXctPndpbmRvdygpLT5nZW9tZXRyeSgpKTsKKyAgICByZXR1cm4g UVJlY3RGKG1fdmlldy0+d2luZG93KCktPmdlb21ldHJ5KCkpOwogfQogCiBQYWdlQ2xpZW50UUdy YXBoaWNzV2lkZ2V0Ojp+UGFnZUNsaWVudFFHcmFwaGljc1dpZGdldCgpCkBAIC0yNjUsMTkgKzI2 NSwxOSBAQCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0Ojp+UGFnZUNsaWVudFFHcmFwaGljc1dp ZGdldCgpCiAgICAgICAgIHJldHVybjsKICAgICAvLyB3ZSBkb24ndCBuZWVkIHRvIGRlbGV0ZSB0 aGUgcm9vdCBncmFwaGljcyBsYXllci4gVGhlIGxpZmVjeWNsZSBpcyBtYW5hZ2VkIGluIEdyYXBo aWNzTGF5ZXJRdC5jcHAuCiAgICAgcm9vdEdyYXBoaWNzTGF5ZXIuZGF0YSgpLT5zZXRQYXJlbnRJ dGVtKDApOwotICAgIHZpZXctPnNjZW5lKCktPnJlbW92ZUl0ZW0ocm9vdEdyYXBoaWNzTGF5ZXIu ZGF0YSgpKTsKKyAgICBtX3ZpZXctPnNjZW5lKCktPnJlbW92ZUl0ZW0ocm9vdEdyYXBoaWNzTGF5 ZXIuZGF0YSgpKTsKICNlbmRpZgogI2VuZGlmCiB9CiAKIHZvaWQgUGFnZUNsaWVudFFHcmFwaGlj c1dpZGdldDo6c2Nyb2xsKGludCBkeCwgaW50IGR5LCBjb25zdCBRUmVjdCYgcmVjdFRvU2Nyb2xs KQogewotICAgIHZpZXctPnNjcm9sbChxcmVhbChkeCksIHFyZWFsKGR5KSwgcmVjdFRvU2Nyb2xs KTsKKyAgICBtX3ZpZXctPnNjcm9sbChxcmVhbChkeCksIHFyZWFsKGR5KSwgcmVjdFRvU2Nyb2xs KTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0Ojp1cGRhdGUoY29uc3QgUVJl Y3QmIGRpcnR5UmVjdCkKIHsKLSAgICB2aWV3LT51cGRhdGUoZGlydHlSZWN0KTsKKyAgICBtX3Zp ZXctPnVwZGF0ZShkaXJ0eVJlY3QpOwogCiAgICAgY3JlYXRlT3JEZWxldGVPdmVybGF5KCk7CiAg ICAgaWYgKG92ZXJsYXkpCkBAIC0yOTcsMTQgKzI5NywxNCBAQCB2b2lkIFBhZ2VDbGllbnRRR3Jh cGhpY3NXaWRnZXQ6OmNyZWF0ZU9yRGVsZXRlT3ZlcmxheSgpCiAgICAgICAgIHVzZU92ZXJsYXkg PSB1c2VPdmVybGF5IHx8IHJvb3RHcmFwaGljc0xheWVyOwogI2VuZGlmCiAjaWYgRU5BQkxFKFRJ TEVEX0JBQ0tJTkdfU1RPUkUpCi0gICAgICAgIHVzZU92ZXJsYXkgPSB1c2VPdmVybGF5IHx8IFFX ZWJGcmFtZVByaXZhdGU6OmNvcmUocGFnZS0+bWFpbkZyYW1lKCkpLT50aWxlZEJhY2tpbmdTdG9y ZSgpOworICAgICAgICB1c2VPdmVybGF5ID0gdXNlT3ZlcmxheSB8fCBRV2ViRnJhbWVQcml2YXRl Ojpjb3JlKG1fcGFnZS0+bWFpbkZyYW1lKCkpLT50aWxlZEJhY2tpbmdTdG9yZSgpOwogI2VuZGlm CiAgICAgfQogICAgIGlmICh1c2VPdmVybGF5ID09ICEhb3ZlcmxheSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgaWYgKHVzZU92ZXJsYXkpIHsKLSAgICAgICAgb3ZlcmxheSA9IG5ldyBRR3JhcGhp Y3NJdGVtT3ZlcmxheSh2aWV3LCBwYWdlKTsKKyAgICAgICAgb3ZlcmxheSA9IG5ldyBRR3JhcGhp Y3NJdGVtT3ZlcmxheShtX3ZpZXcsIG1fcGFnZSk7CiAgICAgICAgIG92ZXJsYXktPnNldFpWYWx1 ZShPdmVybGF5WlZhbHVlKTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBDaGFuZ2luZyB0aGUg b3ZlcmxheSBtaWdodCBiZSBkb25lIGluc2lkZSBwYWludCBldmVudHMuCkBAIC0zMTgsNyArMzE4 LDcgQEAgdm9pZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpjcmVhdGVPckRlbGV0ZU92ZXJs YXkoKQogdm9pZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpzeW5jTGF5ZXJzKCkKIHsKICAg ICBpZiAoc2hvdWxkU3luYykgewotICAgICAgICBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKHBhZ2Ut Pm1haW5GcmFtZSgpKS0+dmlldygpLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZVJlY3Vyc2l2ZSgpOwor ICAgICAgICBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKG1fcGFnZS0+bWFpbkZyYW1lKCkpLT52aWV3 KCktPnN5bmNDb21wb3NpdGluZ1N0YXRlUmVjdXJzaXZlKCk7CiAgICAgICAgIHNob3VsZFN5bmMg PSBmYWxzZTsKICAgICB9CiB9CkBAIC0zMjcsNyArMzI3LDcgQEAgdm9pZCBQYWdlQ2xpZW50UUdy YXBoaWNzV2lkZ2V0OjpzeW5jTGF5ZXJzKCkKIHZvaWQgUGFnZUNsaWVudFFHcmFwaGljc1dpZGdl dDo6c2V0Um9vdEdyYXBoaWNzTGF5ZXIoVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIqIGxheWVy KQogewogICAgIGlmIChsYXllcikgewotICAgICAgICBwbGF0Zm9ybUxheWVyUHJveHkgPSBuZXcg UGxhdGZvcm1MYXllclByb3h5UUdyYXBoaWNzT2JqZWN0KHBhZ2UtPm1haW5GcmFtZSgpLCBzdGF0 aWNfY2FzdDxUZXh0dXJlTWFwcGVyQ29udGVudExheWVyKj4obGF5ZXIpLCB2aWV3KTsKKyAgICAg ICAgcGxhdGZvcm1MYXllclByb3h5ID0gbmV3IFBsYXRmb3JtTGF5ZXJQcm94eVFHcmFwaGljc09i amVjdChtX3BhZ2UtPm1haW5GcmFtZSgpLCBzdGF0aWNfY2FzdDxUZXh0dXJlTWFwcGVyQ29udGVu dExheWVyKj4obGF5ZXIpLCBtX3ZpZXcpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGRl bGV0ZSBwbGF0Zm9ybUxheWVyUHJveHk7CkBAIC0zMzgsMTUgKzMzOCwxNSBAQCB2b2lkIFBhZ2VD bGllbnRRR3JhcGhpY3NXaWRnZXQ6OnNldFJvb3RHcmFwaGljc0xheWVyKFFHcmFwaGljc09iamVj dCogbGF5ZXIpCiB7CiAgICAgaWYgKHJvb3RHcmFwaGljc0xheWVyKSB7CiAgICAgICAgIHJvb3RH cmFwaGljc0xheWVyLmRhdGEoKS0+c2V0UGFyZW50SXRlbSgwKTsKLSAgICAgICAgdmlldy0+c2Nl bmUoKS0+cmVtb3ZlSXRlbShyb290R3JhcGhpY3NMYXllci5kYXRhKCkpOwotICAgICAgICBRV2Vi RnJhbWVQcml2YXRlOjpjb3JlKHBhZ2UtPm1haW5GcmFtZSgpKS0+dmlldygpLT5zeW5jQ29tcG9z aXRpbmdTdGF0ZVJlY3Vyc2l2ZSgpOworICAgICAgICBtX3ZpZXctPnNjZW5lKCktPnJlbW92ZUl0 ZW0ocm9vdEdyYXBoaWNzTGF5ZXIuZGF0YSgpKTsKKyAgICAgICAgUVdlYkZyYW1lUHJpdmF0ZTo6 Y29yZShtX3BhZ2UtPm1haW5GcmFtZSgpKS0+dmlldygpLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZVJl Y3Vyc2l2ZSgpOwogICAgIH0KIAogICAgIHJvb3RHcmFwaGljc0xheWVyID0gbGF5ZXI7CiAKICAg ICBpZiAobGF5ZXIpIHsKICAgICAgICAgbGF5ZXItPnNldEZsYWcoUUdyYXBoaWNzSXRlbTo6SXRl bUNsaXBzQ2hpbGRyZW5Ub1NoYXBlLCB0cnVlKTsKLSAgICAgICAgbGF5ZXItPnNldFBhcmVudEl0 ZW0odmlldyk7CisgICAgICAgIGxheWVyLT5zZXRQYXJlbnRJdGVtKG1fdmlldyk7CiAgICAgICAg IGxheWVyLT5zZXRaVmFsdWUoUm9vdEdyYXBoaWNzTGF5ZXJaVmFsdWUpOwogICAgIH0KICAgICBj cmVhdGVPckRlbGV0ZU92ZXJsYXkoKTsKQEAgLTM1Nyw3ICszNTcsNyBAQCB2b2lkIFBhZ2VDbGll bnRRR3JhcGhpY3NXaWRnZXQ6Om1hcmtGb3JTeW5jKGJvb2wgc2NoZWR1bGVTeW5jKQogewogICAg IHNob3VsZFN5bmMgPSB0cnVlOwogICAgIGlmIChzY2hlZHVsZVN5bmMpCi0gICAgICAgIHN5bmNN ZXRhTWV0aG9kLmludm9rZSh2aWV3LCBRdDo6UXVldWVkQ29ubmVjdGlvbik7CisgICAgICAgIHN5 bmNNZXRhTWV0aG9kLmludm9rZShtX3ZpZXcsIFF0OjpRdWV1ZWRDb25uZWN0aW9uKTsKIH0KIAog I2VuZGlmCkBAIC0zNjUsNDkgKzM2NSw0OSBAQCB2b2lkIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRn ZXQ6Om1hcmtGb3JTeW5jKGJvb2wgc2NoZWR1bGVTeW5jKQogI2lmIEVOQUJMRShUSUxFRF9CQUNL SU5HX1NUT1JFKQogdm9pZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0Ojp1cGRhdGVUaWxlZEJh Y2tpbmdTdG9yZVNjYWxlKCkKIHsKLSAgICBXZWJDb3JlOjpUaWxlZEJhY2tpbmdTdG9yZSogYmFj a2luZ1N0b3JlID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShwYWdlLT5tYWluRnJhbWUoKSktPnRp bGVkQmFja2luZ1N0b3JlKCk7CisgICAgV2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmUqIGJhY2tp bmdTdG9yZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUobV9wYWdlLT5tYWluRnJhbWUoKSktPnRp bGVkQmFja2luZ1N0b3JlKCk7CiAgICAgaWYgKCFiYWNraW5nU3RvcmUpCiAgICAgICAgIHJldHVy bjsKLSAgICBiYWNraW5nU3RvcmUtPnNldENvbnRlbnRzU2NhbGUodmlldy0+c2NhbGUoKSk7Cisg ICAgYmFja2luZ1N0b3JlLT5zZXRDb250ZW50c1NjYWxlKG1fdmlldy0+c2NhbGUoKSk7CiB9CiAj ZW5kaWYKIAogdm9pZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpzZXRJbnB1dE1ldGhvZEVu YWJsZWQoYm9vbCBlbmFibGUpCiB7Ci0gICAgdmlldy0+c2V0RmxhZyhRR3JhcGhpY3NJdGVtOjpJ dGVtQWNjZXB0c0lucHV0TWV0aG9kLCBlbmFibGUpOworICAgIG1fdmlldy0+c2V0RmxhZyhRR3Jh cGhpY3NJdGVtOjpJdGVtQWNjZXB0c0lucHV0TWV0aG9kLCBlbmFibGUpOwogfQogCiBib29sIFBh Z2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6OmlucHV0TWV0aG9kRW5hYmxlZCgpIGNvbnN0CiB7Ci0g ICAgcmV0dXJuIHZpZXctPmZsYWdzKCkgJiBRR3JhcGhpY3NJdGVtOjpJdGVtQWNjZXB0c0lucHV0 TWV0aG9kOworICAgIHJldHVybiBtX3ZpZXctPmZsYWdzKCkgJiBRR3JhcGhpY3NJdGVtOjpJdGVt QWNjZXB0c0lucHV0TWV0aG9kOwogfQogCiB2b2lkIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6 OnNldElucHV0TWV0aG9kSGludHMoUXQ6OklucHV0TWV0aG9kSGludHMgaGludHMpCiB7Ci0gICAg dmlldy0+c2V0SW5wdXRNZXRob2RIaW50cyhoaW50cyk7CisgICAgbV92aWV3LT5zZXRJbnB1dE1l dGhvZEhpbnRzKGhpbnRzKTsKIH0KIAogI2lmbmRlZiBRVF9OT19DVVJTT1IKIFFDdXJzb3IgUGFn ZUNsaWVudFFHcmFwaGljc1dpZGdldDo6Y3Vyc29yKCkgY29uc3QKIHsKLSAgICByZXR1cm4gdmll dy0+Y3Vyc29yKCk7CisgICAgcmV0dXJuIG1fdmlldy0+Y3Vyc29yKCk7CiB9CiAKIHZvaWQgUGFn ZUNsaWVudFFHcmFwaGljc1dpZGdldDo6dXBkYXRlQ3Vyc29yKGNvbnN0IFFDdXJzb3ImIGN1cnNv cikKIHsKLSAgICB2aWV3LT5zZXRDdXJzb3IoY3Vyc29yKTsKKyAgICBtX3ZpZXctPnNldEN1cnNv cihjdXJzb3IpOwogfQogI2VuZGlmCiAKIFFQYWxldHRlIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRn ZXQ6OnBhbGV0dGUoKSBjb25zdAogewotICAgIHJldHVybiB2aWV3LT5wYWxldHRlKCk7CisgICAg cmV0dXJuIG1fdmlldy0+cGFsZXR0ZSgpOwogfQogCiBpbnQgUGFnZUNsaWVudFFHcmFwaGljc1dp ZGdldDo6c2NyZWVuTnVtYmVyKCkgY29uc3QKIHsKICNpZiBkZWZpbmVkKFFfV1NfWDExKQotICAg IGlmIChRR3JhcGhpY3NTY2VuZSogc2NlbmUgPSB2aWV3LT5zY2VuZSgpKSB7CisgICAgaWYgKFFH cmFwaGljc1NjZW5lKiBzY2VuZSA9IG1fdmlldy0+c2NlbmUoKSkgewogICAgICAgICBjb25zdCBR TGlzdDxRR3JhcGhpY3NWaWV3Kj4gdmlld3MgPSBzY2VuZS0+dmlld3MoKTsKIAogICAgICAgICBp ZiAoIXZpZXdzLmlzRW1wdHkoKSkKQEAgLTQyMCw3ICs0MjAsNyBAQCBpbnQgUGFnZUNsaWVudFFH cmFwaGljc1dpZGdldDo6c2NyZWVuTnVtYmVyKCkgY29uc3QKIAogUVdpZGdldCogUGFnZUNsaWVu dFFHcmFwaGljc1dpZGdldDo6b3duZXJXaWRnZXQoKSBjb25zdAogewotICAgIGlmIChRR3JhcGhp Y3NTY2VuZSogc2NlbmUgPSB2aWV3LT5zY2VuZSgpKSB7CisgICAgaWYgKFFHcmFwaGljc1NjZW5l KiBzY2VuZSA9IG1fdmlldy0+c2NlbmUoKSkgewogICAgICAgICBjb25zdCBRTGlzdDxRR3JhcGhp Y3NWaWV3Kj4gdmlld3MgPSBzY2VuZS0+dmlld3MoKTsKICAgICAgICAgcmV0dXJuIHZpZXdzLnZh bHVlKDApOwogICAgIH0KQEAgLTQyOSw1MSArNDI5LDUxIEBAIFFXaWRnZXQqIFBhZ2VDbGllbnRR R3JhcGhpY3NXaWRnZXQ6Om93bmVyV2lkZ2V0KCkgY29uc3QKIAogUVJlY3QgUGFnZUNsaWVudFFH cmFwaGljc1dpZGdldDo6Z2VvbWV0cnlSZWxhdGl2ZVRvT3duZXJXaWRnZXQoKSBjb25zdAogewot ICAgIGlmICghdmlldy0+c2NlbmUoKSkKKyAgICBpZiAoIW1fdmlldy0+c2NlbmUoKSkKICAgICAg ICAgcmV0dXJuIFFSZWN0KCk7CiAKLSAgICBRTGlzdDxRR3JhcGhpY3NWaWV3Kj4gdmlld3MgPSB2 aWV3LT5zY2VuZSgpLT52aWV3cygpOworICAgIFFMaXN0PFFHcmFwaGljc1ZpZXcqPiB2aWV3cyA9 IG1fdmlldy0+c2NlbmUoKS0+dmlld3MoKTsKICAgICBpZiAodmlld3MuaXNFbXB0eSgpKQogICAg ICAgICByZXR1cm4gUVJlY3QoKTsKIAogICAgIFFHcmFwaGljc1ZpZXcqIGdyYXBoaWNzVmlldyA9 IHZpZXdzLmF0KDApOwotICAgIHJldHVybiBncmFwaGljc1ZpZXctPm1hcEZyb21TY2VuZSh2aWV3 LT5ib3VuZGluZ1JlY3QoKSkuYm91bmRpbmdSZWN0KCk7CisgICAgcmV0dXJuIGdyYXBoaWNzVmll dy0+bWFwRnJvbVNjZW5lKG1fdmlldy0+Ym91bmRpbmdSZWN0KCkpLmJvdW5kaW5nUmVjdCgpOwog fQogCiAjaWYgRU5BQkxFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiBRUmVjdEYgUGFnZUNsaWVudFFH cmFwaGljc1dpZGdldDo6Z3JhcGhpY3NJdGVtVmlzaWJsZVJlY3QoKSBjb25zdAogewotICAgIGlm ICghdmlldy0+c2NlbmUoKSkKKyAgICBpZiAoIW1fdmlldy0+c2NlbmUoKSkKICAgICAgICAgcmV0 dXJuIFFSZWN0RigpOwogCi0gICAgUUxpc3Q8UUdyYXBoaWNzVmlldyo+IHZpZXdzID0gdmlldy0+ c2NlbmUoKS0+dmlld3MoKTsKKyAgICBRTGlzdDxRR3JhcGhpY3NWaWV3Kj4gdmlld3MgPSBtX3Zp ZXctPnNjZW5lKCktPnZpZXdzKCk7CiAgICAgaWYgKHZpZXdzLmlzRW1wdHkoKSkKICAgICAgICAg cmV0dXJuIFFSZWN0RigpOwogCiAgICAgUUdyYXBoaWNzVmlldyogZ3JhcGhpY3NWaWV3ID0gdmll d3MuYXQoMCk7CiAgICAgaW50IHhPZmZzZXQgPSBncmFwaGljc1ZpZXctPmhvcml6b250YWxTY3Jv bGxCYXIoKS0+dmFsdWUoKTsKICAgICBpbnQgeU9mZnNldCA9IGdyYXBoaWNzVmlldy0+dmVydGlj YWxTY3JvbGxCYXIoKS0+dmFsdWUoKTsKLSAgICByZXR1cm4gdmlldy0+bWFwUmVjdEZyb21TY2Vu ZShRUmVjdEYoUVBvaW50Rih4T2Zmc2V0LCB5T2Zmc2V0KSwgZ3JhcGhpY3NWaWV3LT52aWV3cG9y dCgpLT5zaXplKCkpKTsKKyAgICByZXR1cm4gbV92aWV3LT5tYXBSZWN0RnJvbVNjZW5lKFFSZWN0 RihRUG9pbnRGKHhPZmZzZXQsIHlPZmZzZXQpLCBncmFwaGljc1ZpZXctPnZpZXdwb3J0KCktPnNp emUoKSkpOwogfQogI2VuZGlmCiAKIFFPYmplY3QqIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6 OnBsdWdpblBhcmVudCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHZpZXc7CisgICAgcmV0dXJuIG1f dmlldzsKIH0KIAogUVN0eWxlKiBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpzdHlsZSgpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIHZpZXctPnN0eWxlKCk7CisgICAgcmV0dXJuIG1fdmlldy0+c3R5 bGUoKTsKIH0KIAogUVJlY3RGIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6OndpbmRvd1JlY3Qo KSBjb25zdAogewotICAgIGlmICghdmlldy0+c2NlbmUoKSkKKyAgICBpZiAoIW1fdmlldy0+c2Nl bmUoKSkKICAgICAgICAgcmV0dXJuIFFSZWN0RigpOwogCiAgICAgLy8gVGhlIHNjZW5lUmVjdCBp cyBhIGdvb2QgYXBwcm94aW1hdGlvbiBvZiB0aGUgc2l6ZSBvZiB0aGUgYXBwbGljYXRpb24sIGlu ZGVwZW5kZW50IG9mIHRoZSB2aWV3LgotICAgIHJldHVybiB2aWV3LT5zY2VuZSgpLT5zY2VuZVJl Y3QoKTsKKyAgICByZXR1cm4gbV92aWV3LT5zY2VuZSgpLT5zY2VuZVJlY3QoKTsKIH0KIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L1BhZ2VDbGllbnRRdC5oIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5o CmluZGV4IDY3NDVjZGMuLmFlZTg5MDQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9QYWdlQ2xpZW50UXQuaAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNs aWVudFF0LmgKQEAgLTUwLDE0ICs1MCwxNCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBQ YWdlQ2xpZW50UVdpZGdldCA6IHB1YmxpYyBRV2ViUGFnZUNsaWVudCB7CiBwdWJsaWM6CiAgICAg UGFnZUNsaWVudFFXaWRnZXQoUVdpZGdldCogbmV3VmlldywgUVdlYlBhZ2UqIG5ld1BhZ2UpCi0g ICAgICAgIDogdmlldyhuZXdWaWV3KQotICAgICAgICAsIHBhZ2UobmV3UGFnZSkKKyAgICAgICAg OiBtX3ZpZXcobmV3VmlldykKKyAgICAgICAgLCBtX3BhZ2UobmV3UGFnZSkKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFVTRShURVhUVVJFX01BUFBFUikKICAgICAgICAgLCBz eW5jVGltZXIodGhpcywgJlBhZ2VDbGllbnRRV2lkZ2V0OjpzeW5jTGF5ZXJzKQogICAgICAgICAs IHBsYXRmb3JtTGF5ZXJQcm94eSgwKQogI2VuZGlmCiAgICAgewotICAgICAgICBRX0FTU0VSVCh2 aWV3KTsKKyAgICAgICAgUV9BU1NFUlQobV92aWV3KTsKICAgICB9CiAgICAgdmlydHVhbCB+UGFn ZUNsaWVudFFXaWRnZXQoKTsKIApAQCAtODcsOCArODcsOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0 dWFsIFFSZWN0RiB3aW5kb3dSZWN0KCkgY29uc3Q7CiAKLSAgICBRV2lkZ2V0KiB2aWV3OwotICAg IFFXZWJQYWdlKiBwYWdlOworICAgIFFXaWRnZXQqIG1fdmlldzsKKyAgICBRV2ViUGFnZSogbV9w YWdlOwogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKSAmJiBVU0UoVEVYVFVSRV9N QVBQRVIpCiAgICAgdmlydHVhbCB2b2lkIHNldFJvb3RHcmFwaGljc0xheWVyKFRleHR1cmVNYXBw ZXJQbGF0Zm9ybUxheWVyKiBsYXllcik7CkBAIC0xNDUsOCArMTQ1LDggQEAgY2xhc3MgUUdyYXBo aWNzSXRlbU92ZXJsYXkgOiBwdWJsaWMgUUdyYXBoaWNzT2JqZWN0IHsKIGNsYXNzIFBhZ2VDbGll bnRRR3JhcGhpY3NXaWRnZXQgOiBwdWJsaWMgUVdlYlBhZ2VDbGllbnQgewogcHVibGljOgogICAg IFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQoUUdyYXBoaWNzV2ViVmlldyogbmV3VmlldywgUVdl YlBhZ2UqIG5ld1BhZ2UpCi0gICAgICAgIDogdmlldyhuZXdWaWV3KQotICAgICAgICAsIHBhZ2Uo bmV3UGFnZSkKKyAgICAgICAgOiBtX3ZpZXcobmV3VmlldykKKyAgICAgICAgLCBtX3BhZ2UobmV3 UGFnZSkKICAgICAgICAgLCB2aWV3UmVzaXplc1RvQ29udGVudHMoZmFsc2UpCiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogI2lmIFVTRShURVhUVVJFX01BUFBFUikKQEAgLTE1Niwx MiArMTU2LDEyIEBAIHB1YmxpYzoKICNlbmRpZgogICAgICAgICAsIG92ZXJsYXkoMCkKICAgICB7 Ci0gICAgICAgUV9BU1NFUlQodmlldyk7CisgICAgICAgUV9BU1NFUlQobV92aWV3KTsKICNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgIC8vIHRoZSBvdmVybGF5IGFuZCBz dGF5cyBhbGl2ZSBmb3IgdGhlIGxpZmV0aW1lIG9mCiAgICAgICAgIC8vIHRoaXMgUUdyYXBoaWNz V2ViVmlldyBhcyB0aGUgc2Nyb2xsYmFycyBhcmUgbmVlZGVkIHdoZW4gdGhlcmUncyBubyBjb21w b3NpdGluZwotICAgICAgICB2aWV3LT5zZXRGbGFnKFFHcmFwaGljc0l0ZW06Okl0ZW1Vc2VzRXh0 ZW5kZWRTdHlsZU9wdGlvbik7Ci0gICAgICAgIHN5bmNNZXRhTWV0aG9kID0gdmlldy0+bWV0YU9i amVjdCgpLT5tZXRob2Qodmlldy0+bWV0YU9iamVjdCgpLT5pbmRleE9mTWV0aG9kKCJzeW5jTGF5 ZXJzKCkiKSk7CisgICAgICAgIG1fdmlldy0+c2V0RmxhZyhRR3JhcGhpY3NJdGVtOjpJdGVtVXNl c0V4dGVuZGVkU3R5bGVPcHRpb24pOworICAgICAgICBzeW5jTWV0YU1ldGhvZCA9IG1fdmlldy0+ bWV0YU9iamVjdCgpLT5tZXRob2QobV92aWV3LT5tZXRhT2JqZWN0KCktPmluZGV4T2ZNZXRob2Qo InN5bmNMYXllcnMoKSIpKTsKICNlbmRpZgogICAgIH0KIApAQCAtMjA5LDggKzIwOSw4IEBAIHB1 YmxpYzoKIAogICAgIHZpcnR1YWwgUVJlY3RGIHdpbmRvd1JlY3QoKSBjb25zdDsKIAotICAgIFFH cmFwaGljc1dlYlZpZXcqIHZpZXc7Ci0gICAgUVdlYlBhZ2UqIHBhZ2U7CisgICAgUUdyYXBoaWNz V2ViVmlldyogbV92aWV3OworICAgIFFXZWJQYWdlKiBtX3BhZ2U7CiAgICAgYm9vbCB2aWV3UmVz aXplc1RvQ29udGVudHM7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCg==