68379 2011-09-19 12:59:34 -0700 Remove calls to -[WebView _usesDocumentViews] from WebFrameLoaderClient.mm 2011-09-19 13:06:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 469617 0 andersca 2011-09-19 12:59:34 -0700 Remove calls to -[WebView _usesDocumentViews] from WebFrameLoaderClient.mm 469618 1 107904 andersca 2011-09-19 12:59:53 -0700 Created attachment 107904 Patch 469621 2 107904 aroben 2011-09-19 13:05:07 -0700 Comment on attachment 107904 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107904&action=review > Source/WebKit/mac/ChangeLog:6 > + Remove calls to -[WebView _usesDocumentViews] from WebFrameLoaderClient.mm > + https://bugs.webkit.org/show_bug.cgi?id=68379 > + > + Reviewed by NOBODY (OOPS!). Needs more explanation! > Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm:1232 > + // FIXME (Viewless): I assume we want the equivalent of this optimization for viewless mode too. Seems like we don't need this FIXME anymore. 469622 3 andersca 2011-09-19 13:06:43 -0700 Committed r95459: <http://trac.webkit.org/changeset/95459> 107904 2011-09-19 12:59:53 -0700 2011-09-19 13:05:07 -0700 Patch bug-68379-20110919125952.patch text/plain 12969 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDU4KQorKysgU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDktMTkg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUg Y2FsbHMgdG8gLVtXZWJWaWV3IF91c2VzRG9jdW1lbnRWaWV3c10gZnJvbSBXZWJGcmFtZUxvYWRl ckNsaWVudC5tbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjgzNzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorICAgICAgICAoV2Vi RnJhbWVMb2FkZXJDbGllbnQ6Omhhc0hUTUxWaWV3KToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJD bGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UpOgorICAgICAgICAoV2ViRnJh bWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUZyYW1lKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1l Lm1tOgorICAgICAgICAoLVtXZWJGcmFtZSBfdXBkYXRlQmFja2dyb3VuZEFuZFVwZGF0ZXNXaGls ZU9mZnNjcmVlbl0pOgorICAgICAgICAoLVtXZWJGcmFtZSBfaGFzU2VsZWN0aW9uXSk6CisgICAg ICAgICgtW1dlYkZyYW1lIF9jbGVhclNlbGVjdGlvbl0pOgorICAgICAgICAoLVtXZWJGcmFtZSBf c2hvdWxkRmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzOl0pOgorICAgICAgICAoLVtXZWJGcmFtZSBf ZHJhZ1NvdXJjZUVuZGVkQXQ6b3BlcmF0aW9uOl0pOgorICAgICAgICAoLVtXZWJGcmFtZSBmcmFt ZVZpZXddKToKKwogMjAxMS0wOS0xOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFJlbW92ZSBjYWxscyB0byAtW1dlYlZpZXcgX3VzZXNEb2N1bWVudFZp ZXdzXQpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0JKHJldmlzaW9uIDk1NDE5KQorKysgU291cmNlL1dl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0JKHdvcmtpbmcg Y29weSkKQEAgLTIzMywxMSArMjMzLDYgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6bWFr ZVJlcHJlc2VudAogCiBib29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpoYXNIVE1MVmlldygpIGNv bnN0CiB7Ci0gICAgaWYgKCFbZ2V0V2ViVmlldyhtX3dlYkZyYW1lLmdldCgpKSBfdXNlc0RvY3Vt ZW50Vmlld3NdKSB7Ci0gICAgICAgIC8vIEZJWE1FIChWaWV3bGVzcyk6IEZvciBub3cgd2UganVz dCBhc3N1bWUgdGhhdCBhbGwgZnJhbWVzIGhhdmUgYW4gSFRNTCB2aWV3Ci0gICAgICAgIHJldHVy biB0cnVlOwotICAgIH0KLSAgICAKICAgICBOU1ZpZXcgPFdlYkRvY3VtZW50Vmlldz4gKnZpZXcg PSBbbV93ZWJGcmFtZS0+X3ByaXZhdGUtPndlYkZyYW1lVmlldyBkb2N1bWVudFZpZXddOwogICAg IHJldHVybiBbdmlldyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11dOwogfQpAQCAt NjU4LDcgKzY1Myw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2gK IHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiB7CiAg ICAgLy8gVGVsbCB0aGUgY2xpZW50IHdlJ3ZlIGNvbW1pdHRlZCB0aGlzIFVSTC4KLSAgICBBU1NF UlQoW21fd2ViRnJhbWUtPl9wcml2YXRlLT53ZWJGcmFtZVZpZXcgZG9jdW1lbnRWaWV3XSAhPSBu aWwgfHwgIVtnZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkpIF91c2VzRG9jdW1lbnRWaWV3c10p OworICAgIEFTU0VSVChbbV93ZWJGcmFtZS0+X3ByaXZhdGUtPndlYkZyYW1lVmlldyBkb2N1bWVu dFZpZXddICE9IG5pbCk7CiAgICAgCiAgICAgV2ViVmlldyAqd2ViVmlldyA9IGdldFdlYlZpZXco bV93ZWJGcmFtZS5nZXQoKSk7ICAgCiAgICAgW3dlYlZpZXcgX2RpZENvbW1pdExvYWRGb3JGcmFt ZTptX3dlYkZyYW1lLmdldCgpXTsKQEAgLTEyMzMsMzEgKzEyMjgsMjUgQEAgdm9pZCBXZWJGcmFt ZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQwogewogICAgIFdlYlZpZXcgKndlYlZpZXcgPSBn ZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkpOwogICAgIFdlYkRhdGFTb3VyY2UgKmRhdGFTb3Vy Y2UgPSBbbV93ZWJGcmFtZS5nZXQoKSBfZGF0YVNvdXJjZV07Ci0gICAgYm9vbCB1c2VzRG9jdW1l bnRWaWV3cyA9IFt3ZWJWaWV3IF91c2VzRG9jdW1lbnRWaWV3c107Ci0KLSAgICBpZiAodXNlc0Rv Y3VtZW50Vmlld3MpIHsKLSAgICAgICAgLy8gRklYTUUgKFZpZXdsZXNzKTogSSBhc3N1bWUgd2Ug d2FudCB0aGUgZXF1aXZhbGVudCBvZiB0aGlzIG9wdGltaXphdGlvbiBmb3Igdmlld2xlc3MgbW9k ZSB0b28uCi0gICAgICAgIGJvb2wgd2lsbFByb2R1Y2VIVE1MVmlldyA9IFttX3dlYkZyYW1lLT5f cHJpdmF0ZS0+d2ViRnJhbWVWaWV3IF92aWV3Q2xhc3NGb3JNSU1FVHlwZTpbZGF0YVNvdXJjZSBf cmVzcG9uc2VNSU1FVHlwZV1dID09IFtXZWJIVE1MVmlldyBjbGFzc107Ci0gICAgICAgIGJvb2wg Y2FuU2tpcENyZWF0aW9uID0gY29yZShtX3dlYkZyYW1lLmdldCgpKS0+bG9hZGVyKCktPnN0YXRl TWFjaGluZSgpLT5jb21taXR0aW5nRmlyc3RSZWFsTG9hZCgpICYmIHdpbGxQcm9kdWNlSFRNTFZp ZXc7Ci0gICAgICAgIGlmIChjYW5Ta2lwQ3JlYXRpb24pIHsKLSAgICAgICAgICAgIFtbbV93ZWJG cmFtZS0+X3ByaXZhdGUtPndlYkZyYW1lVmlldyBkb2N1bWVudFZpZXddIHNldERhdGFTb3VyY2U6 ZGF0YVNvdXJjZV07Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KIAotICAgICAgICAv LyBEb24ndCBzdXBwcmVzcyBzY3JvbGxiYXJzIGJlZm9yZSB0aGUgdmlldyBjcmVhdGlvbiBpZiB3 ZSdyZSBtYWtpbmcgdGhlIHZpZXcgZm9yIGEgbm9uLUhUTUwgdmlldy4KLSAgICAgICAgaWYgKCF3 aWxsUHJvZHVjZUhUTUxWaWV3KQotICAgICAgICAgICAgW1ttX3dlYkZyYW1lLT5fcHJpdmF0ZS0+ d2ViRnJhbWVWaWV3IF9zY3JvbGxWaWV3XSBzZXRTY3JvbGxCYXJzU3VwcHJlc3NlZDpOTyByZXBh aW50T25VbnN1cHByZXNzOk5PXTsKKyAgICAvLyBGSVhNRSAoVmlld2xlc3MpOiBJIGFzc3VtZSB3 ZSB3YW50IHRoZSBlcXVpdmFsZW50IG9mIHRoaXMgb3B0aW1pemF0aW9uIGZvciB2aWV3bGVzcyBt b2RlIHRvby4KKyAgICBib29sIHdpbGxQcm9kdWNlSFRNTFZpZXcgPSBbbV93ZWJGcmFtZS0+X3By aXZhdGUtPndlYkZyYW1lVmlldyBfdmlld0NsYXNzRm9yTUlNRVR5cGU6W2RhdGFTb3VyY2UgX3Jl c3BvbnNlTUlNRVR5cGVdXSA9PSBbV2ViSFRNTFZpZXcgY2xhc3NdOworICAgIGJvb2wgY2FuU2tp cENyZWF0aW9uID0gY29yZShtX3dlYkZyYW1lLmdldCgpKS0+bG9hZGVyKCktPnN0YXRlTWFjaGlu ZSgpLT5jb21taXR0aW5nRmlyc3RSZWFsTG9hZCgpICYmIHdpbGxQcm9kdWNlSFRNTFZpZXc7Cisg ICAgaWYgKGNhblNraXBDcmVhdGlvbikgeworICAgICAgICBbW21fd2ViRnJhbWUtPl9wcml2YXRl LT53ZWJGcmFtZVZpZXcgZG9jdW1lbnRWaWV3XSBzZXREYXRhU291cmNlOmRhdGFTb3VyY2VdOwor ICAgICAgICByZXR1cm47CiAgICAgfQorCisgICAgLy8gRG9uJ3Qgc3VwcHJlc3Mgc2Nyb2xsYmFy cyBiZWZvcmUgdGhlIHZpZXcgY3JlYXRpb24gaWYgd2UncmUgbWFraW5nIHRoZSB2aWV3IGZvciBh IG5vbi1IVE1MIHZpZXcuCisgICAgaWYgKCF3aWxsUHJvZHVjZUhUTUxWaWV3KQorICAgICAgICBb W21fd2ViRnJhbWUtPl9wcml2YXRlLT53ZWJGcmFtZVZpZXcgX3Njcm9sbFZpZXddIHNldFNjcm9s bEJhcnNTdXBwcmVzc2VkOk5PIHJlcGFpbnRPblVuc3VwcHJlc3M6Tk9dOwogICAgIAogICAgIC8v IGNsZWFuIHVwIHdlYmtpdCBwbHVnaW4gaW5zdGFuY2VzIGJlZm9yZSBXZWJIVE1MVmlldyBnZXRz IGZyZWVkLgogICAgIFt3ZWJWaWV3IHJlbW92ZVBsdWdpbkluc3RhbmNlVmlld3NGb3I6KG1fd2Vi RnJhbWUuZ2V0KCkpXTsKICAgICAKLSAgICBOU1ZpZXcgPFdlYkRvY3VtZW50Vmlldz4gKmRvY3Vt ZW50VmlldyA9IG5pbDsKLSAgICBpZiAodXNlc0RvY3VtZW50Vmlld3MpIHsKLSAgICAgICAgZG9j dW1lbnRWaWV3ID0gW21fd2ViRnJhbWUtPl9wcml2YXRlLT53ZWJGcmFtZVZpZXcgX21ha2VEb2N1 bWVudFZpZXdGb3JEYXRhU291cmNlOmRhdGFTb3VyY2VdOwotICAgICAgICBpZiAoIWRvY3VtZW50 VmlldykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICB9CisgICAgTlNWaWV3IDxXZWJEb2N1bWVu dFZpZXc+ICpkb2N1bWVudFZpZXcgPSBbbV93ZWJGcmFtZS0+X3ByaXZhdGUtPndlYkZyYW1lVmll dyBfbWFrZURvY3VtZW50Vmlld0ZvckRhdGFTb3VyY2U6ZGF0YVNvdXJjZV07CisgICAgaWYgKCFk b2N1bWVudFZpZXcpCisgICAgICAgIHJldHVybjsKIAogICAgIC8vIEZJWE1FOiBDb3VsZCB3ZSBz a2lwIHNvbWUgb2YgdGhpcyB3b3JrIGZvciBhIHRvcC1sZXZlbCB2aWV3IHRoYXQgaXMgbm90IGEg V2ViSFRNTFZpZXc/CiAKQEAgLTEyNjgsMzggKzEyNTcsMzAgQEAgdm9pZCBXZWJGcmFtZUxvYWRl ckNsaWVudDo6dHJhbnNpdGlvblRvQwogICAgIGlmIChpc01haW5GcmFtZSAmJiBjb3JlRnJhbWUt PnZpZXcoKSkKICAgICAgICAgY29yZUZyYW1lLT52aWV3KCktPnNldFBhcmVudFZpc2libGUoZmFs c2UpOwogICAgIGNvcmVGcmFtZS0+c2V0VmlldygwKTsKLSAgICBSZWZQdHI8RnJhbWVWaWV3PiBj b3JlVmlldzsKLSAgICBpZiAodXNlc0RvY3VtZW50Vmlld3MpCi0gICAgICAgIGNvcmVWaWV3ID0g RnJhbWVWaWV3OjpjcmVhdGUoY29yZUZyYW1lKTsKLSAgICBlbHNlCi0gICAgICAgIGNvcmVWaWV3 ID0gRnJhbWVWaWV3OjpjcmVhdGUoY29yZUZyYW1lLCBJbnRTaXplKFt3ZWJWaWV3IGJvdW5kc10u c2l6ZSkpOworICAgIFJlZlB0cjxGcmFtZVZpZXc+IGNvcmVWaWV3ID0gRnJhbWVWaWV3OjpjcmVh dGUoY29yZUZyYW1lKTsKICAgICBjb3JlRnJhbWUtPnNldFZpZXcoY29yZVZpZXcpOwogCiAgICAg W21fd2ViRnJhbWUuZ2V0KCkgX3VwZGF0ZUJhY2tncm91bmRBbmRVcGRhdGVzV2hpbGVPZmZzY3Jl ZW5dOwotCi0gICAgaWYgKHVzZXNEb2N1bWVudFZpZXdzKQotICAgICAgICBbbV93ZWJGcmFtZS0+ X3ByaXZhdGUtPndlYkZyYW1lVmlldyBfaW5zdGFsbF07CisgICAgW21fd2ViRnJhbWUtPl9wcml2 YXRlLT53ZWJGcmFtZVZpZXcgX2luc3RhbGxdOwogCiAgICAgaWYgKGlzTWFpbkZyYW1lKQogICAg ICAgICBjb3JlVmlldy0+c2V0UGFyZW50VmlzaWJsZSh0cnVlKTsKIAotICAgIGlmICh1c2VzRG9j dW1lbnRWaWV3cykgewotICAgICAgICAvLyBDYWxsIHNldERhdGFTb3VyY2Ugb24gdGhlIGRvY3Vt ZW50IHZpZXcgYWZ0ZXIgaXQgaGFzIGJlZW4gcGxhY2VkIGluIHRoZSB2aWV3IGhpZXJhcmNoeS4K LSAgICAgICAgLy8gVGhpcyB3aGF0IHdlIGZvciB0aGUgdG9wLWxldmVsIHZpZXcsIHNvIHNob3Vs ZCBkbyB0aGlzIGZvciB2aWV3cyBpbiBzdWJmcmFtZXMgYXMgd2VsbC4KLSAgICAgICAgW2RvY3Vt ZW50VmlldyBzZXREYXRhU291cmNlOmRhdGFTb3VyY2VdOwotCi0gICAgICAgIC8vIFRoZSBmb2xs b3dpbmcgaXMgYSBuby1vcCBmb3IgV2ViSFRNTFJlcHJlc2VudGF0aW9uLCBidXQgZm9yIGN1c3Rv bSBkb2N1bWVudCB0eXBlcwotICAgICAgICAvLyBsaWtlIHRoZSBvbmVzIHRoYXQgU2FmYXJpIHVz ZXMgZm9yIGJvb2ttYXJrcyBpdCBpcyB0aGUgb25seSB3YXkgdGhlIERvY3VtZW50TG9hZGVyCi0g ICAgICAgIC8vIHdpbGwgZ2V0IHRoZSBwcm9wZXIgdGl0bGUuCi0gICAgICAgIGlmIChEb2N1bWVu dExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBbZGF0YVNvdXJjZSBfZG9jdW1lbnRMb2FkZXJdKQot ICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldFRpdGxlKFN0cmluZ1dpdGhEaXJlY3Rpb24o W2RhdGFTb3VyY2UgcGFnZVRpdGxlXSwgTFRSKSk7Ci0gICAgfQorICAgIC8vIENhbGwgc2V0RGF0 YVNvdXJjZSBvbiB0aGUgZG9jdW1lbnQgdmlldyBhZnRlciBpdCBoYXMgYmVlbiBwbGFjZWQgaW4g dGhlIHZpZXcgaGllcmFyY2h5LgorICAgIC8vIFRoaXMgd2hhdCB3ZSBmb3IgdGhlIHRvcC1sZXZl bCB2aWV3LCBzbyBzaG91bGQgZG8gdGhpcyBmb3Igdmlld3MgaW4gc3ViZnJhbWVzIGFzIHdlbGwu CisgICAgW2RvY3VtZW50VmlldyBzZXREYXRhU291cmNlOmRhdGFTb3VyY2VdOworCisgICAgLy8g VGhlIGZvbGxvd2luZyBpcyBhIG5vLW9wIGZvciBXZWJIVE1MUmVwcmVzZW50YXRpb24sIGJ1dCBm b3IgY3VzdG9tIGRvY3VtZW50IHR5cGVzCisgICAgLy8gbGlrZSB0aGUgb25lcyB0aGF0IFNhZmFy aSB1c2VzIGZvciBib29rbWFya3MgaXQgaXMgdGhlIG9ubHkgd2F5IHRoZSBEb2N1bWVudExvYWRl cgorICAgIC8vIHdpbGwgZ2V0IHRoZSBwcm9wZXIgdGl0bGUuCisgICAgaWYgKERvY3VtZW50TG9h ZGVyKiBkb2N1bWVudExvYWRlciA9IFtkYXRhU291cmNlIF9kb2N1bWVudExvYWRlcl0pCisgICAg ICAgIGRvY3VtZW50TG9hZGVyLT5zZXRUaXRsZShTdHJpbmdXaXRoRGlyZWN0aW9uKFtkYXRhU291 cmNlIHBhZ2VUaXRsZV0sIExUUikpOwogCiAgICAgaWYgKEhUTUxGcmFtZU93bmVyRWxlbWVudCog b3duZXIgPSBjb3JlRnJhbWUtPm93bmVyRWxlbWVudCgpKQogICAgICAgICBjb3JlRnJhbWUtPnZp ZXcoKS0+c2V0Q2FuSGF2ZVNjcm9sbGJhcnMob3duZXItPnNjcm9sbGluZ01vZGUoKSAhPSBTY3Jv bGxiYXJBbHdheXNPZmYpOwogICAgICAgICAKICAgICAvLyBJZiB0aGUgZG9jdW1lbnQgdmlldyBp bXBsaWNpdGx5IGJlY2FtZSBmaXJzdCByZXNwb25kZXIsIG1ha2Ugc3VyZSB0byBzZXQgdGhlIGZv Y3VzZWQgZnJhbWUgcHJvcGVybHkuCi0gICAgaWYgKHVzZXNEb2N1bWVudFZpZXdzICYmIFtbZG9j dW1lbnRWaWV3IHdpbmRvd10gZmlyc3RSZXNwb25kZXJdID09IGRvY3VtZW50VmlldykgeworICAg IGlmIChbW2RvY3VtZW50VmlldyB3aW5kb3ddIGZpcnN0UmVzcG9uZGVyXSA9PSBkb2N1bWVudFZp ZXcpIHsKICAgICAgICAgcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPnNldEZvY3VzZWRGcmFtZShj b3JlRnJhbWUpOwogICAgICAgICBwYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+c2V0Rm9jdXNlZCh0 cnVlKTsKICAgICB9CkBAIC0xNDIwLDcgKzE0MDEsNyBAQCBQYXNzUmVmUHRyPEZyYW1lPiBXZWJG cmFtZUxvYWRlckNsaWVudDo6CiAgICAgCiAgICAgQVNTRVJUKG1fd2ViRnJhbWUpOwogICAgIAot ICAgIFdlYkZyYW1lVmlldyAqY2hpbGRWaWV3ID0gW2dldFdlYlZpZXcobV93ZWJGcmFtZS5nZXQo KSkgX3VzZXNEb2N1bWVudFZpZXdzXSA/IFtbV2ViRnJhbWVWaWV3IGFsbG9jXSBpbml0XSA6IG5p bDsKKyAgICBXZWJGcmFtZVZpZXcgKmNoaWxkVmlldyA9IFtbV2ViRnJhbWVWaWV3IGFsbG9jXSBp bml0XTsKICAgICAKICAgICBSZWZQdHI8RnJhbWU+IHJlc3VsdCA9IFtXZWJGcmFtZSBfY3JlYXRl U3ViZnJhbWVXaXRoT3duZXJFbGVtZW50Om93bmVyRWxlbWVudCBmcmFtZU5hbWU6bmFtZSBmcmFt ZVZpZXc6Y2hpbGRWaWV3XTsKICAgICBbY2hpbGRWaWV3IHJlbGVhc2VdOwpJbmRleDogU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCShyZXZpc2lvbiA5NTQxOSkKKysrIFNvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTM2MywxOSAr MzYzLDE3IEBAIC0gKHZvaWQpX3VwZGF0ZUJhY2tncm91bmRBbmRVcGRhdGVzV2hpbGUKIAogICAg IEZyYW1lKiBjb3JlRnJhbWUgPSBfcHJpdmF0ZS0+Y29yZUZyYW1lOwogICAgIGZvciAoRnJhbWUq IGZyYW1lID0gY29yZUZyYW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJz ZU5leHQoY29yZUZyYW1lKSkgewotICAgICAgICBpZiAoW3dlYlZpZXcgX3VzZXNEb2N1bWVudFZp ZXdzXSkgewotICAgICAgICAgICAgLy8gRG9uJ3QgY2FsbCBzZXREcmF3c0JhY2tncm91bmQ6WUVT IGhlcmUgYmVjYXVzZSBpdCBtYXkgYmUgTk8gYmVjYXVzZSBvZiBhIGxvYWQKLSAgICAgICAgICAg IC8vIGluIHByb2dyZXNzOyBXZWJGcmFtZUxvYWRlckNsaWVudCBrZWVwcyBpdCBzZXQgdG8gTk8g ZHVyaW5nIHRoZSBsb2FkIHByb2Nlc3MuCi0gICAgICAgICAgICBXZWJGcmFtZSAqd2ViRnJhbWUg PSBraXQoZnJhbWUpOwotICAgICAgICAgICAgaWYgKCFkcmF3c0JhY2tncm91bmQpCi0gICAgICAg ICAgICAgICAgW1tbd2ViRnJhbWUgZnJhbWVWaWV3XSBfc2Nyb2xsVmlld10gc2V0RHJhd3NCYWNr Z3JvdW5kOk5PXTsKLSAgICAgICAgICAgIFtbW3dlYkZyYW1lIGZyYW1lVmlld10gX3Njcm9sbFZp ZXddIHNldEJhY2tncm91bmRDb2xvcjpiYWNrZ3JvdW5kQ29sb3JdOwotICAgICAgICAgICAgaWQg ZG9jdW1lbnRWaWV3ID0gW1t3ZWJGcmFtZSBmcmFtZVZpZXddIGRvY3VtZW50Vmlld107Ci0gICAg ICAgICAgICBpZiAoW2RvY3VtZW50VmlldyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNl dERyYXdzQmFja2dyb3VuZDopXSkKLSAgICAgICAgICAgICAgICBbZG9jdW1lbnRWaWV3IHNldERy YXdzQmFja2dyb3VuZDpkcmF3c0JhY2tncm91bmRdOwotICAgICAgICAgICAgaWYgKFtkb2N1bWVu dFZpZXcgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRCYWNrZ3JvdW5kQ29sb3I6KV0p Ci0gICAgICAgICAgICAgICAgW2RvY3VtZW50VmlldyBzZXRCYWNrZ3JvdW5kQ29sb3I6YmFja2dy b3VuZENvbG9yXTsKLSAgICAgICAgfQorICAgICAgICAvLyBEb24ndCBjYWxsIHNldERyYXdzQmFj a2dyb3VuZDpZRVMgaGVyZSBiZWNhdXNlIGl0IG1heSBiZSBOTyBiZWNhdXNlIG9mIGEgbG9hZAor ICAgICAgICAvLyBpbiBwcm9ncmVzczsgV2ViRnJhbWVMb2FkZXJDbGllbnQga2VlcHMgaXQgc2V0 IHRvIE5PIGR1cmluZyB0aGUgbG9hZCBwcm9jZXNzLgorICAgICAgICBXZWJGcmFtZSAqd2ViRnJh bWUgPSBraXQoZnJhbWUpOworICAgICAgICBpZiAoIWRyYXdzQmFja2dyb3VuZCkKKyAgICAgICAg ICAgIFtbW3dlYkZyYW1lIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIHNldERyYXdzQmFja2dyb3Vu ZDpOT107CisgICAgICAgIFtbW3dlYkZyYW1lIGZyYW1lVmlld10gX3Njcm9sbFZpZXddIHNldEJh Y2tncm91bmRDb2xvcjpiYWNrZ3JvdW5kQ29sb3JdOworICAgICAgICBpZCBkb2N1bWVudFZpZXcg PSBbW3dlYkZyYW1lIGZyYW1lVmlld10gZG9jdW1lbnRWaWV3XTsKKyAgICAgICAgaWYgKFtkb2N1 bWVudFZpZXcgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXREcmF3c0JhY2tncm91bmQ6 KV0pCisgICAgICAgICAgICBbZG9jdW1lbnRWaWV3IHNldERyYXdzQmFja2dyb3VuZDpkcmF3c0Jh Y2tncm91bmRdOworICAgICAgICBpZiAoW2RvY3VtZW50VmlldyByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKHNldEJhY2tncm91bmRDb2xvcjopXSkKKyAgICAgICAgICAgIFtkb2N1bWVudFZp ZXcgc2V0QmFja2dyb3VuZENvbG9yOmJhY2tncm91bmRDb2xvcl07CiAKICAgICAgICAgaWYgKEZy YW1lVmlldyogdmlldyA9IGZyYW1lLT52aWV3KCkpIHsKICAgICAgICAgICAgIHZpZXctPnNldFRy YW5zcGFyZW50KCFkcmF3c0JhY2tncm91bmQpOwpAQCAtNDE1LDI3ICs0MTMsMjEgQEAgLSAodm9p ZClfdW5tYXJrQWxsTWlzc3BlbGxpbmdzCiAKIC0gKEJPT0wpX2hhc1NlbGVjdGlvbgogewotICAg IGlmIChbZ2V0V2ViVmlldyhzZWxmKSBfdXNlc0RvY3VtZW50Vmlld3NdKSB7Ci0gICAgICAgIGlk IGRvY3VtZW50VmlldyA9IFtfcHJpdmF0ZS0+d2ViRnJhbWVWaWV3IGRvY3VtZW50Vmlld107ICAg IAotCi0gICAgICAgIC8vIG9wdGltaXphdGlvbiBmb3IgY29tbW9uIGNhc2UgdG8gYXZvaWQgY3Jl YXRpbmcgcG90ZW50aWFsbHkgbGFyZ2Ugc2VsZWN0aW9uIHN0cmluZwotICAgICAgICBpZiAoW2Rv Y3VtZW50VmlldyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11dKQotICAgICAgICAg ICAgaWYgKEZyYW1lKiBjb3JlRnJhbWUgPSBfcHJpdmF0ZS0+Y29yZUZyYW1lKQotICAgICAgICAg ICAgICAgIHJldHVybiBjb3JlRnJhbWUtPnNlbGVjdGlvbigpLT5pc1JhbmdlKCk7CisgICAgaWQg ZG9jdW1lbnRWaWV3ID0gW19wcml2YXRlLT53ZWJGcmFtZVZpZXcgZG9jdW1lbnRWaWV3XTsgICAg CiAKLSAgICAgICAgaWYgKFtkb2N1bWVudFZpZXcgY29uZm9ybXNUb1Byb3RvY29sOkBwcm90b2Nv bChXZWJEb2N1bWVudFRleHQpXSkKLSAgICAgICAgICAgIHJldHVybiBbW2RvY3VtZW50VmlldyBz ZWxlY3RlZFN0cmluZ10gbGVuZ3RoXSA+IDA7Ci0gICAgICAgIAotICAgICAgICByZXR1cm4gTk87 Ci0gICAgfQorICAgIC8vIG9wdGltaXphdGlvbiBmb3IgY29tbW9uIGNhc2UgdG8gYXZvaWQgY3Jl YXRpbmcgcG90ZW50aWFsbHkgbGFyZ2Ugc2VsZWN0aW9uIHN0cmluZworICAgIGlmIChbZG9jdW1l bnRWaWV3IGlzS2luZE9mQ2xhc3M6W1dlYkhUTUxWaWV3IGNsYXNzXV0pCisgICAgICAgIGlmIChG cmFtZSogY29yZUZyYW1lID0gX3ByaXZhdGUtPmNvcmVGcmFtZSkKKyAgICAgICAgICAgIHJldHVy biBjb3JlRnJhbWUtPnNlbGVjdGlvbigpLT5pc1JhbmdlKCk7CiAKLSAgICBGcmFtZSogY29yZUZy YW1lID0gX3ByaXZhdGUtPmNvcmVGcmFtZTsKLSAgICByZXR1cm4gY29yZUZyYW1lICYmIGNvcmVG cmFtZS0+c2VsZWN0aW9uKCktPmlzUmFuZ2UoKTsKKyAgICBpZiAoW2RvY3VtZW50VmlldyBjb25m b3Jtc1RvUHJvdG9jb2w6QHByb3RvY29sKFdlYkRvY3VtZW50VGV4dCldKQorICAgICAgICByZXR1 cm4gW1tkb2N1bWVudFZpZXcgc2VsZWN0ZWRTdHJpbmddIGxlbmd0aF0gPiAwOworICAgIAorICAg IHJldHVybiBOTzsKIH0KIAogLSAodm9pZClfY2xlYXJTZWxlY3Rpb24KIHsKLSAgICBBU1NFUlQo W2dldFdlYlZpZXcoc2VsZikgX3VzZXNEb2N1bWVudFZpZXdzXSk7CiAgICAgaWQgZG9jdW1lbnRW aWV3ID0gW19wcml2YXRlLT53ZWJGcmFtZVZpZXcgZG9jdW1lbnRWaWV3XTsgICAgCiAgICAgaWYg KFtkb2N1bWVudFZpZXcgY29uZm9ybXNUb1Byb3RvY29sOkBwcm90b2NvbChXZWJEb2N1bWVudFRl eHQpXSkKICAgICAgICAgW2RvY3VtZW50VmlldyBkZXNlbGVjdEFsbF07CkBAIC01NDUsMTEgKzUz Nyw5IEBAIC0gKEJPT0wpX3Nob3VsZEZsYXR0ZW5Db21wb3NpdGluZ0xheWVyczoKICAgICAgICAg cmV0dXJuIE5POwogCiAgICAgLy8gSWYgd2UncmUgZHJhd2luZyBpbnRvIGEgYml0bWFwLCB3ZSBt aWdodCBiZSBzbmFwc2hvdHRpbmcsIG9yIGRyYXdpbmcgaW50byBhIGxheWVyLWJhY2tlZCB2aWV3 LgotICAgIGlmIChbZ2V0V2ViVmlldyhzZWxmKSBfdXNlc0RvY3VtZW50Vmlld3NdKSB7Ci0gICAg ICAgIGlkIGRvY3VtZW50VmlldyA9IFtfcHJpdmF0ZS0+d2ViRnJhbWVWaWV3IGRvY3VtZW50Vmll d107Ci0gICAgICAgIGlmIChbZG9jdW1lbnRWaWV3IGlzS2luZE9mQ2xhc3M6W1dlYkhUTUxWaWV3 IGNsYXNzXV0gJiYgWyhXZWJIVE1MVmlldyAqKWRvY3VtZW50VmlldyBfd2ViX2lzRHJhd2luZ0lu dG9MYXllcl0pCi0gICAgICAgICAgICByZXR1cm4gTk87Ci0gICAgfQorICAgIGlkIGRvY3VtZW50 VmlldyA9IFtfcHJpdmF0ZS0+d2ViRnJhbWVWaWV3IGRvY3VtZW50Vmlld107CisgICAgaWYgKFtk b2N1bWVudFZpZXcgaXNLaW5kT2ZDbGFzczpbV2ViSFRNTFZpZXcgY2xhc3NdXSAmJiBbKFdlYkhU TUxWaWV3ICopZG9jdW1lbnRWaWV3IF93ZWJfaXNEcmF3aW5nSW50b0xheWVyXSkKKyAgICAgICAg cmV0dXJuIE5POwogCiAgICAgcmV0dXJuIFtnZXRXZWJWaWV3KHNlbGYpIF9pbmNsdWRlc0ZsYXR0 ZW5lZENvbXBvc2l0aW5nTGF5ZXJzV2hlbkRyYXdpbmdUb0JpdG1hcF07CiB9CkBAIC04MzMsNyAr ODIzLDYgQEAgLSAodm9pZClfZHJhZ1NvdXJjZUVuZGVkQXQ6KE5TUG9pbnQpd2luZAogICAgIEZy YW1lVmlldyogdmlldyA9IF9wcml2YXRlLT5jb3JlRnJhbWUtPnZpZXcoKTsKICAgICBpZiAoIXZp ZXcpCiAgICAgICAgIHJldHVybjsKLSAgICBBU1NFUlQoW2dldFdlYlZpZXcoc2VsZikgX3VzZXNE b2N1bWVudFZpZXdzXSk7CiAgICAgLy8gRklYTUU6IFRoZXNlIGFyZSBmYWtlIG1vZGlmaWVyIGtl eXMgaGVyZSwgYnV0IHRoZXkgc2hvdWxkIGJlIHJlYWwgb25lcyBpbnN0ZWFkLgogICAgIFBsYXRm b3JtTW91c2VFdmVudCBldmVudChJbnRQb2ludCh3aW5kb3dMb2MpLCBnbG9iYWxQb2ludCh3aW5k b3dMb2MsIFt2aWV3LT5wbGF0Zm9ybVdpZGdldCgpIHdpbmRvd10pLAogICAgICAgICBMZWZ0QnV0 dG9uLCBNb3VzZUV2ZW50TW92ZWQsIDAsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBjdXJy ZW50VGltZSgpKTsKQEAgLTE0MTEsNyArMTQwMCw2IEBAIC0gKE5TU3RyaW5nICopbmFtZQogCiAt IChXZWJGcmFtZVZpZXcgKilmcmFtZVZpZXcKIHsKLSAgICBBU1NFUlQoIWdldFdlYlZpZXcoc2Vs ZikgfHwgW2dldFdlYlZpZXcoc2VsZikgX3VzZXNEb2N1bWVudFZpZXdzXSk7CiAgICAgcmV0dXJu IF9wcml2YXRlLT53ZWJGcmFtZVZpZXc7CiB9CiAK