85392 2012-05-02 11:18:21 -0700 Fix usage of layout types in platform code 2012-05-02 13:29:17 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric leviw rakuco webkit.review.bot oldest_to_newest 614461 0 eae 2012-05-02 11:18:21 -0700 Fix usage of layout types in platform code 614468 1 139843 eae 2012-05-02 11:25:25 -0700 Created attachment 139843 Patch 614486 2 139843 eric 2012-05-02 11:45:31 -0700 Comment on attachment 139843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139843&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:552 > + return enclosingIntRect(m_layerTransform.combined().inverse().clampedBoundsOfProjectedQuad(FloatQuad(FloatRect(m_webGraphicsLayerClient->visibleContentsRect())))); Longest line ever. :) I'm surprised the FloatRect() constructor is needed for this. Maybe even the FloatQuad() one is implicit too? > Source/WebKit/chromium/src/WebHitTestResult.cpp:50 > + return WebPoint(roundedIntPoint(m_private->localPoint())); Does WebPoint not implicitly construct from IntPoint? > Source/WebKit/chromium/src/WebSurroundingText.cpp:49 > + VisiblePosition visiblePosition(node->renderer()->positionForPoint(static_cast<IntPoint>(hitTestInfo.localPoint()))); Does .flooredPoint() not exist? static_cast seems like an odd way to do this. 614489 3 eae 2012-05-02 11:49:11 -0700 (In reply to comment #2) > (From update of attachment 139843 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=139843&action=review > > > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:552 > > + return enclosingIntRect(m_layerTransform.combined().inverse().clampedBoundsOfProjectedQuad(FloatQuad(FloatRect(m_webGraphicsLayerClient->visibleContentsRect())))); > > Longest line ever. :) I'm surprised the FloatRect() constructor is needed for this. Maybe even the FloatQuad() one is implicit too? Was needed to avoid ambiguous type errors. > > > Source/WebKit/chromium/src/WebHitTestResult.cpp:50 > > + return WebPoint(roundedIntPoint(m_private->localPoint())); > > Does WebPoint not implicitly construct from IntPoint? It should but again there might be ambiguity. This really seems like it should work without it though. > > Source/WebKit/chromium/src/WebSurroundingText.cpp:49 > > + VisiblePosition visiblePosition(node->renderer()->positionForPoint(static_cast<IntPoint>(hitTestInfo.localPoint()))); > > Does .flooredPoint() not exist? static_cast seems like an odd way to do this. The static_cast is not used to floor the value, it is used to convert the WebPoint to an IntPoint (as the implicit conversion gets confused by the multiple available conversion paths). I described this in the ChangeLog, let me know if you'd like me to also add a comment to that effect. 614545 4 139861 eae 2012-05-02 12:45:09 -0700 Created attachment 139861 Patch for landing 614603 5 139861 webkit.review.bot 2012-05-02 13:29:00 -0700 Comment on attachment 139861 Patch for landing Clearing flags on attachment: 139861 Committed r115877: <http://trac.webkit.org/changeset/115877> 614604 6 webkit.review.bot 2012-05-02 13:29:17 -0700 All reviewed patches have been landed. Closing bug. 139843 2012-05-02 11:25:25 -0700 2012-05-02 12:44:57 -0700 Patch bug-85392-20120502112524.patch text/plain 8157 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTg1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA1LTAyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggdXNhZ2Ugb2YgbGF5b3V0 IHR5cGVzIGluIHBsYXRmb3JtIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg1MzkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4K KworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2 ZW50SGFuZGxlcjo6aGFuZGxlR2VzdHVyZVRhcCk6CisgICAgICAgIFVzZSByb3VuZGVkIHBvaW50 IGZvciBnZXN0dXJlcyBhcyBldmVudCBoYW5kbGluZyBpcyBzdGlsbCBtb3N0bHkgaW50IGJhc2Vk LgorCiAyMDEyLTA1LTAyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1RLXSBDb21waWxhdGlvbiB3YXJuaW5ncyBpbiBSZW5kZXJUaGVtZQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkocmV2aXNpb24gMTE1Nzg3KQorKysg U291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NDQzLDcgKzI0NDMsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlR2VzdHVyZVRhcChjb25z CiAjZW5kaWYKICAgICAvLyBGSVhNRTogUmVmYWN0b3IgdG8gYXZvaWQgaGl0IHRlc3RpbmcgbXVs dGlwbGUgdGltZXMgKHRoaXMgaXMgb25seSBhbiBpbnRlcmltIHN0ZXApLgogICAgIGlmIChwcmVU YXJnZXRlZE5vZGUpCi0gICAgICAgIGFkanVzdGVkUG9pbnQgPSBwcmVUYXJnZXRlZE5vZGUtPmdl dFJlY3QoKS5jZW50ZXIoKTsKKyAgICAgICAgYWRqdXN0ZWRQb2ludCA9IHByZVRhcmdldGVkTm9k ZS0+Z2V0UGl4ZWxTbmFwcGVkUmVjdCgpLmNlbnRlcigpOwogCiAgICAgYm9vbCBkZWZhdWx0UHJl dmVudGVkID0gZmFsc2U7CiAgICAgUGxhdGZvcm1Nb3VzZUV2ZW50IGZha2VNb3VzZU1vdmUoYWRq dXN0ZWRQb2ludCwgZ2VzdHVyZUV2ZW50Lmdsb2JhbFBvc2l0aW9uKCksIE5vQnV0dG9uLCBQbGF0 Zm9ybUV2ZW50OjpNb3VzZU1vdmVkLCAvKiBjbGlja0NvdW50ICovIDEsIGdlc3R1cmVFdmVudC5z aGlmdEtleSgpLCBnZXN0dXJlRXZlbnQuY3RybEtleSgpLCBnZXN0dXJlRXZlbnQuYWx0S2V5KCks IGdlc3R1cmVFdmVudC5tZXRhS2V5KCksIGdlc3R1cmVFdmVudC50aW1lc3RhbXAoKSk7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCShyZXZpc2lvbiAxMTU4NTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wNS0wMiAgRW1pbCBBIEVrbHVu ZCAgPGVhZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IHVzYWdlIG9mIGxheW91dCB0eXBl cyBpbiBwbGF0Zm9ybSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NTM5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnRpbGVkQmFja2luZ1N0b3Jl VmlzaWJsZVJlY3QpOgorICAgICAgICBVc2UgZW5jbG9zaW5nSW50UmVjdCB0byBjb252ZXJ0IHZp c2libGUgcmVjdCBmb3IgdHJhbnNmb3JtIHJlc3VsdHMgdG8KKyAgICAgICAgbGluZSB1cCB3aXRo IGRldmljZSBwaXhlbHMuCisgICAgICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZWRpdG9yU3RhdGUpOgorICAg ICAgICBVc2UgcGl4ZWxTbmFwcGVkIHJlY3QgZm9yIGVkaXRvciByZWN0IGNhbGN1bGF0aW9uIGFz IGl0IHJlcHJlc2VudHMgYQorICAgICAgICBkZXZpY2UgY29vcmRpbmF0ZS4KKwogMjAxMi0wNS0w MiAgTWFoZXNoIEt1bGthcm5pICA8bWFoZXNoLmt1bGthcm5pQG5va2lhLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLiBCdWlsZCBmaXggZm9yIFF0IHBvcnQgb24gbWFjLgpJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkdyYXBoaWNzTGF5ZXIuY3BwCShyZXZpc2lvbiAxMTU3ODcpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01NDksNyArNTQ5LDcgQEAgSW50UmVjdCBXZWJHcmFwaGljc0xheWVyOjp0aWxlZEJh Y2tpbmdTdAogICAgIC8vIFJldHVybiBhIHByb2plY3Rpb24gb2YgdGhlIHZpc2libGUgcmVjdCAo c3VyZmFjZSBjb29yZGluYXRlcykgb250byB0aGUgbGF5ZXIncyBwbGFuZSAobGF5ZXIgY29vcmRp bmF0ZXMpLgogICAgIC8vIFRoZSByZXN1bHRpbmcgcXVhZCBtaWdodCBiZSBzcXVld2VkIGFuZCB0 aGUgdmlzaWJsZSByZWN0IGlzIHRoZSBib3VuZGluZyBib3ggb2YgdGhpcyBxdWFkLAogICAgIC8v IHNvIGl0IG1pZ2h0IHNwcmVhZCBmdXJ0aGVyIHRoYW4gdGhlIHJlYWwgdmlzaWJsZSBhcmVhIChh bmQgdGhlbiBldmVuIG1vcmUgYW1wbGlmaWVkIGJ5IHRoZSBjb3ZlciByZWN0IG11bHRpcGxpZXIp LgotICAgIHJldHVybiBtX2xheWVyVHJhbnNmb3JtLmNvbWJpbmVkKCkuaW52ZXJzZSgpLmNsYW1w ZWRCb3VuZHNPZlByb2plY3RlZFF1YWQoRmxvYXRRdWFkKEZsb2F0UmVjdChtX3dlYkdyYXBoaWNz TGF5ZXJDbGllbnQtPnZpc2libGVDb250ZW50c1JlY3QoKSkpKTsKKyAgICByZXR1cm4gZW5jbG9z aW5nSW50UmVjdChtX2xheWVyVHJhbnNmb3JtLmNvbWJpbmVkKCkuaW52ZXJzZSgpLmNsYW1wZWRC b3VuZHNPZlByb2plY3RlZFF1YWQoRmxvYXRRdWFkKEZsb2F0UmVjdChtX3dlYkdyYXBoaWNzTGF5 ZXJDbGllbnQtPnZpc2libGVDb250ZW50c1JlY3QoKSkpKSk7CiB9CiAKIENvbG9yIFdlYkdyYXBo aWNzTGF5ZXI6OnRpbGVkQmFja2luZ1N0b3JlQmFja2dyb3VuZENvbG9yKCkgY29uc3QKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlz aW9uIDExNTc4NykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUxLDcgKzQ1MSw3IEBAIEVkaXRvclN0YXRlIFdlYlBh Z2U6OmVkaXRvclN0YXRlKCkgY29uc3QKICAgICB9CiAKICAgICBpZiAoc2VsZWN0aW9uUm9vdCkK LSAgICAgICAgcmVzdWx0LmVkaXRvclJlY3QgPSBmcmFtZS0+dmlldygpLT5jb250ZW50c1RvV2lu ZG93KHNlbGVjdGlvblJvb3QtPmdldFJlY3QoKSk7CisgICAgICAgIHJlc3VsdC5lZGl0b3JSZWN0 ID0gZnJhbWUtPnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhzZWxlY3Rpb25Sb290LT5nZXRQaXhl bFNuYXBwZWRSZWN0KCkpOwogCiAgICAgUmVmUHRyPFJhbmdlPiByYW5nZTsKICAgICBpZiAocmVz dWx0Lmhhc0NvbXBvc2l0aW9uICYmIChyYW5nZSA9IGZyYW1lLT5lZGl0b3IoKS0+Y29tcG9zaXRp b25SYW5nZSgpKSkgewpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEx NTg1MykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMDIgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21p dW0ub3JnPgorCisgICAgICAgIEZpeCB1c2FnZSBvZiBsYXlvdXQgdHlwZXMgaW4gcGxhdGZvcm0g Y29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUz OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNy Yy9XZWJIaXRUZXN0UmVzdWx0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSGl0VGVzdFJlc3Vs dDo6bG9jYWxQb2ludCk6CisgICAgICAgICogc3JjL1dlYlN1cnJvdW5kaW5nVGV4dC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlN1cnJvdW5kaW5nVGV4dDo6aW5pdGlhbGl6ZSk6CisgICAgICAg IEV4cGxpY2l0bHkgY2FzdCBXZWJQb2ludCB0byBJbnRQb2ludCB0byBhdm9pZCBhbWJpZ3VvdXMg Y29udmVyc2lvbiBlcnJvci4gICAgICAgCisKIDIwMTItMDUtMDIgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVHlwZUVycm9y OiBDYW5ub3QgY2FsbCBtZXRob2QgJ2NyZWF0ZUxpdmVMb2NhdGlvbicgb2YgdW5kZWZpbmVkCklu ZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIaXRUZXN0UmVzdWx0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIaXRUZXN0UmVzdWx0LmNw cAkocmV2aXNpb24gMTE1Nzg3KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGl0 VGVzdFJlc3VsdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgV2ViTm9kZSBX ZWJIaXRUZXN0UmVzdWx0Ojpub2RlKCkgY29uc3QKIAogV2ViUG9pbnQgV2ViSGl0VGVzdFJlc3Vs dDo6bG9jYWxQb2ludCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFdlYlBvaW50KG1fcHJpdmF0ZS0+ bG9jYWxQb2ludCgpKTsKKyAgICByZXR1cm4gV2ViUG9pbnQocm91bmRlZEludFBvaW50KG1fcHJp dmF0ZS0+bG9jYWxQb2ludCgpKSk7CiB9CiAKIFdlYkhpdFRlc3RSZXN1bHQ6OldlYkhpdFRlc3RS ZXN1bHQoY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWx0KQpJbmRleDogU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViU3Vycm91bmRpbmdUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTdXJyb3VuZGluZ1RleHQuY3BwCShyZXZpc2lvbiAxMTU3 ODcpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTdXJyb3VuZGluZ1RleHQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIHZvaWQgV2ViU3Vycm91bmRpbmdUZXh0 Ojppbml0aWFsaXplKGNvbnMKICAgICBpZiAoIW5vZGUgfHwgIW5vZGUtPnJlbmRlcmVyKCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb24obm9k ZS0+cmVuZGVyZXIoKS0+cG9zaXRpb25Gb3JQb2ludChoaXRUZXN0SW5mby5sb2NhbFBvaW50KCkp KTsKKyAgICBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uKG5vZGUtPnJlbmRlcmVyKCkt PnBvc2l0aW9uRm9yUG9pbnQoc3RhdGljX2Nhc3Q8SW50UG9pbnQ+KGhpdFRlc3RJbmZvLmxvY2Fs UG9pbnQoKSkpKTsKICAgICBpZiAodmlzaWJsZVBvc2l0aW9uLmlzTnVsbCgpKQogICAgICAgICBy ZXR1cm47CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTg1MykKKysrIFNvdXJj ZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisy MDEyLTA1LTAyICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBG aXggdXNhZ2Ugb2YgbGF5b3V0IHR5cGVzIGluIHBsYXRmb3JtIGNvZGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MzkyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBld2svZXdrX2ZyYW1lLmNwcDoKKyAg ICAgICAgKGV3a19mcmFtZV9mb2N1c2VkX2VsZW1lbnRfZ2VvbWV0cnlfZ2V0KToKKyAgICAgICAg KiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YSk6Cisg ICAgICAgIChld2tfdmlld19zY2FsZV9zZXQpOgorCiAyMDEyLTA1LTAyICBNaWtoYWlsIFBvemRu eWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdIEh5 cGVybGluayBhdWRpdGluZyBld2tfdmlldyBzZXR0aW5nCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX2ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX2ZyYW1lLmNwcAkocmV2aXNpb24gMTE1Nzg3KQorKysgU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a19mcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg2MSw3ICs4NjEsNyBAQCBFaW5hX0Jv b2wgZXdrX2ZyYW1lX2ZvY3VzZWRfZWxlbWVudF9nZW9tCiAgICAgV2ViQ29yZTo6Tm9kZSogZm9j dXNlZE5vZGUgPSBkb2N1bWVudC0+Zm9jdXNlZE5vZGUoKTsKICAgICBpZiAoIWZvY3VzZWROb2Rl KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgV2ViQ29yZTo6SW50UmVjdCBub2RlUmVjdCA9 IGZvY3VzZWROb2RlLT5nZXRSZWN0KCk7CisgICAgV2ViQ29yZTo6SW50UmVjdCBub2RlUmVjdCA9 IGZvY3VzZWROb2RlLT5nZXRQaXhlbFNuYXBwZWRSZWN0KCk7CiAgICAgaWYgKHgpCiAgICAgICAg ICp4ID0gbm9kZVJlY3QueCgpOwogICAgIGlmICh5KQpJbmRleDogU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a192aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuY3BwCShyZXZpc2lvbiAxMTU3ODcpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjc3LDcgKzE2NzcsNyBAQCBFaW5hX0Jvb2wg ZXdrX3ZpZXdfc2NhbGVfc2V0KEV2YXNfT2JqZWN0CiAgICAgaWYgKGN1cnJlbnRTY2FsZUZhY3Rv ciA9PSAtMSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcHJpdi0+cGFnZS0+c2V0UGFn ZVNjYWxlRmFjdG9yKHNjYWxlRmFjdG9yLCBXZWJDb3JlOjpMYXlvdXRQb2ludChzY3JvbGxYLCBz Y3JvbGxZKSk7CisgICAgcHJpdi0+cGFnZS0+c2V0UGFnZVNjYWxlRmFjdG9yKHNjYWxlRmFjdG9y LCBXZWJDb3JlOjpJbnRQb2ludChzY3JvbGxYLCBzY3JvbGxZKSk7CiAgICAgcmV0dXJuIHRydWU7 CiB9CiAK 139861 2012-05-02 12:45:09 -0700 2012-05-02 13:28:59 -0700 Patch for landing bug-85392-20120502124508.patch text/plain 8190 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTg2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA1LTAyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggdXNhZ2Ugb2YgbGF5b3V0 IHR5cGVzIGluIHBsYXRmb3JtIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg1MzkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKwor ICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50 SGFuZGxlcjo6aGFuZGxlR2VzdHVyZVRhcCk6CisgICAgICAgIFVzZSByb3VuZGVkIHBvaW50IGZv ciBnZXN0dXJlcyBhcyBldmVudCBoYW5kbGluZyBpcyBzdGlsbCBtb3N0bHkgaW50IGJhc2VkLgor CiAyMDEyLTA1LTAyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBNb3ZlIHRpdGxlIGFuZCBtZWRpYSBxdWVyaWVzIGZyb20gU3R5bGVTaGVldEludGVybmFsIHRv IENTU1N0eWxlU2hlZXQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHJl dmlzaW9uIDExNTg2MykKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjQ0Myw3ICsyNDQzLDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6Omhh bmRsZUdlc3R1cmVUYXAoY29ucwogI2VuZGlmCiAgICAgLy8gRklYTUU6IFJlZmFjdG9yIHRvIGF2 b2lkIGhpdCB0ZXN0aW5nIG11bHRpcGxlIHRpbWVzICh0aGlzIGlzIG9ubHkgYW4gaW50ZXJpbSBz dGVwKS4KICAgICBpZiAocHJlVGFyZ2V0ZWROb2RlKQotICAgICAgICBhZGp1c3RlZFBvaW50ID0g cHJlVGFyZ2V0ZWROb2RlLT5nZXRSZWN0KCkuY2VudGVyKCk7CisgICAgICAgIGFkanVzdGVkUG9p bnQgPSBwcmVUYXJnZXRlZE5vZGUtPmdldFBpeGVsU25hcHBlZFJlY3QoKS5jZW50ZXIoKTsKIAog ICAgIGJvb2wgZGVmYXVsdFByZXZlbnRlZCA9IGZhbHNlOwogICAgIFBsYXRmb3JtTW91c2VFdmVu dCBmYWtlTW91c2VNb3ZlKGFkanVzdGVkUG9pbnQsIGdlc3R1cmVFdmVudC5nbG9iYWxQb3NpdGlv bigpLCBOb0J1dHRvbiwgUGxhdGZvcm1FdmVudDo6TW91c2VNb3ZlZCwgLyogY2xpY2tDb3VudCAq LyAxLCBnZXN0dXJlRXZlbnQuc2hpZnRLZXkoKSwgZ2VzdHVyZUV2ZW50LmN0cmxLZXkoKSwgZ2Vz dHVyZUV2ZW50LmFsdEtleSgpLCBnZXN0dXJlRXZlbnQubWV0YUtleSgpLCBnZXN0dXJlRXZlbnQu dGltZXN0YW1wKCkpOwpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTE1ODYzKQorKysgU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTIt MDUtMDIgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCB1 c2FnZSBvZiBsYXlvdXQgdHlwZXMgaW4gcGxhdGZvcm0gY29kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUzOTIKKworICAgICAgICBSZXZpZXdlZCBi eSBFcmljIFNlaWRlbC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi R3JhcGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjp0 aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KToKKyAgICAgICAgVXNlIGVuY2xvc2luZ0ludFJl Y3QgdG8gY29udmVydCB2aXNpYmxlIHJlY3QgZm9yIHRyYW5zZm9ybSByZXN1bHRzIHRvCisgICAg ICAgIGxpbmUgdXAgd2l0aCBkZXZpY2UgcGl4ZWxzLgorICAgICAgICAKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmVk aXRvclN0YXRlKToKKyAgICAgICAgVXNlIHBpeGVsU25hcHBlZCByZWN0IGZvciBlZGl0b3IgcmVj dCBjYWxjdWxhdGlvbiBhcyBpdCByZXByZXNlbnRzIGEKKyAgICAgICAgZGV2aWNlIGNvb3JkaW5h dGUuCisKIDIwMTItMDUtMDIgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9r aWEuY29tPgogCiAgICAgICAgIFJldmVydCByMTE1MTkxIC0gIk1ha2UgdGhlIHdlYiB2aWV3J3Mg dXJsIHByb3BlcnR5IGZvbGxvdyB0aGUgYWN0aXZlIHVybCIKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGlj c0xheWVyLmNwcAkocmV2aXNpb24gMTE1ODYzKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTgyLDcgKzU4Miw3IEBAIEludFJlY3QgV2ViR3JhcGhpY3NMYXllcjo6dGlsZWRCYWNraW5nU3QK ICAgICAvLyBSZXR1cm4gYSBwcm9qZWN0aW9uIG9mIHRoZSB2aXNpYmxlIHJlY3QgKHN1cmZhY2Ug Y29vcmRpbmF0ZXMpIG9udG8gdGhlIGxheWVyJ3MgcGxhbmUgKGxheWVyIGNvb3JkaW5hdGVzKS4K ICAgICAvLyBUaGUgcmVzdWx0aW5nIHF1YWQgbWlnaHQgYmUgc3F1ZXdlZCBhbmQgdGhlIHZpc2li bGUgcmVjdCBpcyB0aGUgYm91bmRpbmcgYm94IG9mIHRoaXMgcXVhZCwKICAgICAvLyBzbyBpdCBt aWdodCBzcHJlYWQgZnVydGhlciB0aGFuIHRoZSByZWFsIHZpc2libGUgYXJlYSAoYW5kIHRoZW4g ZXZlbiBtb3JlIGFtcGxpZmllZCBieSB0aGUgY292ZXIgcmVjdCBtdWx0aXBsaWVyKS4KLSAgICBy ZXR1cm4gbV9sYXllclRyYW5zZm9ybS5jb21iaW5lZCgpLmludmVyc2UoKS5jbGFtcGVkQm91bmRz T2ZQcm9qZWN0ZWRRdWFkKEZsb2F0UXVhZChGbG9hdFJlY3QobV93ZWJHcmFwaGljc0xheWVyQ2xp ZW50LT52aXNpYmxlQ29udGVudHNSZWN0KCkpKSk7CisgICAgcmV0dXJuIGVuY2xvc2luZ0ludFJl Y3QobV9sYXllclRyYW5zZm9ybS5jb21iaW5lZCgpLmludmVyc2UoKS5jbGFtcGVkQm91bmRzT2ZQ cm9qZWN0ZWRRdWFkKEZsb2F0UXVhZChGbG9hdFJlY3QobV93ZWJHcmFwaGljc0xheWVyQ2xpZW50 LT52aXNpYmxlQ29udGVudHNSZWN0KCkpKSkpOwogfQogCiBDb2xvciBXZWJHcmFwaGljc0xheWVy Ojp0aWxlZEJhY2tpbmdTdG9yZUJhY2tncm91bmRDb2xvcigpIGNvbnN0CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxMTU4 NjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ1OSw3ICs0NTksNyBAQCBFZGl0b3JTdGF0ZSBXZWJQYWdlOjplZGl0 b3JTdGF0ZSgpIGNvbnN0CiAgICAgfQogCiAgICAgaWYgKHNlbGVjdGlvblJvb3QpCi0gICAgICAg IHJlc3VsdC5lZGl0b3JSZWN0ID0gZnJhbWUtPnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhzZWxl Y3Rpb25Sb290LT5nZXRSZWN0KCkpOworICAgICAgICByZXN1bHQuZWRpdG9yUmVjdCA9IGZyYW1l LT52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3coc2VsZWN0aW9uUm9vdC0+Z2V0UGl4ZWxTbmFwcGVk UmVjdCgpKTsKIAogICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2U7CiAgICAgaWYgKHJlc3VsdC5oYXND b21wb3NpdGlvbiAmJiAocmFuZ2UgPSBmcmFtZS0+ZWRpdG9yKCktPmNvbXBvc2l0aW9uUmFuZ2Uo KSkpIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTU4NjMpCisr KyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDEyLTA1LTAyICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4K KworICAgICAgICBGaXggdXNhZ2Ugb2YgbGF5b3V0IHR5cGVzIGluIHBsYXRmb3JtIGNvZGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MzkyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgKiBzcmMvV2ViSGl0VGVz dFJlc3VsdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkhpdFRlc3RSZXN1bHQ6OmxvY2FsUG9p bnQpOgorICAgICAgICAqIHNyYy9XZWJTdXJyb3VuZGluZ1RleHQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJTdXJyb3VuZGluZ1RleHQ6OmluaXRpYWxpemUpOgorICAgICAgICBFeHBsaWNpdGx5 IGNhc3QgV2ViUG9pbnQgdG8gSW50UG9pbnQgdG8gYXZvaWQgYW1iaWd1b3VzIGNvbnZlcnNpb24g ZXJyb3IuICAgICAgIAorCiAyMDEyLTA1LTAyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFR5cGVFcnJvcjogQ2Fubm90IGNh bGwgbWV0aG9kICdjcmVhdGVMaXZlTG9jYXRpb24nIG9mIHVuZGVmaW5lZApJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGl0VGVzdFJlc3VsdC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGl0VGVzdFJlc3VsdC5jcHAJKHJldmlzaW9u IDExNTg2MykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkhpdFRlc3RSZXN1bHQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw3IEBAIFdlYk5vZGUgV2ViSGl0VGVzdFJl c3VsdDo6bm9kZSgpIGNvbnN0CiAKIFdlYlBvaW50IFdlYkhpdFRlc3RSZXN1bHQ6OmxvY2FsUG9p bnQoKSBjb25zdAogewotICAgIHJldHVybiBXZWJQb2ludChtX3ByaXZhdGUtPmxvY2FsUG9pbnQo KSk7CisgICAgcmV0dXJuIHJvdW5kZWRJbnRQb2ludChtX3ByaXZhdGUtPmxvY2FsUG9pbnQoKSk7 CiB9CiAKIFdlYkhpdFRlc3RSZXN1bHQ6OldlYkhpdFRlc3RSZXN1bHQoY29uc3QgSGl0VGVzdFJl c3VsdCYgcmVzdWx0KQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU3Vycm91 bmRpbmdUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJTdXJyb3VuZGluZ1RleHQuY3BwCShyZXZpc2lvbiAxMTU4NjMpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJTdXJyb3VuZGluZ1RleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 Niw3ICs0Niw3IEBAIHZvaWQgV2ViU3Vycm91bmRpbmdUZXh0Ojppbml0aWFsaXplKGNvbnMKICAg ICBpZiAoIW5vZGUgfHwgIW5vZGUtPnJlbmRlcmVyKCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb24obm9kZS0+cmVuZGVyZXIoKS0+cG9zaXRp b25Gb3JQb2ludChoaXRUZXN0SW5mby5sb2NhbFBvaW50KCkpKTsKKyAgICBWaXNpYmxlUG9zaXRp b24gdmlzaWJsZVBvc2l0aW9uKG5vZGUtPnJlbmRlcmVyKCktPnBvc2l0aW9uRm9yUG9pbnQoc3Rh dGljX2Nhc3Q8SW50UG9pbnQ+KGhpdFRlc3RJbmZvLmxvY2FsUG9pbnQoKSkpKTsKICAgICBpZiAo dmlzaWJsZVBvc2l0aW9uLmlzTnVsbCgpKQogICAgICAgICByZXR1cm47CiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9D aGFuZ2VMb2cJKHJldmlzaW9uIDExNTg2MykKKysrIFNvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA1LTAyICBFbWlsIEEgRWts dW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggdXNhZ2Ugb2YgbGF5b3V0IHR5 cGVzIGluIHBsYXRmb3JtIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg1MzkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisK KyAgICAgICAgKiBld2svZXdrX2ZyYW1lLmNwcDoKKyAgICAgICAgKGV3a19mcmFtZV9mb2N1c2Vk X2VsZW1lbnRfZ2VvbWV0cnlfZ2V0KToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAg ICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YSk6CisgICAgICAgIChld2tfdmlld19zY2FsZV9z ZXQpOgorCiAyMDEyLTA1LTAyICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFr b3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdIEh5cGVybGluayBhdWRpdGluZyBld2tfdmll dyBzZXR0aW5nCkluZGV4OiBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAkocmV2aXNpb24g MTE1ODYzKQorKysgU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTg2MSw3ICs4NjEsNyBAQCBFaW5hX0Jvb2wgZXdrX2ZyYW1lX2ZvY3VzZWRfZWxl bWVudF9nZW9tCiAgICAgV2ViQ29yZTo6Tm9kZSogZm9jdXNlZE5vZGUgPSBkb2N1bWVudC0+Zm9j dXNlZE5vZGUoKTsKICAgICBpZiAoIWZvY3VzZWROb2RlKQogICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgV2ViQ29yZTo6SW50UmVjdCBub2RlUmVjdCA9IGZvY3VzZWROb2RlLT5nZXRSZWN0KCk7 CisgICAgV2ViQ29yZTo6SW50UmVjdCBub2RlUmVjdCA9IGZvY3VzZWROb2RlLT5nZXRQaXhlbFNu YXBwZWRSZWN0KCk7CiAgICAgaWYgKHgpCiAgICAgICAgICp4ID0gbm9kZVJlY3QueCgpOwogICAg IGlmICh5KQpJbmRleDogU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCShyZXZpc2lvbiAxMTU4 NjMpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNjg5LDcgKzE2ODksNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2NhbGVfc2V0KEV2YXNf T2JqZWN0CiAgICAgaWYgKGN1cnJlbnRTY2FsZUZhY3RvciA9PSAtMSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgcHJpdi0+cGFnZS0+c2V0UGFnZVNjYWxlRmFjdG9yKHNjYWxlRmFjdG9y LCBXZWJDb3JlOjpMYXlvdXRQb2ludChzY3JvbGxYLCBzY3JvbGxZKSk7CisgICAgcHJpdi0+cGFn ZS0+c2V0UGFnZVNjYWxlRmFjdG9yKHNjYWxlRmFjdG9yLCBXZWJDb3JlOjpJbnRQb2ludChzY3Jv bGxYLCBzY3JvbGxZKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAK