68388 2011-09-19 14:04:16 -0700 Remove the last remains of viewless WebKit1 2011-09-19 14:24:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 469668 0 andersca 2011-09-19 14:04:16 -0700 Remove the last remains of viewless WebKit1 469673 1 107919 andersca 2011-09-19 14:08:07 -0700 Created attachment 107919 Patch 469684 2 andersca 2011-09-19 14:24:36 -0700 Committed r95474: <http://trac.webkit.org/changeset/95474> 107919 2011-09-19 14:08:07 -0700 2011-09-19 14:13:46 -0700 Patch bug-68388-20110919140806.patch text/plain 13468 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDcwKQorKysgU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTEtMDktMTkg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUg dGhlIGxhc3QgcmVtYWlucyBvZiB2aWV3bGVzcyBXZWJLaXQxCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODM4OAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQubW06CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6Zm9yY2VMYXlvdXRG b3JOb25IVE1MKToKKyAgICAgICAgUmVtb3ZlIG51bGwgY2hlY2suCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9u V2l0aEZyYW1lTmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgIFJlbW92ZSB1c2VzRG9jdW1lbnRW aWV3cyBwYXJhbWV0ZXIgYW5kIGNoZWNrcy4KKworICAgICAgICAoLVtXZWJWaWV3IF9pbml0V2l0 aEZyYW1lOmZyYW1lTmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgIFJlbW92ZSB1c2VzRG9jdW1l bnRWaWV3cyBwYXJhbWV0ZXIuIFdoaWxlIHRoaXMgU1BJIHdhcyB1c2VkIGJ5IFNhZmFyaSA1LCBT YWZhcmkgNS4xIGRvZXNuJ3QgY2FsbCBpdC4KKworICAgICAgICAoLVtXZWJWaWV3IF9pc1VzaW5n QWNjZWxlcmF0ZWRDb21wb3NpdGluZ10pOgorICAgICAgICBSZW1vdmUgdXNlc0RvY3VtZW50Vmll d3MgY2hlY2suCisKKyAgICAgICAgKC1bV2ViVmlldyBfaXNTb2Z0d2FyZVJlbmRlcmFibGVdKToK KyAgICAgICAgUmVtb3ZlIHVzZXNEb2N1bWVudFZpZXdzIGNoZWNrLgorCisgICAgICAgICgtW1dl YlZpZXcgaW5pdFdpdGhGcmFtZTpmcmFtZU5hbWU6Z3JvdXBOYW1lOl0pOgorICAgICAgICBSZW1v dmUgdXNlc0RvY3VtZW50Vmlld3MgcGFyYW1ldGVyLgorICAgICAgICAKKyAgICAgICAgKC1bV2Vi VmlldyBpbml0V2l0aENvZGVyOl0pOgorICAgICAgICBSZW1vdmUgdXNlc0RvY3VtZW50Vmlld3Mg cGFyYW1ldGVyLgorCisgICAgICAgICgtW1dlYlZpZXcgX2ZyYW1lVmlld0F0V2luZG93UG9pbnQ6 XSk6CisgICAgICAgIFJlbW92ZSB1c2VzRG9jdW1lbnRWaWV3cyBjaGVjay4KKworICAgICAgICAq IFdlYlZpZXcvV2ViVmlld0RhdGEuaDoKKyAgICAgICAgUmVtb3ZlIHVzZXNEb2N1bWVudFZpZXdz IGl2YXIuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXdQcml2YXRlLmg6CisgICAgICAgIFJl bW92ZSB1c2VzRG9jdW1lbnRWaWV3cyBwYXJhbWV0ZXJzLgorCiAyMDExLTA5LTE5ICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFdlYlZpZXdF dmVudEhhbmRsaW5nLm1tCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQkocmV2aXNpb24gOTU0NTkpCisr KyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5t bQkod29ya2luZyBjb3B5KQpAQCAtMjQ3LDggKzI0Nyw2IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OmZvcmNlTGF5b3V0KCkKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmZvcmNlTGF5 b3V0Rm9yTm9uSFRNTCgpCiB7CiAgICAgV2ViRnJhbWVWaWV3ICp0aGlzVmlldyA9IG1fd2ViRnJh bWUtPl9wcml2YXRlLT53ZWJGcmFtZVZpZXc7Ci0gICAgaWYgKCF0aGlzVmlldykgLy8gVmlld2xl c3MgbW9kZS4KLSAgICAgICAgcmV0dXJuOwogICAgIE5TVmlldyA8V2ViRG9jdW1lbnRWaWV3PiAq dGhpc0RvY3VtZW50VmlldyA9IFt0aGlzVmlldyBkb2N1bWVudFZpZXddOwogICAgIEFTU0VSVCh0 aGlzRG9jdW1lbnRWaWV3ICE9IG5pbCk7CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJWaWV3Lm1tCShyZXZpc2lvbiA5NTQ3MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjMyLDExICs2MzIsNiBAQCAtICh2b2lk KV9yZWdpc3RlckRyYWdnZWRUeXBlcwogICAgIFt0eXBlcyByZWxlYXNlXTsKIH0KIAotLSAoQk9P TClfdXNlc0RvY3VtZW50Vmlld3MKLXsKLSAgICByZXR1cm4gX3ByaXZhdGUtPnVzZXNEb2N1bWVu dFZpZXdzOwotfQotCiBzdGF0aWMgTlNTdHJpbmcgKmxlYWtNYWlsUXVpcmtzVXNlclNjcmlwdENv bnRlbnRzKCkKIHsKICAgICBOU1N0cmluZyAqc2NyaXB0UGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxl Rm9yQ2xhc3M6W1dlYlZpZXcgY2xhc3NdXSBwYXRoRm9yUmVzb3VyY2U6QCJNYWlsUXVpcmtzVXNl clNjcmlwdCIgb2ZUeXBlOkAianMiXTsKQEAgLTY5Myw3ICs2ODgsNyBAQCAtKHZvaWQpX2luamVj dFNvbGFyV2Fsa1F1aXJrc1NjcmlwdAogICAgICAgICBzb2xhcldhbGtRdWlya3NTY3JpcHRDb250 ZW50cywgS1VSTCgpLCBudWxscHRyLCBudWxscHRyLCBJbmplY3RBdERvY3VtZW50RW5kLCBJbmpl Y3RJbkFsbEZyYW1lcyk7CiB9CiAKLS0gKHZvaWQpX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZy YW1lTmFtZTooTlNTdHJpbmcgKilmcmFtZU5hbWUgZ3JvdXBOYW1lOihOU1N0cmluZyAqKWdyb3Vw TmFtZSB1c2VzRG9jdW1lbnRWaWV3czooQk9PTCl1c2VzRG9jdW1lbnRWaWV3cworLSAodm9pZClf Y29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYW1lOihOU1N0cmluZyAqKWZyYW1lTmFtZSBn cm91cE5hbWU6KE5TU3RyaW5nICopZ3JvdXBOYW1lCiB7CiAgICAgV2ViQ29yZVRocmVhZFZpb2xh dGlvbkNoZWNrUm91bmRUd28oKTsKIApAQCAtNzA5LDE3ICs3MDQsMTMgQEAgLSAodm9pZClfY29t bW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYQogICAgIF9wcml2YXRlLT5tYWluRnJhbWVEb2N1 bWVudFJlYWR5ID0gTk87CiAgICAgX3ByaXZhdGUtPmRyYXdzQmFja2dyb3VuZCA9IFlFUzsKICAg ICBfcHJpdmF0ZS0+YmFja2dyb3VuZENvbG9yID0gW1tOU0NvbG9yIGNvbG9yV2l0aERldmljZVdo aXRlOjEgYWxwaGE6MV0gcmV0YWluXTsKLSAgICBfcHJpdmF0ZS0+dXNlc0RvY3VtZW50Vmlld3Mg PSB1c2VzRG9jdW1lbnRWaWV3czsKICAgICBfcHJpdmF0ZS0+aW5jbHVkZXNGbGF0dGVuZWRDb21w b3NpdGluZ0xheWVyc1doZW5EcmF3aW5nVG9CaXRtYXAgPSBZRVM7CiAKLSAgICBXZWJGcmFtZVZp ZXcgKmZyYW1lVmlldyA9IG5pbDsKLSAgICBpZiAoX3ByaXZhdGUtPnVzZXNEb2N1bWVudFZpZXdz KSB7Ci0gICAgICAgIE5TUmVjdCBmID0gW3NlbGYgZnJhbWVdOwotICAgICAgICBmcmFtZVZpZXcg PSBbW1dlYkZyYW1lVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTogTlNNYWtlUmVjdCgwLDAsZi5z aXplLndpZHRoLGYuc2l6ZS5oZWlnaHQpXTsKLSAgICAgICAgW2ZyYW1lVmlldyBzZXRBdXRvcmVz aXppbmdNYXNrOk5TVmlld1dpZHRoU2l6YWJsZSB8IE5TVmlld0hlaWdodFNpemFibGVdOwotICAg ICAgICBbc2VsZiBhZGRTdWJ2aWV3OmZyYW1lVmlld107Ci0gICAgICAgIFtmcmFtZVZpZXcgcmVs ZWFzZV07Ci0gICAgfQorICAgIE5TUmVjdCBmID0gW3NlbGYgZnJhbWVdOworICAgIFdlYkZyYW1l VmlldyAqZnJhbWVWaWV3ID0gW1tXZWJGcmFtZVZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6IE5T TWFrZVJlY3QoMCwwLGYuc2l6ZS53aWR0aCxmLnNpemUuaGVpZ2h0KV07CisgICAgW2ZyYW1lVmll dyBzZXRBdXRvcmVzaXppbmdNYXNrOk5TVmlld1dpZHRoU2l6YWJsZSB8IE5TVmlld0hlaWdodFNp emFibGVdOworICAgIFtzZWxmIGFkZFN1YnZpZXc6ZnJhbWVWaWV3XTsKKyAgICBbZnJhbWVWaWV3 IHJlbGVhc2VdOwogCiAgICAgc3RhdGljIGJvb2wgZGlkT25lVGltZUluaXRpYWxpemF0aW9uID0g ZmFsc2U7CiAgICAgaWYgKCFkaWRPbmVUaW1lSW5pdGlhbGl6YXRpb24pIHsKQEAgLTgyNSw3ICs4 MTYsNyBAQCAtICh2b2lkKV9jb21tb25Jbml0aWFsaXphdGlvbldpdGhGcmFtZU5hCiAgICAgICAg IFtzZWxmIF9pbmplY3RNYWlsUXVpcmtzU2NyaXB0XTsKIH0KIAotLSAoaWQpX2luaXRXaXRoRnJh bWU6KE5TUmVjdClmIGZyYW1lTmFtZTooTlNTdHJpbmcgKilmcmFtZU5hbWUgZ3JvdXBOYW1lOihO U1N0cmluZyAqKWdyb3VwTmFtZSB1c2VzRG9jdW1lbnRWaWV3czooQk9PTCl1c2VzRG9jdW1lbnRW aWV3cworLSAoaWQpX2luaXRXaXRoRnJhbWU6KE5TUmVjdClmIGZyYW1lTmFtZTooTlNTdHJpbmcg KilmcmFtZU5hbWUgZ3JvdXBOYW1lOihOU1N0cmluZyAqKWdyb3VwTmFtZQogewogICAgIHNlbGYg PSBbc3VwZXIgaW5pdFdpdGhGcmFtZTpmXTsKICAgICBpZiAoIXNlbGYpCkBAIC04NDQsODAgKzgz NSwxMSBAQCAtIChpZClfaW5pdFdpdGhGcmFtZTooTlNSZWN0KWYgZnJhbWVOYW1lCiAjZW5kaWYK IAogICAgIF9wcml2YXRlID0gW1tXZWJWaWV3UHJpdmF0ZSBhbGxvY10gaW5pdF07Ci0gICAgW3Nl bGYgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmFtZTpmcmFtZU5hbWUgZ3JvdXBOYW1l Omdyb3VwTmFtZSB1c2VzRG9jdW1lbnRWaWV3czp1c2VzRG9jdW1lbnRWaWV3c107CisgICAgW3Nl bGYgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmFtZTpmcmFtZU5hbWUgZ3JvdXBOYW1l Omdyb3VwTmFtZV07CiAgICAgW3NlbGYgc2V0TWFpbnRhaW5zQmFja0ZvcndhcmRMaXN0OiBZRVNd OwogICAgIHJldHVybiBzZWxmOwogfQogCi0tIChCT09MKV9tdXN0RHJhd1VuaW9uZWRSZWN0OihO U1JlY3QpcmVjdCBzaW5nbGVSZWN0czooY29uc3QgTlNSZWN0ICopcmVjdHMgY291bnQ6KE5TSW50 ZWdlciljb3VudAotewotICAgIC8vIElmIGNvdW50ID09IDAgaGVyZSwgdXNlIHRoZSByZWN0IHBh c3NlZCBpbiBmb3IgZHJhd2luZy4gVGhpcyBpcyBhIHdvcmthcm91bmQgZm9yOgotICAgIC8vIDxy ZGFyOi8vcHJvYmxlbS8zOTA4MjgyPiBSRUdSRVNTSU9OIChNYWlsKTogTm8gZHJhZyBpbWFnZSBk cmFnZ2luZyBzZWxlY3RlZCB0ZXh0IGluIEJsb3QgYW5kIE1haWwKLSAgICAvLyBUaGUgcmVhc29u IGZvciB0aGUgd29ya2Fyb3VuZCBpcyB0aGF0IHRoaXMgbWV0aG9kIGlzIGNhbGxlZCBleHBsaWNp dGx5IGZyb20gdGhlIGNvZGUKLSAgICAvLyB0byBnZW5lcmF0ZSBhIGRyYWcgaW1hZ2UsIGFuZCBh dCB0aGF0IHRpbWUsIGdldFJlY3RzQmVpbmdEcmF3bjpjb3VudDogd2lsbCByZXR1cm4gYSB6ZXJv IGNvdW50LgotICAgIGNvbnN0IGludCBjUmVjdFRocmVzaG9sZCA9IDEwOwotICAgIGNvbnN0IGZs b2F0IGNXYXN0ZWRTcGFjZVRocmVzaG9sZCA9IDAuNzVmOwotICAgIEJPT0wgdXNlVW5pb25lZFJl Y3QgPSAoY291bnQgPD0gMSkgfHwgKGNvdW50ID4gY1JlY3RUaHJlc2hvbGQpOwotICAgIGlmICgh dXNlVW5pb25lZFJlY3QpIHsKLSAgICAgICAgLy8gQXR0ZW1wdCB0byBndWVzcyB3aGV0aGVyIG9y IG5vdCB3ZSBzaG91bGQgdXNlIHRoZSB1bmlvbmVkIHJlY3Qgb3IgdGhlIGluZGl2aWR1YWwgcmVj dHMuCi0gICAgICAgIC8vIFdlIGRvIHRoaXMgYnkgY29tcHV0aW5nIHRoZSBwZXJjZW50YWdlIG9m ICJ3YXN0ZWQgc3BhY2UiIGluIHRoZSB1bmlvbi4gIElmIHRoYXQgd2FzdGVkIHNwYWNlCi0gICAg ICAgIC8vIGlzIHRvbyBsYXJnZSwgdGhlbiB3ZSB3aWxsIGRvIGluZGl2aWR1YWwgcmVjdCBwYWlu dGluZyBpbnN0ZWFkLgotICAgICAgICBmbG9hdCB1bmlvblBpeGVscyA9IChyZWN0LnNpemUud2lk dGggKiByZWN0LnNpemUuaGVpZ2h0KTsKLSAgICAgICAgZmxvYXQgc2luZ2xlUGl4ZWxzID0gMDsK LSAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjb3VudDsgKytpKQotICAgICAgICAgICAgc2lu Z2xlUGl4ZWxzICs9IHJlY3RzW2ldLnNpemUud2lkdGggKiByZWN0c1tpXS5zaXplLmhlaWdodDsK LSAgICAgICAgZmxvYXQgd2FzdGVkU3BhY2UgPSAxIC0gKHNpbmdsZVBpeGVscyAvIHVuaW9uUGl4 ZWxzKTsKLSAgICAgICAgaWYgKHdhc3RlZFNwYWNlIDw9IGNXYXN0ZWRTcGFjZVRocmVzaG9sZCkK LSAgICAgICAgICAgIHVzZVVuaW9uZWRSZWN0ID0gWUVTOwotICAgIH0KLSAgICByZXR1cm4gdXNl VW5pb25lZFJlY3Q7Ci19Ci0KLS0gKHZvaWQpZHJhd1NpbmdsZVJlY3Q6KE5TUmVjdClyZWN0Ci17 Ci0gICAgQVNTRVJUKCFfcHJpdmF0ZS0+dXNlc0RvY3VtZW50Vmlld3MpOwotICAgIAotICAgIFtO U0dyYXBoaWNzQ29udGV4dCBzYXZlR3JhcGhpY3NTdGF0ZV07Ci0gICAgTlNSZWN0Q2xpcChyZWN0 KTsKLQotICAgIEB0cnkgewotICAgICAgICBbW3NlbGYgbWFpbkZyYW1lXSBfZHJhd1JlY3Q6cmVj dCBjb250ZW50c09ubHk6Tk9dOwotCi0gICAgICAgIFtbc2VsZiBfVUlEZWxlZ2F0ZUZvcndhcmRl cl0gd2ViVmlldzpzZWxmIGRpZERyYXdSZWN0OnJlY3RdOwotCi0gICAgICAgIGlmIChXZWJOb2Rl SGlnaGxpZ2h0ICpjdXJyZW50SGlnaGxpZ2h0ID0gW3NlbGYgY3VycmVudE5vZGVIaWdobGlnaHRd KQotICAgICAgICAgICAgW2N1cnJlbnRIaWdobGlnaHQgc2V0TmVlZHNVcGRhdGVJblRhcmdldFZp ZXdSZWN0OnJlY3RdOwotCi0gICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCByZXN0b3JlR3JhcGhp Y3NTdGF0ZV07Ci0gICAgfSBAY2F0Y2ggKE5TRXhjZXB0aW9uICpsb2NhbEV4Y2VwdGlvbikgewot ICAgICAgICBbTlNHcmFwaGljc0NvbnRleHQgcmVzdG9yZUdyYXBoaWNzU3RhdGVdOwotICAgICAg ICBMT0dfRVJST1IoIkV4Y2VwdGlvbiBjYXVnaHQgd2hpbGUgZHJhd2luZzogJUAiLCBsb2NhbEV4 Y2VwdGlvbik7Ci0gICAgICAgIFtsb2NhbEV4Y2VwdGlvbiByYWlzZV07Ci0gICAgfQotfQotCi0t IChCT09MKWlzRmxpcHBlZCAKLXsKLSAgICByZXR1cm4gX3ByaXZhdGUgJiYgIV9wcml2YXRlLT51 c2VzRG9jdW1lbnRWaWV3czsKLX0KLQotLSAodm9pZClzZXRGcmFtZVNpemU6KE5TU2l6ZSlzaXpl Ci17Ci0gICAgaWYgKCFfcHJpdmF0ZS0+dXNlc0RvY3VtZW50Vmlld3MgJiYgIU5TRXF1YWxTaXpl cyhfcHJpdmF0ZS0+bGFzdExheW91dFNpemUsIHNpemUpKSB7Ci0gICAgICAgIEZyYW1lKiBmcmFt ZSA9IFtzZWxmIF9tYWluQ29yZUZyYW1lXTsKLSAgICAgICAgLy8gRklYTUU6IFZpZXdsZXNzIFdl YktpdCBpcyBicm9rZW4gd2l0aCBTYWZhcmkgYmFubmVycyAoZS5nLiwgdGhlIEZpbmQgYmFubmVy KS4gIFdlJ2xsIGhhdmUgdG8gZmlndXJlIG91dCBhIHdheSBmb3IKLSAgICAgICAgLy8gU2FmYXJp IHRvIGNvbW11bmljYXRlIHRoYXQgdGhpcyBzcGFjZSBpcyBiZWluZyBjb25zdW1lZC4gIEZvciBX ZWJLaXQgd2l0aCBkb2N1bWVudCB2aWV3cywgdGhlcmUncyBubwotICAgICAgICAvLyBuZWVkIHRv IGRvIGFuIGV4cGxpY2l0IHJlc2l6ZSwgc2luY2UgV2ViRnJhbWVWaWV3cyBoYXZlIGF1dG8gcmVz aXppbmcgdHVybmVkIG9uIGFuZCB3aWxsIGhhbmRsZSBjaGFuZ2luZwotICAgICAgICAvLyB0aGVp ciBib3VuZHMgYXV0b21hdGljYWxseS4gU2VlIDxyZGFyOi8vcHJvYmxlbS82ODM1NTczPiBmb3Ig ZGV0YWlscy4KLSAgICAgICAgZnJhbWUtPnZpZXcoKS0+cmVzaXplKEludFNpemUoc2l6ZSkpOwot ICAgICAgICBmcmFtZS0+dmlldygpLT5zZXROZWVkc0xheW91dCgpOwotICAgICAgICBbc2VsZiBz ZXROZWVkc0Rpc3BsYXk6WUVTXTsKLSAgICAgICAgX3ByaXZhdGUtPmxhc3RMYXlvdXRTaXplID0g c2l6ZTsKLSAgICB9Ci0KLSAgICBbc3VwZXIgc2V0RnJhbWVTaXplOnNpemVdOwotfQotCiAtICh2 b2lkKV92aWV3V2lsbERyYXdJbnRlcm5hbAogewogICAgIEZyYW1lKiBmcmFtZSA9IFtzZWxmIF9t YWluQ29yZUZyYW1lXTsKQEAgLTkyNSwzNCArODQ3LDYgQEAgLSAodm9pZClfdmlld1dpbGxEcmF3 SW50ZXJuYWwKICAgICAgICAgZnJhbWUtPnZpZXcoKS0+dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5l ZWRlZFJlY3Vyc2l2ZSgpOwogfQogCi0tICh2b2lkKXZpZXdXaWxsRHJhdwotewotICAgIGlmICgh X3ByaXZhdGUtPnVzZXNEb2N1bWVudFZpZXdzKQotICAgICAgICBbc2VsZiBfdmlld1dpbGxEcmF3 SW50ZXJuYWxdOwotICAgIFtzdXBlciB2aWV3V2lsbERyYXddOwotfQotCi0KLQotLSAodm9pZClk cmF3UmVjdDooTlNSZWN0KXJlY3QKLXsKLSAgICBpZiAoX3ByaXZhdGUtPnVzZXNEb2N1bWVudFZp ZXdzKQotICAgICAgICByZXR1cm4gW3N1cGVyIGRyYXdSZWN0OnJlY3RdOwotICAgIAotICAgIEFT U0VSVF9NQUlOX1RIUkVBRCgpOwotCi0gICAgY29uc3QgTlNSZWN0ICpyZWN0czsKLSAgICBOU0lu dGVnZXIgY291bnQ7Ci0gICAgW3NlbGYgZ2V0UmVjdHNCZWluZ0RyYXduOiZyZWN0cyBjb3VudDom Y291bnRdOwotCi0gICAgCi0gICAgaWYgKFtzZWxmIF9tdXN0RHJhd1VuaW9uZWRSZWN0OnJlY3Qg c2luZ2xlUmVjdHM6cmVjdHMgY291bnQ6Y291bnRdKQotICAgICAgICBbc2VsZiBkcmF3U2luZ2xl UmVjdDpyZWN0XTsKLSAgICBlbHNlCi0gICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgY291bnQ7 ICsraSkKLSAgICAgICAgICAgIFtzZWxmIGRyYXdTaW5nbGVSZWN0OnJlY3RzW2ldXTsKLX0KLQog KyAoTlNBcnJheSAqKV9zdXBwb3J0ZWRNSU1FVHlwZXMKIHsKICAgICAvLyBMb2FkIHRoZSBwbHVn LWluIERCIGFsbG93aW5nIHBsdWctaW5zIHRvIGluc3RhbGwgdHlwZXMuCkBAIC0yNDgyLDEzICsy Mzc2LDExIEBAIC0gKHZvaWQpX3NldFBvc3RzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ04KIC0gKEJP T0wpX2lzVXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nCiB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKQotICAgIGlmIChfcHJpdmF0ZS0+dXNlc0RvY3VtZW50Vmlld3MpIHsKLSAg ICAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IFtzZWxmIF9tYWluQ29yZUZyYW1lXTsKLSAgICAgICAg Zm9yIChGcmFtZSogZnJhbWUgPSBjb3JlRnJhbWU7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVl KCktPnRyYXZlcnNlTmV4dChjb3JlRnJhbWUpKSB7Ci0gICAgICAgICAgICBOU1ZpZXcgKmRvY3Vt ZW50VmlldyA9IFtba2l0KGZyYW1lKSBmcmFtZVZpZXddIGRvY3VtZW50Vmlld107Ci0gICAgICAg ICAgICBpZiAoW2RvY3VtZW50VmlldyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11d ICYmIFsoV2ViSFRNTFZpZXcgKilkb2N1bWVudFZpZXcgX2lzVXNpbmdBY2NlbGVyYXRlZENvbXBv c2l0aW5nXSkKLSAgICAgICAgICAgICAgICByZXR1cm4gWUVTOwotICAgICAgICB9CisgICAgRnJh bWUqIGNvcmVGcmFtZSA9IFtzZWxmIF9tYWluQ29yZUZyYW1lXTsKKyAgICBmb3IgKEZyYW1lKiBm cmFtZSA9IGNvcmVGcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VO ZXh0KGNvcmVGcmFtZSkpIHsKKyAgICAgICAgTlNWaWV3ICpkb2N1bWVudFZpZXcgPSBbW2tpdChm cmFtZSkgZnJhbWVWaWV3XSBkb2N1bWVudFZpZXddOworICAgICAgICBpZiAoW2RvY3VtZW50Vmll dyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11dICYmIFsoV2ViSFRNTFZpZXcgKilk b2N1bWVudFZpZXcgX2lzVXNpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nXSkKKyAgICAgICAgICAg IHJldHVybiBZRVM7CiAgICAgfQogI2VuZGlmCiAgICAgcmV0dXJuIE5POwpAQCAtMjUxNywxMyAr MjQwOSwxMSBAQCAtICh2b2lkKXNldFZhbGlkYXRpb25NZXNzYWdlVGltZXJNYWduaWZpCiAtIChC T09MKV9pc1NvZnR3YXJlUmVuZGVyYWJsZQogewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykKLSAgICBpZiAoX3ByaXZhdGUtPnVzZXNEb2N1bWVudFZpZXdzKSB7Ci0gICAgICAgIEZy YW1lKiBjb3JlRnJhbWUgPSBbc2VsZiBfbWFpbkNvcmVGcmFtZV07Ci0gICAgICAgIGZvciAoRnJh bWUqIGZyYW1lID0gY29yZUZyYW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2 ZXJzZU5leHQoY29yZUZyYW1lKSkgewotICAgICAgICAgICAgaWYgKEZyYW1lVmlldyogdmlldyA9 IGZyYW1lLT52aWV3KCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoIXZpZXctPmlzU29mdHdhcmVS ZW5kZXJhYmxlKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBOTzsKLSAgICAgICAgICAg IH0KKyAgICBGcmFtZSogY29yZUZyYW1lID0gW3NlbGYgX21haW5Db3JlRnJhbWVdOworICAgIGZv ciAoRnJhbWUqIGZyYW1lID0gY29yZUZyYW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgp LT50cmF2ZXJzZU5leHQoY29yZUZyYW1lKSkgeworICAgICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3 ID0gZnJhbWUtPnZpZXcoKSkgeworICAgICAgICAgICAgaWYgKCF2aWV3LT5pc1NvZnR3YXJlUmVu ZGVyYWJsZSgpKQorICAgICAgICAgICAgICAgIHJldHVybiBOTzsKICAgICAgICAgfQogICAgIH0K ICNlbmRpZgpAQCAtMzE0Miw3ICszMDMyLDcgQEAgLSAoaWQpaW5pdFdpdGhGcmFtZTooTlNSZWN0 KWYgZnJhbWVOYW1lOgogICAgICAgICByZXR1cm4gW1tzZWxmIF93ZWJraXRfaW52b2tlT25NYWlu VGhyZWFkXSBpbml0V2l0aEZyYW1lOmYgZnJhbWVOYW1lOmZyYW1lTmFtZSBncm91cE5hbWU6Z3Jv dXBOYW1lXTsKIAogICAgIFdlYkNvcmVUaHJlYWRWaW9sYXRpb25DaGVja1JvdW5kVHdvKCk7Ci0g ICAgcmV0dXJuIFtzZWxmIF9pbml0V2l0aEZyYW1lOmYgZnJhbWVOYW1lOmZyYW1lTmFtZSBncm91 cE5hbWU6Z3JvdXBOYW1lIHVzZXNEb2N1bWVudFZpZXdzOllFU107CisgICAgcmV0dXJuIFtzZWxm IF9pbml0V2l0aEZyYW1lOmYgZnJhbWVOYW1lOmZyYW1lTmFtZSBncm91cE5hbWU6Z3JvdXBOYW1l XTsKIH0KIAogLSAoaWQpaW5pdFdpdGhDb2RlcjooTlNDb2RlciAqKWRlY29kZXIKQEAgLTMxOTYs NyArMzA4Niw3IEBAIC0gKGlkKWluaXRXaXRoQ29kZXI6KE5TQ29kZXIgKilkZWNvZGVyCiAgICAg ICAgICAgICBwcmVmZXJlbmNlcyA9IG5pbDsKIAogICAgICAgICBMT0coRW5jb2RpbmcsICJGcmFt ZU5hbWUgPSAlQCwgR3JvdXBOYW1lID0gJUAsIHVzZUJhY2tGb3J3YXJkTGlzdCA9ICVkXG4iLCBm cmFtZU5hbWUsIGdyb3VwTmFtZSwgKGludCl1c2VCYWNrRm9yd2FyZExpc3QpOwotICAgICAgICBb cmVzdWx0IF9jb21tb25Jbml0aWFsaXphdGlvbldpdGhGcmFtZU5hbWU6ZnJhbWVOYW1lIGdyb3Vw TmFtZTpncm91cE5hbWUgdXNlc0RvY3VtZW50Vmlld3M6WUVTXTsKKyAgICAgICAgW3Jlc3VsdCBf Y29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYW1lOmZyYW1lTmFtZSBncm91cE5hbWU6Z3Jv dXBOYW1lXTsKICAgICAgICAgc3RhdGljX2Nhc3Q8QmFja0ZvcndhcmRMaXN0SW1wbCo+KFtyZXN1 bHQgcGFnZV0tPmJhY2tGb3J3YXJkTGlzdCgpKS0+c2V0RW5hYmxlZCh1c2VCYWNrRm9yd2FyZExp c3QpOwogICAgICAgICByZXN1bHQtPl9wcml2YXRlLT5hbGxvd3NVbmRvID0gYWxsb3dzVW5kbzsK ICAgICAgICAgaWYgKHByZWZlcmVuY2VzKQpAQCAtNTc2Nyw3ICs1NjU3LDYgQEAgLSAoV2ViRnJh bWVWaWV3ICopX2ZyYW1lVmlld0F0V2luZG93UG9pbgogewogICAgIGlmIChfcHJpdmF0ZS0+Y2xv c2VkKQogICAgICAgICByZXR1cm4gbmlsOwotICAgIEFTU0VSVChfcHJpdmF0ZS0+dXNlc0RvY3Vt ZW50Vmlld3MpOwogICAgIE5TVmlldyAqdmlldyA9IFtzZWxmIGhpdFRlc3Q6W1tzZWxmIHN1cGVy dmlld10gY29udmVydFBvaW50OnBvaW50IGZyb21WaWV3Om5pbF1dOwogICAgIGlmICghW3ZpZXcg aXNEZXNjZW5kYW50T2Y6W1tzZWxmIG1haW5GcmFtZV0gZnJhbWVWaWV3XV0pCiAgICAgICAgIHJl dHVybiBuaWw7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdEYXRhLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3RGF0YS5oCShy ZXZpc2lvbiA5NTQ3MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEu aAkod29ya2luZyBjb3B5KQpAQCAtMTQwLDkgKzE0MCw2IEBAIEBpbnRlcmZhY2UgV2ViVmlld1By aXZhdGUgOiBOU09iamVjdCB7CiAgICAgV2ViQ29yZTo6S2V5Ym9hcmRVSU1vZGUgX2tleWJvYXJk VUlNb2RlOwogCiAgICAgQk9PTCBzaG91bGRVcGRhdGVXaGlsZU9mZnNjcmVlbjsKLSAgICAKLSAg ICAvLyBXaGVuIHRoaXMgZmxhZyBpcyB1bnNldCwgd2Ugd2lsbCBub3QgbWFrZSBhbnkgc3Vidmll d3MgdW5kZXJuZWF0aCB0aGlzIFdlYlZpZXcuICBUaGlzIG1lYW5zIG5vIFdlYkZyYW1lVmlld3Mg YW5kIG5vIFdlYkhUTUxWaWV3cy4KLSAgICBCT09MIHVzZXNEb2N1bWVudFZpZXdzOwogCiAgICAg Qk9PTCBpbmNsdWRlc0ZsYXR0ZW5lZENvbXBvc2l0aW5nTGF5ZXJzV2hlbkRyYXdpbmdUb0JpdG1h cDsKICAgICAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRl LmgJKHJldmlzaW9uIDk1NDE5KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 UHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NjUsOSArNDY1LDYgQEAgQ291bGQgYmUgd29y dGggYWRkaW5nIHRvIHRoZSBBUEkuCiAtICh2b2lkKV9zZXRDdXN0b21IVE1MVG9rZW5pemVyVGlt ZURlbGF5Oihkb3VibGUpdGltZURlbGF5OwogLSAodm9pZClfc2V0Q3VzdG9tSFRNTFRva2VuaXpl ckNodW5rU2l6ZTooaW50KWNodW5rU2l6ZTsKIAotLSAoaWQpX2luaXRXaXRoRnJhbWU6KE5TUmVj dClmIGZyYW1lTmFtZTooTlNTdHJpbmcgKilmcmFtZU5hbWUgZ3JvdXBOYW1lOihOU1N0cmluZyAq KWdyb3VwTmFtZSB1c2VzRG9jdW1lbnRWaWV3czooQk9PTCl1c2VzRG9jdW1lbnRWaWV3czsKLS0g KEJPT0wpX3VzZXNEb2N1bWVudFZpZXdzOwotCiAtICh2b2lkKXNldFNlbGVjdFRyYWlsaW5nV2hp dGVzcGFjZUVuYWJsZWQ6KEJPT0wpZmxhZzsKIC0gKEJPT0wpaXNTZWxlY3RUcmFpbGluZ1doaXRl c3BhY2VFbmFibGVkOwogCg==