22053 2008-11-03 12:16:12 -0800 add initial support for the NPDrawingModelCoreAnimation drawing model. 2008-11-24 09:23:11 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Major --- 1 kdecker kdecker oldest_to_newest 97484 0 kdecker 2008-11-03 12:16:12 -0800 This patch adds initial support for the NPDrawingModelCoreAnimation drawing model. * Plugins/WebBaseNetscapePluginView.h: Added _layer ivar. * Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]): ASSERT this is not a plug-in using NPDrawingModelCoreAnimation. (-[WebBaseNetscapePluginView restorePortState:]): Ditto. (-[WebBaseNetscapePluginView sendEvent:isDrawRect:]): Slightly refactored a small block of code which with the PortState. Plug-ins using the NPDrawingModelCoreAnimation drawing model have no PortState. (-[WebBaseNetscapePluginView isNewWindowEqualToOldWindow]): ASSERT this is not a plug-in using NPDrawingModelCoreAnimation (-[WebBaseNetscapePluginView updateAndSetWindow]): Ditto. (-[WebBaseNetscapePluginView setWindowIfNecessary]): Ditto. (-[WebBaseNetscapePluginView start]): If the plug-in is a plug-in using the Core Animation model, request a layer from it. (-[WebBaseNetscapePluginView drawRect:]): Return early for NPDrawingModelCoreAnimation plug-ins. (-[WebBaseNetscapePluginView getVariable:value:]): Tell plug-ins running on post-Tiger systems WebKit supports NPDrawingModelCoreAnimation. (-[WebBaseNetscapePluginView setVariable:value:]): Added the new NPDrawingModelCoreAnimation case, which initializes drawingMode. (-[WebBaseNetscapePluginView _viewHasMoved]): Reworded the conditional call to updateAndSetWindow to be specific to CoreGraphics and QuickDraw plug-ins. 97486 1 24862 kdecker 2008-11-03 12:39:50 -0800 Created attachment 24862 patch 97487 2 kdecker 2008-11-03 12:53:53 -0800 Committed revision 38078. 97488 3 kdecker 2008-11-03 12:54:32 -0800 Reviewed by Anders. 99974 4 24862 aroben 2008-11-24 09:23:11 -0800 Comment on attachment 24862 patch Clearing review flag since this was landed. 24862 2008-11-03 12:39:50 -0800 2008-11-24 09:23:11 -0800 patch patch.txt text/plain 10910 kdecker SW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcu aAkocmV2aXNpb24gMzgwNzUpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZU5ldHNjYXBl UGx1Z2luVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC02OCw2ICs2OCw5IEBACiAgICAgCiAgICAg Qk9PTCBfbG9hZE1hbnVhbGx5OwogICAgIFJlZlB0cjxXZWJOZXRzY2FwZVBsdWdpblN0cmVhbT4g X21hbnVhbFN0cmVhbTsKKyNpZm5kZWYgQlVJTERJTkdfT05fVElHRVIKKyAgICBDQUxheWVyICpf bGF5ZXI7CisjZW5kaWYKICAgICB1bnNpZ25lZCBfZGF0YUxlbmd0aFJlY2VpdmVkOwogICAgIE5T RXJyb3IgKl9lcnJvcjsKICAgICAKSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlTmV0 c2NhcGVQbHVnaW5WaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJC YXNlTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCShyZXZpc2lvbiAzODA3NSkKKysrIFdlYktpdC9tYWMv UGx1Z2lucy9XZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y ODgsNiArMjg4LDcgQEAKIAogLSAoUG9ydFN0YXRlKXNhdmVBbmRTZXROZXdQb3J0U3RhdGVGb3JV cGRhdGU6KEJPT0wpZm9yVXBkYXRlCiB7CisgICAgQVNTRVJUKGRyYXdpbmdNb2RlbCAhPSBOUERy YXdpbmdNb2RlbENvcmVBbmltYXRpb24pOwogICAgIEFTU0VSVChbc2VsZiBjdXJyZW50V2luZG93 XSAhPSBuaWwpOwogCiAjaWZuZGVmIE5QX05PX1FVSUNLRFJBVwpAQCAtNTQ1LDcgKzU0Niw3IEBA CiAKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0KKyAgICAgICAgCiAgICAgICAgIGRl ZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIHBv cnRTdGF0ZSA9IE5VTEw7CkBAIC01NjIsNiArNTYzLDkgQEAKIAogLSAodm9pZClyZXN0b3JlUG9y dFN0YXRlOihQb3J0U3RhdGUpcG9ydFN0YXRlCiB7CisgICAgaWYgKGRyYXdpbmdNb2RlbCA9PSBO UERyYXdpbmdNb2RlbENvcmVBbmltYXRpb24pCisgICAgICAgIHJldHVybjsKKwogICAgIEFTU0VS VChbc2VsZiBjdXJyZW50V2luZG93XSk7CiAgICAgQVNTRVJUKHBvcnRTdGF0ZSk7CiAgICAgCkBA IC01OTcsNyArNjAxLDcgQEAKICAgICAgICAgICAgIEFTU0VSVCgoKFBvcnRTdGF0ZV9DRyAqKXBv cnRTdGF0ZSktPmNvbnRleHQgPT0gblBvcnQuY2dQb3J0LmNvbnRleHQpOwogICAgICAgICAgICAg Q0dDb250ZXh0UmVzdG9yZUdTdGF0ZShuUG9ydC5jZ1BvcnQuY29udGV4dCk7CiAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgICAgICAKKwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTYzNywxNSAr NjQxLDE4IEBACiAgICAgQVNTRVJUKChkcmF3aW5nTW9kZWwgIT0gTlBEcmF3aW5nTW9kZWxDb3Jl R3JhcGhpY3MpIHx8ICFldmVudElzRHJhd1JlY3QgfHwgW05TVmlldyBmb2N1c1ZpZXddID09IHNl bGYpOwogICAgIAogICAgIFBvcnRTdGF0ZSBwb3J0U3RhdGU7Ci0gICAgaWYgKChkcmF3aW5nTW9k ZWwgIT0gTlBEcmF3aW5nTW9kZWxDb3JlR3JhcGhpY3MpIHx8IGV2ZW50SXNEcmF3UmVjdCkgewot ICAgICAgICAvLyBJbiBDb3JlR3JhcGhpY3MgbW9kZSwgdGhlIHBvcnQgc3RhdGUgb25seSBuZWVk cyB0byBiZSBzYXZlZC9zZXQgd2hlbiByZWRyYXdpbmcgdGhlIHBsdWctaW4gdmlldy4gIFRoZSBw bHVnLWluIGlzIG5vdAotICAgICAgICAvLyBhbGxvd2VkIHRvIGRyYXcgYXQgYW55IG90aGVyIHRp bWUuCi0gICAgICAgIHBvcnRTdGF0ZSA9IFtzZWxmIHNhdmVBbmRTZXROZXdQb3J0U3RhdGVGb3JV cGRhdGU6ZXZlbnRJc0RyYXdSZWN0XTsKLSAgICAgICAgCi0gICAgICAgIC8vIFdlIG1heSBoYXZl IGNoYW5nZWQgdGhlIHdpbmRvdywgc28gaW5mb3JtIHRoZSBwbHVnLWluLgotICAgICAgICBbc2Vs ZiBzZXRXaW5kb3dJZk5lY2Vzc2FyeV07Ci0gICAgfSBlbHNlCisgICAgCisgICAgaWYgKGRyYXdp bmdNb2RlbCA9PSBOUERyYXdpbmdNb2RlbENvcmVBbmltYXRpb24pIHsKICAgICAgICAgcG9ydFN0 YXRlID0gTlVMTDsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAoKGRyYXdpbmdNb2RlbCA9PSBO UERyYXdpbmdNb2RlbFF1aWNrRHJhdykgfHwgZXZlbnRJc0RyYXdSZWN0KSB7CisgICAgICAgICAg ICAvLyBJbiBDb3JlR3JhcGhpY3MgbW9kZSwgdGhlIHBvcnQgc3RhdGUgb25seSBuZWVkcyB0byBi ZSBzYXZlZC9zZXQgd2hlbiByZWRyYXdpbmcgdGhlIHBsdWctaW4gdmlldy4KKyAgICAgICAgICAg IC8vIFRoZSBwbHVnLWluIGlzIG5vdCBhbGxvd2VkIHRvIGRyYXcgYXQgYW55IG90aGVyIHRpbWUu CisgICAgICAgICAgICBwb3J0U3RhdGUgPSBbc2VsZiBzYXZlQW5kU2V0TmV3UG9ydFN0YXRlRm9y VXBkYXRlOmV2ZW50SXNEcmF3UmVjdF07CisgICAgICAgICAgICAvLyBXZSBtYXkgaGF2ZSBjaGFu Z2VkIHRoZSB3aW5kb3csIHNvIGluZm9ybSB0aGUgcGx1Zy1pbi4KKyAgICAgICAgICAgIFtzZWxm IHNldFdpbmRvd0lmTmVjZXNzYXJ5XTsKKyAgICAgICAgfQorICAgIH0KICAgICAKICNpZiAhZGVm aW5lZChOREVCVUcpICYmICFkZWZpbmVkKE5QX05PX1FVSUNLRFJBVykKICAgICAvLyBEcmF3IGdy ZWVuIHRvIGhlbHAgZGVidWcuCkBAIC05MTIsNiArOTE5LDggQEAKIAogLSAoQk9PTClpc05ld1dp bmRvd0VxdWFsVG9PbGRXaW5kb3cKIHsKKyAgICBBU1NFUlQoZHJhd2luZ01vZGVsICE9IE5QRHJh d2luZ01vZGVsQ29yZUFuaW1hdGlvbik7CisgICAgICAgIAogICAgIGlmICh3aW5kb3cueCAhPSBs YXN0U2V0V2luZG93LngpCiAgICAgICAgIHJldHVybiBOTzsKICAgICBpZiAod2luZG93LnkgIT0g bGFzdFNldFdpbmRvdy55KQpAQCAtOTYwLDYgKzk2OSw4IEBACiAKIC0gKHZvaWQpdXBkYXRlQW5k U2V0V2luZG93CiB7CisgICAgQVNTRVJUKGRyYXdpbmdNb2RlbCAhPSBOUERyYXdpbmdNb2RlbENv cmVBbmltYXRpb24pOworCiAgICAgLy8gQSBwbHVnLWluIGNhbiBvbmx5IHVwZGF0ZSBpZiBpdCdz ICgxKSBhbHJlYWR5IGJlZW4gc3RhcnRlZCAoMikgaXNuJ3Qgc3RvcHBlZAogICAgIC8vIGFuZCAo MykgaXMgYWJsZSB0byBkcmF3IG9uLXNjcmVlbi4gVG8gbWVldCBjb25kaXRpb24gKDMpIHRoZSBw bHVnLWluIG11c3Qgbm90CiAgICAgLy8gYmUgaGlkZGVuIGFuZCBiZSBhdHRhY2hlZCB0byBhIHdp bmRvdy4gUXVpY2tEcmF3IHBsdWctaW5zIGFyZSBhbiBpbXBvcnRhbnQKQEAgLTk3Nyw2ICs5ODgs MTUgQEAKICNlbmRpZiAvLyBOUF9OT19RVUlDS0RSQVcKICAgICAKICAgICBCT09MIGRpZExvY2tG b2N1cyA9IFtOU1ZpZXcgZm9jdXNWaWV3XSAhPSBzZWxmICYmIFtzZWxmIGxvY2tGb2N1c0lmQ2Fu RHJhd107CisgICAgCisgICAgaWYgKGRyYXdpbmdNb2RlbCA9PSBOUERyYXdpbmdNb2RlbENvcmVH cmFwaGljcyB8fCBkcmF3aW5nTW9kZWwgPT0gTlBEcmF3aW5nTW9kZWxRdWlja0RyYXcpIHsKKyAg ICAgICAgW3NlbGYgc2V0V2luZG93SWZOZWNlc3NhcnldOworICAgICAgICBpZiAoZGlkTG9ja0Zv Y3VzKQorICAgICAgICAgICAgW3NlbGYgdW5sb2NrRm9jdXNdOworCisgICAgICAgIHJldHVybjsK KyAgICB9CisgICAgCiAgICAgUG9ydFN0YXRlIHBvcnRTdGF0ZSA9IFtzZWxmIHNhdmVBbmRTZXRO ZXdQb3J0U3RhdGVdOwogICAgIGlmIChwb3J0U3RhdGUpIHsKICAgICAgICAgW3NlbGYgc2V0V2lu ZG93SWZOZWNlc3NhcnldOwpAQCAtOTg5LDYgKzEwMDksOCBAQAogCiAtICh2b2lkKXNldFdpbmRv d0lmTmVjZXNzYXJ5CiB7CisgICAgQVNTRVJUKGRyYXdpbmdNb2RlbCAhPSBOUERyYXdpbmdNb2Rl bENvcmVBbmltYXRpb24pOworICAgICAgICAgICAKICAgICBpZiAoIWlzU3RhcnRlZCkgewogICAg ICAgICByZXR1cm47CiAgICAgfQpAQCAtMTAyNyw3ICsxMDQ5LDcgQEAKICAgICAgICAgICAgICAg ICBMT0coUGx1Z2lucywgIk5QUF9TZXRXaW5kb3cgKENvcmVHcmFwaGljcyk6ICVkLCB3aW5kb3c9 JXAsIGNvbnRleHQ9JXAsIHdpbmRvdy54OiVkIHdpbmRvdy55OiVkIHdpbmRvdy53aWR0aDolZCB3 aW5kb3cuaGVpZ2h0OiVkIiwKICAgICAgICAgICAgICAgICBucEVyciwgblBvcnQuY2dQb3J0Lndp bmRvdywgblBvcnQuY2dQb3J0LmNvbnRleHQsIChpbnQpd2luZG93LngsIChpbnQpd2luZG93Lnks IChpbnQpd2luZG93LndpZHRoLCAoaW50KXdpbmRvdy5oZWlnaHQpOwogICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg ZGVmYXVsdDoKICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAg ICAgIGJyZWFrOwpAQCAtMTE5Niw2ICsxMjE4LDIwIEBACiAgICAgfSAgICAgICAgCiAjZW5kaWYg Ly8gTlBfTk9fQ0FSQk9OCiAgICAgCisjaWZuZGVmIEJVSUxESU5HX09OX1RJR0VSCisgICAgaWYg KGRyYXdpbmdNb2RlbCA9PSBOUERyYXdpbmdNb2RlbENvcmVBbmltYXRpb24pIHsKKyAgICAgICAg dm9pZCAqdmFsdWUgPSAwOworICAgICAgICBpZiAoTlBQX0dldFZhbHVlKHBsdWdpbiwgTlBQVnBs dWdpbkNvcmVBbmltYXRpb25MYXllciwgJnZhbHVlKSA9PSBOUEVSUl9OT19FUlJPUiAmJiB2YWx1 ZSkgeworICAgICAgICAgICAgX2xheWVyID0gKENBTGF5ZXIgKil2YWx1ZTsKKyAgICAgICAgICAg IFtzZWxmIHNldFdhbnRzTGF5ZXI6WUVTXTsKKyAgICAgICAgICAgIFtzZWxmIHNldExheWVyOl9s YXllcl07CisgICAgICAgICAgICBMT0coUGx1Z2lucywgIiVAIGlzIHVzaW5nIENvcmUgQW5pbWF0 aW9uIGRyYXdpbmcgbW9kZWwgd2l0aCBsYXllciAlQCIsIHBsdWdpblBhY2thZ2UsIF9sYXllcik7 CisgICAgICAgIH0KKworICAgICAgICBBU1NFUlQoX2xheWVyKTsKKyAgICB9CisjZW5kaWYKKyAg ICAKICAgICAvLyBDcmVhdGUgdGhlIGV2ZW50IGhhbmRsZXIKICAgICBldmVudEhhbmRsZXIgPSBX ZWJOZXRzY2FwZVBsdWdpbkV2ZW50SGFuZGxlcjo6Y3JlYXRlKHNlbGYpOwogICAgIApAQCAtMTIx NCw3ICsxMjUwLDggQEAKICAgICBpc1N0YXJ0ZWQgPSBZRVM7CiAgICAgW1tzZWxmIHdlYlZpZXdd IGFkZFBsdWdpbkluc3RhbmNlVmlldzpzZWxmXTsKICAgICAgICAgCi0gICAgW3NlbGYgdXBkYXRl QW5kU2V0V2luZG93XTsKKyAgICBpZiAoZHJhd2luZ01vZGVsID09IE5QRHJhd2luZ01vZGVsQ29y ZUdyYXBoaWNzIHx8IGRyYXdpbmdNb2RlbCA9PSBOUERyYXdpbmdNb2RlbFF1aWNrRHJhdykKKyAg ICAgICAgW3NlbGYgdXBkYXRlQW5kU2V0V2luZG93XTsKIAogICAgIGlmIChbc2VsZiB3aW5kb3dd KSB7CiAgICAgICAgIFtzZWxmIGFkZFdpbmRvd09ic2VydmVyc107CkBAIC0xNDM5LDcgKzE0NzYs NiBAQAogICAgICAgICBbc2VsZiBzZXRNb2RlOk5QX0VNQkVEXTsKICAgICAKICAgICBfbG9hZE1h bnVhbGx5ID0gbG9hZE1hbnVhbGx5OwotICAgIAogICAgIHJldHVybiBzZWxmOwogfQogCkBAIC0x NTA5LDYgKzE1NDUsOSBAQAogCiAtICh2b2lkKWRyYXdSZWN0OihOU1JlY3QpcmVjdAogeworICAg IGlmIChkcmF3aW5nTW9kZWwgPT0gTlBEcmF3aW5nTW9kZWxDb3JlQW5pbWF0aW9uKQorICAgICAg ICByZXR1cm47CisKICAgICBpZiAoIWlzU3RhcnRlZCkKICAgICAgICAgcmV0dXJuOwogICAgIApA QCAtMjQ4Niw2ICsyNTI1LDE2IEBACiAgICAgICAgICAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7 CiAgICAgICAgIH0KICAgICAgICAgCisgICAgICAgIGNhc2UgTlBOVnN1cHBvcnRzQ29yZUFuaW1h dGlvbkJvb2w6CisgICAgICAgIHsKKyNpZm5kZWYgQlVJTERJTkdfT05fVElHRVIKKyAgICAgICAg ICAgICooTlBCb29sICopdmFsdWUgPSBUUlVFOworI2Vsc2UKKyAgICAgICAgICAgICooTlBCb29s ICopdmFsdWUgPSBGQUxTRTsKKyNlbmRpZgorICAgICAgICAgICAgcmV0dXJuIE5QRVJSX05PX0VS Uk9SOworICAgICAgICB9CisgICAgICAgICAgICAKICNpZm5kZWYgTlBfTk9fQ0FSQk9OCiAgICAg ICAgIGNhc2UgTlBOVnN1cHBvcnRzQ2FyYm9uQm9vbDoKICAgICAgICAgewpAQCAtMjU1Nyw2ICsy NjA2LDExIEBACiAgICAgICAgICAgICAgICAgY2FzZSBOUERyYXdpbmdNb2RlbENvcmVHcmFwaGlj czoKICAgICAgICAgICAgICAgICAgICAgZHJhd2luZ01vZGVsID0gbmV3RHJhd2luZ01vZGVsOwog ICAgICAgICAgICAgICAgICAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7CisgICAgICAgICAgICAg ICAgICAgIAorICAgICAgICAgICAgICAgIGNhc2UgTlBEcmF3aW5nTW9kZWxDb3JlQW5pbWF0aW9u OgorICAgICAgICAgICAgICAgICAgICBkcmF3aW5nTW9kZWwgPSBuZXdEcmF3aW5nTW9kZWw7Cisg ICAgICAgICAgICAgICAgICAgIHJldHVybiBOUEVSUl9OT19FUlJPUjsKKyAgICAgICAgICAgICAg ICAgICAgCiAKICAgICAgICAgICAgICAgICAvLyBVbnN1cHBvcnRlZCAob3IgdW5rbm93bikgZHJh d2luZyBtb2RlbHM6CiAgICAgICAgICAgICAgICAgZGVmYXVsdDoKQEAgLTI3NDUsNyArMjc5OSw5 IEBACiAgICAgaWYgKGRyYXdpbmdNb2RlbCA9PSBOUERyYXdpbmdNb2RlbFF1aWNrRHJhdykKICAg ICAgICAgW3NlbGYgdGVsbFF1aWNrVGltZVRvQ2hpbGxdOwogI2VuZGlmCi0gICAgW3NlbGYgdXBk YXRlQW5kU2V0V2luZG93XTsKKyAgICBpZiAoZHJhd2luZ01vZGVsID09IE5QRHJhd2luZ01vZGVs Q29yZUdyYXBoaWNzIHx8IGRyYXdpbmdNb2RlbCA9PSBOUERyYXdpbmdNb2RlbFF1aWNrRHJhdykK KyAgICAgICAgW3NlbGYgdXBkYXRlQW5kU2V0V2luZG93XTsKKyAgICAKICAgICBbc2VsZiByZXNl dFRyYWNraW5nUmVjdF07CiAgICAgCiAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHRoZSBwbHVnaW4g dmlldyBpcyBjb21wbGV0ZWx5IG9ic2N1cmVkIChzY3JvbGxlZCBvdXQgb2YgdmlldywgZm9yIGV4 YW1wbGUpLgpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDM4MDc1KQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNiBAQAorMjAwOC0xMS0wMyAgS2V2aW4gRGVja2Vy ICA8a2RlY2tlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGluaXRpYWwgc3VwcG9ydCBmb3IgdGhlIE5Q RHJhd2luZ01vZGVsQ29yZUFuaW1hdGlvbiBkcmF3aW5nIG1vZGVsLiAKKyAgICAgICAgICAgICAg ICAKKyAgICAgICAgKiBQbHVnaW5zL1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcuaDogQWRkZWQg X2xheWVyIGl2YXIuCisgICAgICAgICogUGx1Z2lucy9XZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3 Lm1tOgorICAgICAgICAoLVtXZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3IHNhdmVBbmRTZXROZXdQ b3J0U3RhdGVGb3JVcGRhdGU6XSk6IEFTU0VSVCB0aGlzIGlzIG5vdCBhIHBsdWctaW4gdXNpbmcg TlBEcmF3aW5nTW9kZWxDb3JlQW5pbWF0aW9uLgorICAgICAgICAoLVtXZWJCYXNlTmV0c2NhcGVQ bHVnaW5WaWV3IHJlc3RvcmVQb3J0U3RhdGU6XSk6IERpdHRvLgorICAgICAgICAoLVtXZWJCYXNl TmV0c2NhcGVQbHVnaW5WaWV3IHNlbmRFdmVudDppc0RyYXdSZWN0Ol0pOiBTbGlnaHRseSByZWZh Y3RvcmVkIGEgc21hbGwgYmxvY2sgb2YgY29kZSB3aGljaCB3aXRoIHRoZSBQb3J0U3RhdGUuCisg ICAgICAgIFBsdWctaW5zIHVzaW5nIHRoZSBOUERyYXdpbmdNb2RlbENvcmVBbmltYXRpb24gZHJh d2luZyBtb2RlbCBoYXZlIG5vIFBvcnRTdGF0ZS4gCisgICAgICAgICgtW1dlYkJhc2VOZXRzY2Fw ZVBsdWdpblZpZXcgaXNOZXdXaW5kb3dFcXVhbFRvT2xkV2luZG93XSk6IEFTU0VSVCB0aGlzIGlz IG5vdCBhIHBsdWctaW4gdXNpbmcgTlBEcmF3aW5nTW9kZWxDb3JlQW5pbWF0aW9uCisgICAgICAg ICgtW1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcgdXBkYXRlQW5kU2V0V2luZG93XSk6ICBEaXR0 by4KKyAgICAgICAgKC1bV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldyBzZXRXaW5kb3dJZk5lY2Vz c2FyeV0pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldyBzdGFy dF0pOiBJZiB0aGUgcGx1Zy1pbiBpcyBhIHBsdWctaW4gdXNpbmcgdGhlIENvcmUgQW5pbWF0aW9u IG1vZGVsLCByZXF1ZXN0IGEgbGF5ZXIgZnJvbSBpdC4KKyAgICAgICAgKC1bV2ViQmFzZU5ldHNj YXBlUGx1Z2luVmlldyBkcmF3UmVjdDpdKTogUmV0dXJuIGVhcmx5IGZvciBOUERyYXdpbmdNb2Rl bENvcmVBbmltYXRpb24gcGx1Zy1pbnMuCisgICAgICAgICgtW1dlYkJhc2VOZXRzY2FwZVBsdWdp blZpZXcgZ2V0VmFyaWFibGU6dmFsdWU6XSk6IFRlbGwgcGx1Zy1pbnMgcnVubmluZyBvbiBwb3N0 LVRpZ2VyIHN5c3RlbXMgV2ViS2l0IHN1cHBvcnRzCisgICAgICAgICBOUERyYXdpbmdNb2RlbENv cmVBbmltYXRpb24uCisgICAgICAgICgtW1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcgc2V0VmFy aWFibGU6dmFsdWU6XSk6IEFkZGVkIHRoZSBuZXcgTlBEcmF3aW5nTW9kZWxDb3JlQW5pbWF0aW9u IGNhc2UsIHdoaWNoIGluaXRpYWxpemVzIGRyYXdpbmdNb2RlLgorICAgICAgICAoLVtXZWJCYXNl TmV0c2NhcGVQbHVnaW5WaWV3IF92aWV3SGFzTW92ZWRdKTogUmV3b3JkZWQgdGhlIGNvbmRpdGlv bmFsIGNhbGwgdG8gdXBkYXRlQW5kU2V0V2luZG93IHRvIGJlIHNwZWNpZmljIHRvIAorICAgICAg ICBDb3JlR3JhcGhpY3MgYW5kIFF1aWNrRHJhdyBwbHVnLWlucy4KKwogMjAwOC0xMC0zMSAgQ2Ft ZXJvbiBad2FyaWNoICA8endhcmljaEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMzgwNzUpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDExIEBACisyMDA4LTExLTAzICBLZXZpbiBEZWNrZXIgIDxr ZGVja2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGRlZCBhZGRpdGlvbmFsIHN1cHBvcnQgbmVlZGVkIGZvciB0aGUgTlBEcmF3 aW5nTW9kZWxDb3JlQW5pbWF0aW9uIGRyYXdpbmcgbW9kZWwuIAorCisgICAgICAgICogYnJpZGdl L25wYXBpLmg6CisKIDIwMDgtMTEtMDMgIFhhbiBMb3BleiAgPHhhbkBnbm9tZS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWxwIFRva2VyLgpJbmRleDogV2ViQ29yZS9icmlkZ2UvbnBhcGku aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9ucGFwaS5oCShyZXZpc2lvbiAzODA3NSkK KysrIFdlYkNvcmUvYnJpZGdlL25wYXBpLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1MCw2ICszNTAs OCBAQAogICAgIE5QUFZwbHVnaW5FdmVudE1vZGVsID0gMTAwMSwKICAgICAvKiBUaGUgcGx1Zy1p biB0ZXh0IGlucHV0IHZ0YWJsZSAqLwogICAgIE5QUFZwbHVnaW5UZXh0SW5wdXRGdW5jcyA9IDEw MDIsCisgICAgLyogSW4gdGhlIE5QRHJhd2luZ01vZGVsQ29yZUFuaW1hdGlvbiBkcmF3aW5nIG1v ZGVsLCB0aGUgYnJvd3NlciBhc2tzIHRoZSBwbHVnLWluIGZvciBhIENvcmUgQW5pbWF0aW9uIGxh eWVyLiAqLworICAgIE5QUFZwbHVnaW5Db3JlQW5pbWF0aW9uTGF5ZXIgPSAxMDAzCiAjZW5kaWYK IH0gTlBQVmFyaWFibGU7CiAKQEAgLTQxOCw3ICs0MjAsOCBAQAogICAgIE5QRHJhd2luZ01vZGVs UXVpY2tEcmF3ID0gMCwKICNlbmRpZgogICAgIE5QRHJhd2luZ01vZGVsQ29yZUdyYXBoaWNzID0g MSwKLSAgICBOUERyYXdpbmdNb2RlbE9wZW5HTCA9IDIKKyAgICBOUERyYXdpbmdNb2RlbE9wZW5H TCA9IDIsCisgICAgTlBEcmF3aW5nTW9kZWxDb3JlQW5pbWF0aW9uCiB9IE5QRHJhd2luZ01vZGVs OwogCiAvKgpAQCAtNDQ4LDcgKzQ1MSw2IEBACiAgICAgTlBDb2NvYUV2ZW50U2Nyb2xsV2hlZWws CiB9IE5QQ29jb2FFdmVudFR5cGU7CiAKLXR5cGVkZWYgc3RydWN0IF9OUENBTGF5ZXIgTlBDQUxh eWVyOwogdHlwZWRlZiBzdHJ1Y3QgX05QTlNTdHJpbmcgTlBOU1N0cmluZzsKIHR5cGVkZWYgc3Ry dWN0IF9OUE5TV2luZG93IE5QTlNXaW5kb3c7CiB0eXBlZGVmIHN0cnVjdCBfTlBOU01lbnUgTlBO U01lbnU7CkBAIC02MDgsMTcgKzYxMCw2IEBACiAjZW5kaWYKIH0gTlBfR0xDb250ZXh0OwogCi0v KiAKLSAqIE5QX0NBTGF5ZXIgaXMgdGhlIHR5cGUgb2YgdGhlIE5QV2luZG93J3MgJ3dpbmRvdycg d2hlbiB0aGUgcGx1Z2luIHNwZWNpZmllcyBOUERyYXdpbmdNb2RlbENvcmVBbmltYXRpb24gYXMg aXRzCi0gKiBkcmF3aW5nIG1vZGVsLgotICovCi0KLXR5cGVkZWYgc3RydWN0IE5QX0NBTGF5ZXIK LXsKLSAgICBOUENBTGF5ZXIgKmxheWVyOwotICAgIE5QTlNXaW5kb3cgKndpbmRvdzsKLX0gTlBf Q0FMYXllcjsKLQogI2VuZGlmIC8qIFhQX01BQ09TWCAqLwogCiAjaWYgZGVmaW5lZChYUF9NQUMp IHx8IGRlZmluZWQoWFBfTUFDT1NYKQo=