137119 2014-09-25 11:28:11 -0700 [Mac] MediaPlayerPrivateQTKit should not use FrameView 2014-09-30 07:30:41 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137217 21562 1 cgarcia eric.carlson commit-queue eric.carlson glenn jeremyj-wk jer.noble philipj sergio oldest_to_newest 1037254 0 cgarcia 2014-09-25 11:28:11 -0700 It's a layering violation. There are two cases where frame view is used in code that could be removed: - Frame rate rendering, this is not built by default and can be removed. - To make the QTMovieView a subview of the document view. This is compiled by default, but can be removed as well. 1038136 1 238904 eric.carlson 2014-09-29 20:12:20 -0700 Created attachment 238904 Proposed patch. 1038156 2 238904 cgarcia 2014-09-29 23:12:00 -0700 Comment on attachment 238904 Proposed patch. More dead code removed :-) Thanks! 1038214 3 238904 commit-queue 2014-09-30 07:30:37 -0700 Comment on attachment 238904 Proposed patch. Clearing flags on attachment: 238904 Committed r174106: <http://trac.webkit.org/changeset/174106> 1038215 4 commit-queue 2014-09-30 07:30:41 -0700 All reviewed patches have been landed. Closing bug. 238904 2014-09-29 20:12:20 -0700 2014-09-30 07:30:36 -0700 Proposed patch. frame_view_patch.txt text/plain 13766 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NDA5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA5LTI5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIE1lZGlhUGxh eWVyUHJpdmF0ZVFUS2l0IHNob3VsZCBub3QgdXNlIEZyYW1lVmlldworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3MTE5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIG9ic29sZXRlIFFUS2l0IGNv ZGUgdGhhdCB3b3VsZCBmYWxsIGJhY2sgdG8gcmVuZGVyaW5nIGludG8gYW4gTlNWaWV3LgorICAg ICAgICBBc2lkZSBmcm9tIGJlaW5nIGRlYWQgY29kZSwgaXQgd2FzIG9ubHkgdXNlZCB3aGVuIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nCisgICAgICAgIHdhcyBub3QgZW5hYmxlZCBhbmQgdGhhIGhh c24ndCBiZWVuIHBvc3NpYmxlIGZvciBhIGxvbmcgdGltZSwgaXQgcmVxdWlyZWQgYQorICAgICAg ICBsYXllcmluZyB2aW9sYXRpb24gdG8gZ2V0IHRoZSBGcmFtZVZpZXcuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW06CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6Y3VycmVudFJlbmRlcmluZ01v ZGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OnByZWZlcnJl ZFJlbmRlcmluZ01vZGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUVRL aXQ6OnNldFVwVmlkZW9SZW5kZXJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlUVRLaXQ6OnRlYXJEb3duVmlkZW9SZW5kZXJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6Omhhc1NldFVwVmlkZW9SZW5kZXJpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OnNldFNpemUpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OnBhaW50KToKKyAgICAgICAgKFdlYkNv cmU6Om1haW5UaHJlYWRTZXROZWVkc0Rpc3BsYXkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNyZWF0ZVFUTW92aWVWaWV3KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVFUS2l0OjpkZXRhY2hRVE1vdmll Vmlldyk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkNvcmVNb3ZpZU9ic2VydmVyIG1lbnVGb3JF dmVudERlbGVnYXRlOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJDb3JlTW92aWVPYnNlcnZl ciBzZXRWaWV3Ol0pOiBEZWxldGVkLgorCiAyMDE0LTA5LTI5ICBDaHJpc3RvcGhlIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaXM8PigpIC8gZG93bmNhc3Q8PigpIGZv ciBEb2N1bWVudApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01l ZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgJKHJldmlzaW9uIDE3 NDA4MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXll clByaXZhdGVRVEtpdC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw2IEBAIGNsYXNzIFFU VGltZTsKIE9CSkNfQ0xBU1MgTlNEaWN0aW9uYXJ5OwogT0JKQ19DTEFTUyBOU011dGFibGVEaWN0 aW9uYXJ5OwogT0JKQ19DTEFTUyBRVE1vdmllOwotT0JKQ19DTEFTUyBRVE1vdmllVmlldzsKIE9C SkNfQ0xBU1MgUVRNb3ZpZUxheWVyOwogT0JKQ19DTEFTUyBRVFZpZGVvUmVuZGVyZXJXZWJLaXRP bmx5OwogT0JKQ19DTEFTUyBXZWJDb3JlTW92aWVPYnNlcnZlcjsKQEAgLTEzOSw3ICsxMzgsNyBA QCBwcml2YXRlOgogICAgIHZvaWQgY3JlYXRlUVRNb3ZpZShjb25zdCBTdHJpbmcmIHVybCk7CiAg ICAgdm9pZCBjcmVhdGVRVE1vdmllKE5TVVJMICosIE5TRGljdGlvbmFyeSAqbW92aWVBdHRyaWJ1 dGVzKTsKIAotICAgIGVudW0gTWVkaWFSZW5kZXJpbmdNb2RlIHsgTWVkaWFSZW5kZXJpbmdOb25l LCBNZWRpYVJlbmRlcmluZ01vdmllVmlldywgTWVkaWFSZW5kZXJpbmdTb2Z0d2FyZVJlbmRlcmVy LCBNZWRpYVJlbmRlcmluZ01vdmllTGF5ZXIgfTsKKyAgICBlbnVtIE1lZGlhUmVuZGVyaW5nTW9k ZSB7IE1lZGlhUmVuZGVyaW5nTm9uZSwgTWVkaWFSZW5kZXJpbmdTb2Z0d2FyZVJlbmRlcmVyLCBN ZWRpYVJlbmRlcmluZ01vdmllTGF5ZXIgfTsKICAgICBNZWRpYVJlbmRlcmluZ01vZGUgY3VycmVu dFJlbmRlcmluZ01vZGUoKSBjb25zdDsKICAgICBNZWRpYVJlbmRlcmluZ01vZGUgcHJlZmVycmVk UmVuZGVyaW5nTW9kZSgpIGNvbnN0OwogICAgIApAQCAtMTQ3LDkgKzE0Niw2IEBAIHByaXZhdGU6 CiAgICAgdm9pZCB0ZWFyRG93blZpZGVvUmVuZGVyaW5nKCk7CiAgICAgYm9vbCBoYXNTZXRVcFZp ZGVvUmVuZGVyaW5nKCkgY29uc3Q7CiAgICAgCi0gICAgdm9pZCBjcmVhdGVRVE1vdmllVmlldygp OwotICAgIHZvaWQgZGV0YWNoUVRNb3ZpZVZpZXcoKTsKLSAgICAKICAgICBlbnVtIFFUVmlkZW9S ZW5kZXJlck1vZGUgeyBRVFZpZGVvUmVuZGVyZXJNb2RlRGVmYXVsdCwgUVRWaWRlb1JlbmRlcmVy TW9kZUxpc3RlbnNGb3JOZXdJbWFnZXMgfTsKICAgICB2b2lkIGNyZWF0ZVFUVmlkZW9SZW5kZXJl cihRVFZpZGVvUmVuZGVyZXJNb2RlIHJlbmRlcmVyTW9kZSk7CiAgICAgdm9pZCBkZXN0cm95UVRW aWRlb1JlbmRlcmVyKCk7CkBAIC0xODAsNyArMTc2LDYgQEAgcHJpdmF0ZToKIAogICAgIE1lZGlh UGxheWVyKiBtX3BsYXllcjsKICAgICBSZXRhaW5QdHI8UVRNb3ZpZT4gbV9xdE1vdmllOwotICAg IFJldGFpblB0cjxRVE1vdmllVmlldz4gbV9xdE1vdmllVmlldzsKICAgICBSZXRhaW5QdHI8UVRW aWRlb1JlbmRlcmVyV2ViS2l0T25seT4gbV9xdFZpZGVvUmVuZGVyZXI7CiAgICAgUmV0YWluUHRy PFdlYkNvcmVNb3ZpZU9ic2VydmVyPiBtX29iamNPYnNlcnZlcjsKICAgICBTdHJpbmcgbV9tb3Zp ZVVSTDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBs YXllclByaXZhdGVRVEtpdC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW0JKHJldmlzaW9uIDE3NDA4 MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclBy aXZhdGVRVEtpdC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNiBAQAogI2ltcG9ydCAi QmxvY2tFeGNlcHRpb25zLmgiCiAjaW1wb3J0ICJEb2N1bWVudExvYWRlci5oIgogI2ltcG9ydCAi RnJhbWUuaCIKLSNpbXBvcnQgIkZyYW1lVmlldy5oIgogI2ltcG9ydCAiSG9zdFdpbmRvdy5oIgog I2ltcG9ydCAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW1wb3J0ICJVUkwuaCIKQEAgLTUyLDcgKzUx LDYgQEAgU09GVF9MSU5LX0ZSQU1FV09SSyhRVEtpdCkKIFNPRlRfTElOSyhRVEtpdCwgUVRNYWtl VGltZSwgUVRUaW1lLCAobG9uZyBsb25nIHRpbWVWYWx1ZSwgbG9uZyB0aW1lU2NhbGUpLCAodGlt ZVZhbHVlLCB0aW1lU2NhbGUpKQogCiBTT0ZUX0xJTktfQ0xBU1MoUVRLaXQsIFFUTW92aWUpCi1T T0ZUX0xJTktfQ0xBU1MoUVRLaXQsIFFUTW92aWVWaWV3KQogU09GVF9MSU5LX0NMQVNTKFFUS2l0 LCBRVE1vdmllTGF5ZXIpCiAKIFNPRlRfTElOS19QT0lOVEVSKFFUS2l0LCBRVFRyYWNrTWVkaWFU eXBlQXR0cmlidXRlLCBOU1N0cmluZyAqKQpAQCAtOTcsNyArOTUsNiBAQCAtIChOU0FycmF5ICop bG9hZGVkUmFuZ2VzOwogQGVuZAogCiAjZGVmaW5lIFFUTW92aWUgZ2V0UVRNb3ZpZUNsYXNzKCkK LSNkZWZpbmUgUVRNb3ZpZVZpZXcgZ2V0UVRNb3ZpZVZpZXdDbGFzcygpCiAjZGVmaW5lIFFUTW92 aWVMYXllciBnZXRRVE1vdmllTGF5ZXJDbGFzcygpCiAKICNkZWZpbmUgUVRUcmFja01lZGlhVHlw ZUF0dHJpYnV0ZSBnZXRRVFRyYWNrTWVkaWFUeXBlQXR0cmlidXRlKCkKQEAgLTE0NSwyMSArMTQy LDE1IEBAIGVudW0gewogfTsKICNlbmRpZgogCi1AaW50ZXJmYWNlIEZha2VRVE1vdmllVmlldyA6 IE5TT2JqZWN0Ci0tIChXZWJDb3JlTW92aWVPYnNlcnZlciAqKWRlbGVnYXRlOwotQGVuZAotCiB1 c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogQGludGVyZmFjZSBXZWJDb3JlTW92aWVPYnNlcnZl ciA6IE5TT2JqZWN0CiB7CiAgICAgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQqIG1fY2FsbGJhY2s7 Ci0gICAgTlNWaWV3KiBtX3ZpZXc7CiAgICAgQk9PTCBtX2RlbGF5Q2FsbGJhY2tzOwogfQogLShp ZClpbml0V2l0aENhbGxiYWNrOihNZWRpYVBsYXllclByaXZhdGVRVEtpdCopY2FsbGJhY2s7CiAt KHZvaWQpZGlzY29ubmVjdDsKLS0odm9pZClzZXRWaWV3OihOU1ZpZXcqKXZpZXc7CiAtKHZvaWQp cmVwYWludDsKIC0odm9pZClzZXREZWxheUNhbGxiYWNrczooQk9PTClzaG91bGREZWxheTsKIC0o dm9pZClsb2FkU3RhdGVDaGFuZ2VkOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbjsKQEAg LTM4MSw4MSArMzcyLDEyIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNyZWF0ZVFU TW8KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0 Om1fcXRNb3ZpZS5nZXQoKV07CiB9CiAKLXN0YXRpYyB2b2lkIG1haW5UaHJlYWRTZXROZWVkc0Rp c3BsYXkoaWQgc2VsZiwgU0VMKQotewotICAgIGlkIHZpZXcgPSBbc2VsZiBzdXBlcnZpZXddOwot ICAgIEFTU0VSVCghdmlldyB8fCBbdmlldyBpc0tpbmRPZkNsYXNzOltRVE1vdmllVmlldyBjbGFz c11dKTsKLSAgICBpZiAoIXZpZXcgfHwgIVt2aWV3IGlzS2luZE9mQ2xhc3M6W1FUTW92aWVWaWV3 IGNsYXNzXV0pCi0gICAgICAgIHJldHVybjsKLQotICAgIEZha2VRVE1vdmllVmlldyAqbW92aWVW aWV3ID0gc3RhdGljX2Nhc3Q8RmFrZVFUTW92aWVWaWV3ICo+KHZpZXcpOwotICAgIFdlYkNvcmVN b3ZpZU9ic2VydmVyKiBkZWxlZ2F0ZSA9IFttb3ZpZVZpZXcgZGVsZWdhdGVdOwotICAgIEFTU0VS VCghZGVsZWdhdGUgfHwgW2RlbGVnYXRlIGlzS2luZE9mQ2xhc3M6W1dlYkNvcmVNb3ZpZU9ic2Vy dmVyIGNsYXNzXV0pOwotICAgIGlmICghZGVsZWdhdGUgfHwgIVtkZWxlZ2F0ZSBpc0tpbmRPZkNs YXNzOltXZWJDb3JlTW92aWVPYnNlcnZlciBjbGFzc11dKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBbZGVsZWdhdGUgcmVwYWludF07Ci19Ci0KIHN0YXRpYyBDbGFzcyBRVFZpZGVvUmVuZGVyZXJD bGFzcygpCiB7CiAgICAgIHN0YXRpYyBDbGFzcyBRVFZpZGVvUmVuZGVyZXJXZWJLaXRPbmx5Q2xh c3MgPSBOU0NsYXNzRnJvbVN0cmluZyhAIlFUVmlkZW9SZW5kZXJlcldlYktpdE9ubHkiKTsKICAg ICAgcmV0dXJuIFFUVmlkZW9SZW5kZXJlcldlYktpdE9ubHlDbGFzczsKIH0KIAotdm9pZCBNZWRp YVBsYXllclByaXZhdGVRVEtpdDo6Y3JlYXRlUVRNb3ZpZVZpZXcoKQotewotICAgIExPRyhNZWRp YSwgIk1lZGlhUGxheWVyUHJpdmF0ZVFUS2l0OjpjcmVhdGVRVE1vdmllVmlldyglcCkiLCB0aGlz KTsKLSAgICBkZXRhY2hRVE1vdmllVmlldygpOwotCi0gICAgc3RhdGljIGJvb2wgYWRkZWRDdXN0 b21NZXRob2RzID0gZmFsc2U7Ci0gICAgaWYgKCFtX3BsYXllci0+aW5NZWRpYURvY3VtZW50KCkg JiYgIWFkZGVkQ3VzdG9tTWV0aG9kcykgewotICAgICAgICBDbGFzcyBRVE1vdmllQ29udGVudFZp ZXdDbGFzcyA9IE5TQ2xhc3NGcm9tU3RyaW5nKEAiUVRNb3ZpZUNvbnRlbnRWaWV3Iik7Ci0gICAg ICAgIEFTU0VSVChRVE1vdmllQ29udGVudFZpZXdDbGFzcyk7Ci0KLSAgICAgICAgTWV0aG9kIG1h aW5UaHJlYWRTZXROZWVkc0Rpc3BsYXlNZXRob2QgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChR VE1vdmllQ29udGVudFZpZXdDbGFzcywgQHNlbGVjdG9yKF9tYWluVGhyZWFkU2V0TmVlZHNEaXNw bGF5KSk7Ci0gICAgICAgIEFTU0VSVChtYWluVGhyZWFkU2V0TmVlZHNEaXNwbGF5TWV0aG9kKTsK LQotICAgICAgICBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24obWFpblRocmVhZFNldE5lZWRzRGlz cGxheU1ldGhvZCwgcmVpbnRlcnByZXRfY2FzdDxJTVA+KG1haW5UaHJlYWRTZXROZWVkc0Rpc3Bs YXkpKTsKLSAgICAgICAgYWRkZWRDdXN0b21NZXRob2RzID0gdHJ1ZTsKLSAgICB9Ci0KLSAgICAv LyBkZWxheSBjYWxsYmFja3MgYXMgd2UgKndpbGwqIGdldCBub3RpZmljYXRpb25zIGR1cmluZyBz ZXR1cAotICAgIFttX29iamNPYnNlcnZlci5nZXQoKSBzZXREZWxheUNhbGxiYWNrczpZRVNdOwot Ci0gICAgbV9xdE1vdmllVmlldyA9IGFkb3B0TlMoW1tRVE1vdmllVmlldyBhbGxvY10gaW5pdF0p OwotICAgIHNldFNpemUobV9wbGF5ZXItPnNpemUoKSk7Ci0gICAgTlNWaWV3KiBwYXJlbnRWaWV3 ID0gMDsKLSAgICBwYXJlbnRWaWV3ID0gbV9wbGF5ZXItPmZyYW1lVmlldygpLT5kb2N1bWVudFZp ZXcoKTsKLSAgICBbcGFyZW50VmlldyBhZGRTdWJ2aWV3Om1fcXRNb3ZpZVZpZXcuZ2V0KCldOwot ICAgIFttX3F0TW92aWVWaWV3LmdldCgpIHNldERlbGVnYXRlOm1fb2JqY09ic2VydmVyLmdldCgp XTsKLSAgICBbbV9vYmpjT2JzZXJ2ZXIuZ2V0KCkgc2V0VmlldzptX3F0TW92aWVWaWV3LmdldCgp XTsKLSAgICBbbV9xdE1vdmllVmlldy5nZXQoKSBzZXRNb3ZpZTptX3F0TW92aWUuZ2V0KCldOwot ICAgIFttX3F0TW92aWVWaWV3LmdldCgpIHNldENvbnRyb2xsZXJWaXNpYmxlOk5PXTsKLSAgICBb bV9xdE1vdmllVmlldy5nZXQoKSBzZXRQcmVzZXJ2ZXNBc3BlY3RSYXRpbzpOT107Ci0gICAgLy8g dGhlIGFyZWEgbm90IGNvdmVyZWQgYnkgdmlkZW8gc2hvdWxkIGJlIHRyYW5zcGFyZW50Ci0gICAg W21fcXRNb3ZpZVZpZXcuZ2V0KCkgc2V0RmlsbENvbG9yOltOU0NvbG9yIGNsZWFyQ29sb3JdXTsK LQotICAgIC8vIElmIHdlJ3JlIGluIGEgbWVkaWEgZG9jdW1lbnQsIGFsbG93IFFUTW92aWVWaWV3 IHRvIHJlbmRlciBpbiBpdHMgZGVmYXVsdCBtb2RlOwotICAgIC8vIG90aGVyd2lzZSB0ZWxsIGl0 IHRvIGRyYXcgc3luY2hyb25vdXNseS4KLSAgICAvLyBOb3RlIHRoYXQgd2UgZXhwZWN0IG1haW5U aHJlYWRTZXROZWVkc0Rpc3BsYXkgdG8gYmUgaW52b2tlZCBvbmx5IHdoZW4gc3luY2hyb25vdXMg ZHJhd2luZyBpcyByZXF1ZXN0ZWQuCi0gICAgaWYgKCFtX3BsYXllci0+aW5NZWRpYURvY3VtZW50 KCkpCi0gICAgICAgIHdrUVRNb3ZpZVZpZXdTZXREcmF3U3luY2hyb25vdXNseShtX3F0TW92aWVW aWV3LmdldCgpLCBZRVMpOwotCi0gICAgW21fb2JqY09ic2VydmVyLmdldCgpIHNldERlbGF5Q2Fs bGJhY2tzOk5PXTsKLX0KLQotdm9pZCBNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6ZGV0YWNoUVRN b3ZpZVZpZXcoKQotewotICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Ojpk ZXRhY2hRVE1vdmllVmlldyglcCkiLCB0aGlzKTsKLSAgICBpZiAobV9xdE1vdmllVmlldykgewot ICAgICAgICBbbV9vYmpjT2JzZXJ2ZXIuZ2V0KCkgc2V0VmlldzpuaWxdOwotICAgICAgICBbbV9x dE1vdmllVmlldy5nZXQoKSBzZXREZWxlZ2F0ZTpuaWxdOwotICAgICAgICBbbV9xdE1vdmllVmll dy5nZXQoKSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKLSAgICAgICAgbV9xdE1vdmllVmlldyA9IG5p bDsKLSAgICB9Ci19Ci0KIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNyZWF0ZVFUVmlk ZW9SZW5kZXJlcihRVFZpZGVvUmVuZGVyZXJNb2RlIHJlbmRlcmVyTW9kZSkKIHsKICAgICBMT0co TWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6Y3JlYXRlUVRWaWRlb1JlbmRlcmVyKCVw KSIsIHRoaXMpOwpAQCAtNTI4LDkgKzQ1MCw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUVRL aXQ6OmRlc3Ryb3lRVE0KIAogTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6Ok1lZGlhUmVuZGVyaW5n TW9kZSBNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6Y3VycmVudFJlbmRlcmluZ01vZGUoKSBjb25z dAogewotICAgIGlmIChtX3F0TW92aWVWaWV3KQotICAgICAgICByZXR1cm4gTWVkaWFSZW5kZXJp bmdNb3ZpZVZpZXc7Ci0gICAgCiAgICAgaWYgKG1fcXRWaWRlb0xheWVyKQogICAgICAgICByZXR1 cm4gTWVkaWFSZW5kZXJpbmdNb3ZpZUxheWVyOwogCkBAIC01NDIsMTQgKzQ2MSwxNCBAQCBNZWRp YVBsYXllclByaXZhdGVRVEtpdDo6TWVkaWFSZW5kZXJpbmdNCiAKIE1lZGlhUGxheWVyUHJpdmF0 ZVFUS2l0OjpNZWRpYVJlbmRlcmluZ01vZGUgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OnByZWZl cnJlZFJlbmRlcmluZ01vZGUoKSBjb25zdAogewotICAgIGlmICghbV9wbGF5ZXItPmZyYW1lVmll dygpIHx8ICFtX3F0TW92aWUpCisgICAgaWYgKCFtX3F0TW92aWUpCiAgICAgICAgIHJldHVybiBN ZWRpYVJlbmRlcmluZ05vbmU7CiAKICAgICBpZiAoc3VwcG9ydHNBY2NlbGVyYXRlZFJlbmRlcmlu ZygpICYmIG1fcGxheWVyLT5tZWRpYVBsYXllckNsaWVudCgpLT5tZWRpYVBsYXllclJlbmRlcmlu Z0NhbkJlQWNjZWxlcmF0ZWQobV9wbGF5ZXIpKQogICAgICAgICByZXR1cm4gTWVkaWFSZW5kZXJp bmdNb3ZpZUxheWVyOwogCiAgICAgaWYgKCFRVFZpZGVvUmVuZGVyZXJDbGFzcygpKQotICAgICAg ICByZXR1cm4gTWVkaWFSZW5kZXJpbmdNb3ZpZVZpZXc7CisgICAgICAgIHJldHVybiBNZWRpYVJl bmRlcmluZ05vbmU7CiAgICAgCiAgICAgcmV0dXJuIE1lZGlhUmVuZGVyaW5nU29mdHdhcmVSZW5k ZXJlcjsKIH0KQEAgLTU2OSw5ICs0ODgsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVFUS2l0 OjpzZXRVcFZpZGVvCiAgICAgICAgIHRlYXJEb3duVmlkZW9SZW5kZXJpbmcoKTsKIAogICAgIHN3 aXRjaCAocHJlZmVycmVkTW9kZSkgewotICAgIGNhc2UgTWVkaWFSZW5kZXJpbmdNb3ZpZVZpZXc6 Ci0gICAgICAgIGNyZWF0ZVFUTW92aWVWaWV3KCk7Ci0gICAgICAgIGJyZWFrOwogICAgIGNhc2Ug TWVkaWFSZW5kZXJpbmdOb25lOgogICAgIGNhc2UgTWVkaWFSZW5kZXJpbmdTb2Z0d2FyZVJlbmRl cmVyOgogICAgICAgICBjcmVhdGVRVFZpZGVvUmVuZGVyZXIoUVRWaWRlb1JlbmRlcmVyTW9kZUxp c3RlbnNGb3JOZXdJbWFnZXMpOwpAQCAtNTg5LDggKzUwNSw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlUVRLaXQ6OnNldFVwVmlkZW8KIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OnRl YXJEb3duVmlkZW9SZW5kZXJpbmcoKQogewogICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJp dmF0ZVFUS2l0Ojp0ZWFyRG93blZpZGVvUmVuZGVyaW5nKCVwKSIsIHRoaXMpOwotICAgIGlmICht X3F0TW92aWVWaWV3KQotICAgICAgICBkZXRhY2hRVE1vdmllVmlldygpOwogICAgIGlmIChtX3F0 VmlkZW9SZW5kZXJlcikKICAgICAgICAgZGVzdHJveVFUVmlkZW9SZW5kZXJlcigpOwogICAgIGlm IChtX3F0VmlkZW9MYXllcikKQEAgLTU5OSw4ICs1MTMsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZVFUS2l0Ojp0ZWFyRG93blZpCiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6Omhh c1NldFVwVmlkZW9SZW5kZXJpbmcoKSBjb25zdAogewotICAgIHJldHVybiBtX3F0TW92aWVWaWV3 Ci0gICAgICAgIHx8IG1fcXRWaWRlb0xheWVyCisgICAgcmV0dXJuIG1fcXRWaWRlb0xheWVyCiAg ICAgICAgIHx8IG1fcXRWaWRlb1JlbmRlcmVyOwogfQogCkBAIC0xMjE5LDEzICsxMTMyLDYgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6bGF5ZXJIb3N0QwogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZVFUS2l0OjpzZXRTaXplKGNvbnN0IEludFNpemUmKSAKIHsgCi0gICAgLy8gRG9u J3QgcmVzaXplIHRoZSB2aWV3IG5vdyBiZWNhdXNlIFt2aWV3IHNldEZyYW1lXSBhbHNvIHJlc2l6 ZXMgdGhlIG1vdmllIGl0c2VsZiwgYW5kIGJlY2F1c2UKLSAgICAvLyB0aGUgcmVuZGVyZXIgY2Fs bHMgdGhpcyBmdW5jdGlvbiBpbW1lZGlhdGVseSB3aGVuIHdlIHJlcG9ydCBhIHNpemUgY2hhbmdl IChRVE1vdmllU2l6ZURpZENoYW5nZU5vdGlmaWNhdGlvbikKLSAgICAvLyB3ZSBjYW4gZ2V0IGlu dG8gYSBmZWVkYmFjayBsb29wIG9ic2VydmluZyB0aGUgc2l6ZSBjaGFuZ2UgYW5kIHJlc2V0dGlu ZyB0aGUgc2l6ZSwgYW5kIHRoaXMgY2FuIGNhdXNlCi0gICAgLy8gUXVpY2tUaW1lIHRvIG1pc3Mg cmVzZXR0aW5nIGEgbW92aWUncyBzaXplIHdoZW4gdGhlIG1lZGlhIHNpemUgY2hhbmdlcyAoYXMg aGFwcGVucyB3aXRoIGFuIHJ0c3AgbW92aWUKLSAgICAvLyBvbmNlIHRoZSBydHNwIHNlcnZlciBz ZW5kcyB0aGUgdHJhY2sgc2l6ZXMpLiBJbnN0ZWFkIHdlIHJlbWVtYmVyIHRoZSBzaXplIHBhc3Nl ZCB0byBwYWludCgpIGFuZCByZXNpemUKLSAgICAvLyB0aGUgdmlldyB3aGVuIGl0IGNoYW5nZXMu Ci0gICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzYzMzYwOTI+IFJFR1JFU1NJT046IHJ0c3AgbW92aWUg ZG9lcyBub3QgcmVzaXplIGNvcnJlY3RseQogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVFU S2l0OjpzZXRWaXNpYmxlKGJvb2wgYikKQEAgLTEyODAsOSArMTE4Niw4IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlUVRLaXQ6OnBhaW50KEdyYXAKIHsKICAgICBpZiAoY29udGV4dC0+cGFpbnRp bmdEaXNhYmxlZCgpIHx8IG1faGFzVW5zdXBwb3J0ZWRUcmFja3MpCiAgICAgICAgIHJldHVybjsK LSAgICBOU1ZpZXcgKnZpZXcgPSBtX3F0TW92aWVWaWV3LmdldCgpOwogICAgIGlkIHF0VmlkZW9S ZW5kZXJlciA9IG1fcXRWaWRlb1JlbmRlcmVyLmdldCgpOwotICAgIGlmICghdmlldyAmJiAhcXRW aWRlb1JlbmRlcmVyKQorICAgIGlmICghcXRWaWRlb1JlbmRlcmVyKQogICAgICAgICByZXR1cm47 CiAKICAgICBbbV9vYmpjT2JzZXJ2ZXIuZ2V0KCkgc2V0RGVsYXlDYWxsYmFja3M6WUVTXTsKQEAg LTEyOTgsMzYgKzEyMDMsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6cGFpbnQo R3JhcAogCiAgICAgbmV3Q29udGV4dCA9IFtOU0dyYXBoaWNzQ29udGV4dCBncmFwaGljc0NvbnRl eHRXaXRoR3JhcGhpY3NQb3J0OmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpIGZsaXBwZWQ6Tk9d OwogCi0gICAgLy8gZHJhdyB0aGUgY3VycmVudCB2aWRlbyBmcmFtZQotICAgIGlmIChxdFZpZGVv UmVuZGVyZXIpIHsKLSAgICAgICAgW05TR3JhcGhpY3NDb250ZXh0IHNhdmVHcmFwaGljc1N0YXRl XTsKLSAgICAgICAgW05TR3JhcGhpY3NDb250ZXh0IHNldEN1cnJlbnRDb250ZXh0Om5ld0NvbnRl eHRdOwotICAgICAgICBbKGlkPFdlYktpdFZpZGVvUmVuZGVyaW5nRGV0YWlscz4pcXRWaWRlb1Jl bmRlcmVyIGRyYXdJblJlY3Q6cGFpbnRSZWN0XTsKLSAgICAgICAgW05TR3JhcGhpY3NDb250ZXh0 IHJlc3RvcmVHcmFwaGljc1N0YXRlXTsKLSAgICB9IGVsc2UgewotICAgICAgICBpZiAobV9yZWN0 ICE9IHIpIHsKLSAgICAgICAgICAgICBtX3JlY3QgPSByOwotICAgICAgICAgICAgaWYgKG1fcGxh eWVyLT5pbk1lZGlhRG9jdW1lbnQoKSkgewotICAgICAgICAgICAgICAgIC8vIHRoZSBRVE1vdmll VmlldyBuZWVkcyB0byBiZSBwbGFjZWQgaW4gdGhlIHByb3BlciBsb2NhdGlvbiBmb3IgZG9jdW1l bnQgbW9kZQotICAgICAgICAgICAgICAgIFt2aWV3IHNldEZyYW1lOm1fcmVjdF07Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBXZSBkb24ndCBy ZWFsbHkgbmVlZCB0aGUgUVRNb3ZpZVZpZXcgaW4gYW55IHNwZWNpZmljIGxvY2F0aW9uIHNvIGxl dCdzIGp1c3QgZ2V0IGl0IG91dCBvZiB0aGUgd2F5Ci0gICAgICAgICAgICAgICAgLy8gd2hlcmUg aXQgd29uJ3QgaW50ZXJjZXB0IGV2ZW50cyBvciB0cnkgdG8gYnJpbmcgdXAgdGhlIGNvbnRleHQg bWVudS4KLSAgICAgICAgICAgICAgICBJbnRSZWN0IGZhckF3YXlCdXRDb3JyZWN0U2l6ZShtX3Jl Y3QpOwotICAgICAgICAgICAgICAgIGZhckF3YXlCdXRDb3JyZWN0U2l6ZS5tb3ZlKC0xMDAwMDAw LCAtMTAwMDAwMCk7Ci0gICAgICAgICAgICAgICAgW3ZpZXcgc2V0RnJhbWU6ZmFyQXdheUJ1dENv cnJlY3RTaXplXTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIGlmIChtX3Bs YXllci0+aW5NZWRpYURvY3VtZW50KCkpIHsKLSAgICAgICAgICAgIC8vIElmIHdlJ3JlIHVzaW5n IGEgUVRNb3ZpZVZpZXcgaW4gYSBtZWRpYSBkb2N1bWVudCwgdGhlIHZpZXcgbWF5IGdldCBsYXll ci1iYWNrZWQuIEFwcEtpdCB3b24ndCB1cGRhdGUKLSAgICAgICAgICAgIC8vIHRoZSBsYXllciBo b3N0aW5nIGNvcnJlY3RseSBpZiB3ZSBjYWxsIGRpc3BsYXlSZWN0SWdub3JpbmdPcGFjaXR5Omlu Q29udGV4dDosIHNvIHVzZSBkaXNwbGF5UmVjdElnbm9yaW5nT3BhY2l0eToKLSAgICAgICAgICAg IC8vIGluIHRoaXMgY2FzZS4gU2VlIDxyZGFyOi8vcHJvYmxlbS82NzAyODgyPi4KLSAgICAgICAg ICAgIFt2aWV3IGRpc3BsYXlSZWN0SWdub3JpbmdPcGFjaXR5OnBhaW50UmVjdF07Ci0gICAgICAg IH0gZWxzZQotICAgICAgICAgICAgW3ZpZXcgZGlzcGxheVJlY3RJZ25vcmluZ09wYWNpdHk6cGFp bnRSZWN0IGluQ29udGV4dDpuZXdDb250ZXh0XTsKLSAgICB9CisgICAgW05TR3JhcGhpY3NDb250 ZXh0IHNhdmVHcmFwaGljc1N0YXRlXTsKKyAgICBbTlNHcmFwaGljc0NvbnRleHQgc2V0Q3VycmVu dENvbnRleHQ6bmV3Q29udGV4dF07CisgICAgWyhpZDxXZWJLaXRWaWRlb1JlbmRlcmluZ0RldGFp bHM+KXF0VmlkZW9SZW5kZXJlciBkcmF3SW5SZWN0OnBhaW50UmVjdF07CisgICAgW05TR3JhcGhp Y3NDb250ZXh0IHJlc3RvcmVHcmFwaGljc1N0YXRlXTsKIAogICAgIEVORF9CTE9DS19PQkpDX0VY Q0VQVElPTlM7CiAgICAgW21fb2JqY09ic2VydmVyLmdldCgpIHNldERlbGF5Q2FsbGJhY2tzOk5P XTsKQEAgLTE2NDIsMTcgKzE1MjEsNiBAQCAtICh2b2lkKWRpc2Nvbm5lY3QKICAgICBtX2NhbGxi YWNrID0gMDsKIH0KIAotLShOU01lbnUqKW1lbnVGb3JFdmVudERlbGVnYXRlOihOU0V2ZW50Kil0 aGVFdmVudAotewotICAgIC8vIEdldCB0aGUgY29udGV4dHVhbCBtZW51IGZyb20gdGhlIFFUTW92 aWVWaWV3J3Mgc3VwZXJ2aWV3LCB0aGUgZnJhbWUgdmlldwotICAgIHJldHVybiBbW21fdmlldyBz dXBlcnZpZXddIG1lbnVGb3JFdmVudDp0aGVFdmVudF07Ci19Ci0KLS0odm9pZClzZXRWaWV3OihO U1ZpZXcqKXZpZXcKLXsKLSAgICBtX3ZpZXcgPSB2aWV3OwotfQotCiAtKHZvaWQpcmVwYWludAog ewogICAgIGlmIChtX2RlbGF5Q2FsbGJhY2tzKQo=