132906 2014-05-14 07:17:41 -0700 [CSS Regions] Add ASSERT to make sure using the flowThread cache does not return incorrect results 2014-05-19 01:44:58 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED AdobeTracked P2 Normal --- 132913 57312 1 stavila stavila commit-queue esprehn+autocc glenn kondapallykalyan WebkitBugTracker oldest_to_newest 1009240 0 stavila 2014-05-14 07:17:41 -0700 [CSS Regions] Add ASSERT to make sure using the flowThread cache does not return incorrect results 1009244 1 231448 stavila 2014-05-14 07:23:57 -0700 Created attachment 231448 Patch 1009248 2 231448 abucur 2014-05-14 07:31:49 -0700 Comment on attachment 231448 Patch r=me 1009260 3 231448 commit-queue 2014-05-14 08:39:04 -0700 Comment on attachment 231448 Patch Clearing flags on attachment: 231448 Committed r168837: <http://trac.webkit.org/changeset/168837> 1009261 4 commit-queue 2014-05-14 08:39:07 -0700 All reviewed patches have been landed. Closing bug. 1009285 5 commit-queue 2014-05-14 10:24:24 -0700 Re-opened since this is blocked by bug 132913 1009288 6 ap 2014-05-14 10:26:19 -0700 The assert fires on 6 tests, let's roll out? http://build.webkit.org/results/Apple%20Mavericks%20Debug%20WK2%20(Tests)/r168837%20(4654)/results.html 1009498 7 231499 stavila 2014-05-15 04:31:44 -0700 Created attachment 231499 Patch which applies only to regions Applied assertion only for regions, as multicol still has some issues. Created https://bugs.webkit.org/show_bug.cgi?id=132946 for multicol. 1009603 8 231499 simon.fraser 2014-05-15 12:21:09 -0700 Comment on attachment 231499 Patch which applies only to regions View in context: https://bugs.webkit.org/attachment.cgi?id=231499&action=review > Source/WebCore/rendering/RenderObject.cpp:550 > + // Failing tests when enabling this for multicol: > + // http://build.webkit.org/results/Apple%20Mavericks%20Debug%20WK2%20(Tests)/r168837%20(4654)/results.html I don't think it's useful to put this URL in a comment. Eventually the test results will be purged from the server. This kind of info should go in the bug. > Source/WebCore/rendering/RenderObject.cpp:552 > + ASSERT(flowThread == locateFlowThreadContainingBlockNoCache()); This if() block only contains an assertion. It would be better to make the "if" test part of the assertion so it's compiled out in release. > Source/WebCore/rendering/RenderObject.h:893 > + // This will walk the tree to find the flow thread. Comment seems to be inaccurate if you're in layout. 1009773 9 231577 stavila 2014-05-16 09:23:16 -0700 Created attachment 231577 Patch for landing 1009790 10 231577 commit-queue 2014-05-16 11:26:53 -0700 Comment on attachment 231577 Patch for landing Clearing flags on attachment: 231577 Committed r168971: <http://trac.webkit.org/changeset/168971> 231448 2014-05-14 07:23:57 -0700 2014-05-15 04:31:44 -0700 Patch 132906.patch text/plain 3598 stavila ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzMDllMDZiLi41NDZlNDVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDUtMTQgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgUmVnaW9uc10gQWRkIEFTU0VSVCB0byBtYWtlIHN1cmUgdXNpbmcgdGhlIGZsb3dU aHJlYWQgY2FjaGUgZG9lcyBub3QgcmV0dXJuIGluY29ycmVjdCByZXN1bHRzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBmbG93VGhyZWFkQ29udGFp bmluZ0Jsb2NrKCkgaXMgY2FsbGVkIG9uIGFuIG9iamVjdCB3aGljaCBpcyBpbiBhIGRpZmZlcmVu dAorICAgICAgICBmbG93IHRocmVhZCB0aGFuIHRoZSBvbmUgY3VycmVudGx5IGJlaW5nIGxhaWQg b3V0LCB0aGlzIG1ldGhvZCB3aWxsIHJldHVybiBhbiBpbmNvcnJlY3QKKyAgICAgICAgcmVzdWx0 LiBJIGFkZGVkIGFuIGFzc2VydGlvbiBmb3IgdGhhdCB0byBtYWtlIHN1cmUgd2UgY2F0Y2ggYW5k IHRyZWF0IGFueSBzdWNoIHNjZW5hcmlvcy4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWly ZWQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlck9iamVjdDo6bG9jYXRlRmxvd1RocmVhZENvbnRhaW5pbmdCbG9ja05vQ2Fj aGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojpsb2NhdGVGbG93VGhyZWFkQ29u dGFpbmluZ0Jsb2NrKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisKIDIw MTQtMDUtMTQgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIEdJ RiBhbmltYXRpb25zIGRvbid0IHJlc3RhcnQgYWZ0ZXIgc2Nyb2xsaW5nIG9uIGlPUyBXZWJLaXQx CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDhhM2ZhM2Uu LjBkNzc1YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBA IC01MjIsMTYgKzUyMiwxMCBAQCBzdGF0aWMgYm9vbCBoYXNGaXhlZFBvc0luTmFtZWRGbG93Q29u dGFpbmluZ0Jsb2NrKGNvbnN0IFJlbmRlck9iamVjdCogcmVuZGVyZXIpCiAgICAgcmV0dXJuIGZh bHNlOwogfQogCi1SZW5kZXJGbG93VGhyZWFkKiBSZW5kZXJPYmplY3Q6OmxvY2F0ZUZsb3dUaHJl YWRDb250YWluaW5nQmxvY2soKSBjb25zdAorUmVuZGVyRmxvd1RocmVhZCogUmVuZGVyT2JqZWN0 Ojpsb2NhdGVGbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrTm9DYWNoZSgpIGNvbnN0CiB7CiAgICAg QVNTRVJUKGZsb3dUaHJlYWRTdGF0ZSgpICE9IE5vdEluc2lkZUZsb3dUaHJlYWQpOwogCi0gICAg Ly8gU2VlIGlmIHdlIGhhdmUgdGhlIHRocmVhZCBjYWNoZWQgYmVjYXVzZSB3ZSdyZSBpbiB0aGUg bWlkZGxlIG9mIGxheW91dC4KLSAgICBSZW5kZXJGbG93VGhyZWFkKiBmbG93VGhyZWFkID0gdmll dygpLmZsb3dUaHJlYWRDb250cm9sbGVyKCkuY3VycmVudFJlbmRlckZsb3dUaHJlYWQoKTsKLSAg ICBpZiAoZmxvd1RocmVhZCAmJiAoZmxvd1RocmVhZFN0YXRlKCkgPT0gZmxvd1RocmVhZC0+Zmxv d1RocmVhZFN0YXRlKCkpKQotICAgICAgICByZXR1cm4gZmxvd1RocmVhZDsKLSAgICAKLSAgICAv LyBOb3QgaW4gdGhlIG1pZGRsZSBvZiBsYXlvdXQgc28gaGF2ZSB0byBmaW5kIHRoZSB0aHJlYWQg dGhlIHNsb3cgd2F5LgogICAgIFJlbmRlck9iamVjdCogY3VyciA9IGNvbnN0X2Nhc3Q8UmVuZGVy T2JqZWN0Kj4odGhpcyk7CiAgICAgd2hpbGUgKGN1cnIpIHsKICAgICAgICAgaWYgKGN1cnItPmlz UmVuZGVyRmxvd1RocmVhZCgpKQpAQCAtNTQxLDYgKzUzNSwyMiBAQCBSZW5kZXJGbG93VGhyZWFk KiBSZW5kZXJPYmplY3Q6OmxvY2F0ZUZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSBjb25zdAog ICAgIHJldHVybiAwOwogfQogCitSZW5kZXJGbG93VGhyZWFkKiBSZW5kZXJPYmplY3Q6OmxvY2F0 ZUZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSBjb25zdAoreworICAgIEFTU0VSVChmbG93VGhy ZWFkU3RhdGUoKSAhPSBOb3RJbnNpZGVGbG93VGhyZWFkKTsKKworICAgIC8vIFNlZSBpZiB3ZSBo YXZlIHRoZSB0aHJlYWQgY2FjaGVkIGJlY2F1c2Ugd2UncmUgaW4gdGhlIG1pZGRsZSBvZiBsYXlv dXQuCisgICAgUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCA9IHZpZXcoKS5mbG93VGhyZWFk Q29udHJvbGxlcigpLmN1cnJlbnRSZW5kZXJGbG93VGhyZWFkKCk7CisgICAgaWYgKGZsb3dUaHJl YWQgJiYgKGZsb3dUaHJlYWRTdGF0ZSgpID09IGZsb3dUaHJlYWQtPmZsb3dUaHJlYWRTdGF0ZSgp KSkgeworICAgICAgICAvLyBNYWtlIHN1cmUgdGhlIHNsb3cgcGF0aCB3b3VsZCByZXR1cm4gdGhl IHNhbWUgcmVzdWx0IGFzIG91ciBjYWNoZS4KKyAgICAgICAgQVNTRVJUKGZsb3dUaHJlYWQgPT0g bG9jYXRlRmxvd1RocmVhZENvbnRhaW5pbmdCbG9ja05vQ2FjaGUoKSk7CisgICAgICAgIHJldHVy biBmbG93VGhyZWFkOworICAgIH0KKyAgICAKKyAgICAvLyBOb3QgaW4gdGhlIG1pZGRsZSBvZiBs YXlvdXQgc28gaGF2ZSB0byBmaW5kIHRoZSB0aHJlYWQgdGhlIHNsb3cgd2F5LgorICAgIHJldHVy biBsb2NhdGVGbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrTm9DYWNoZSgpOworfQorCiBSZW5kZXJC bG9jayogUmVuZGVyT2JqZWN0OjpmaXJzdExpbmVCbG9jaygpIGNvbnN0CiB7CiAgICAgcmV0dXJu IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggMDExMmM0Zi4u NjljMTBmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtODg5 LDYgKzg4OSwxMCBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgUmVuZGVyRmxvd1RocmVh ZCogbG9jYXRlRmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpIGNvbnN0OworICAgIAorICAgIC8v IFRoaXMgd2lsbCB3YWxrIHRoZSB0cmVlIHRvIGZpbmQgdGhlIGZsb3cgdGhyZWFkLgorICAgIFJl bmRlckZsb3dUaHJlYWQqIGxvY2F0ZUZsb3dUaHJlYWRDb250YWluaW5nQmxvY2tOb0NhY2hlKCkg Y29uc3Q7CisgICAgCiAgICAgdm9pZCByZW1vdmVGcm9tUmVuZGVyRmxvd1RocmVhZCgpOwogICAg IHZvaWQgcmVtb3ZlRnJvbVJlbmRlckZsb3dUaHJlYWRSZWN1cnNpdmUoUmVuZGVyRmxvd1RocmVh ZCopOwogCg== 231499 2014-05-15 04:31:44 -0700 2014-05-15 12:21:09 -0700 Patch which applies only to regions 132906.patch text/plain 4199 stavila ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNzVhMGZmLi42YzNlZjk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTQtMDUtMTUgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgUmVnaW9uc10gQWRkIEFTU0VSVCB0byBtYWtlIHN1cmUgdXNpbmcgdGhlIGZsb3dU aHJlYWQgY2FjaGUgZG9lcyBub3QgcmV0dXJuIGluY29ycmVjdCByZXN1bHRzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBmbG93VGhyZWFkQ29udGFp bmluZ0Jsb2NrKCkgaXMgY2FsbGVkIG9uIGFuIG9iamVjdCB3aGljaCBpcyBpbiBhIGRpZmZlcmVu dAorICAgICAgICBmbG93IHRocmVhZCB0aGFuIHRoZSBvbmUgY3VycmVudGx5IGJlaW5nIGxhaWQg b3V0LCB0aGlzIG1ldGhvZCB3aWxsIHJldHVybiBhbiBpbmNvcnJlY3QKKyAgICAgICAgcmVzdWx0 LiBJIGFkZGVkIGFuIGFzc2VydGlvbiBmb3IgdGhhdCB0byBtYWtlIHN1cmUgd2UgY2F0Y2ggYW5k IHRyZWF0IGFueSBzdWNoIHNjZW5hcmlvcy4KKyAgICAgICAgRm9yIHRoZSBtb21lbnQsIHRoaXMg YXNzZXJ0aW9uIGlzIG9ubHkgdmFsaWRhdGVkIGZvciByZWdpb25zLCBhcyBtdWx0aWNvbCBzdGls bCBoYXMgc29tZSBpc3N1ZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHJlcXVpcmVkLgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJPYmplY3Q6OmxvY2F0ZUZsb3dUaHJlYWRDb250YWluaW5nQmxvY2tOb0NhY2hlKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6bG9jYXRlRmxvd1RocmVhZENvbnRhaW5pbmdC bG9jayk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorCiAyMDE0LTA1LTE1 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBDb21waWxlIGFsbCBpbnN0YWxsZWQgcmVzb3VyY2VzIGFzIEdSZXNvdXJjZXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggOGEzZmEzZS4uZDJjYTgx ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTUyMiwx NiArNTIyLDEwIEBAIHN0YXRpYyBib29sIGhhc0ZpeGVkUG9zSW5OYW1lZEZsb3dDb250YWluaW5n QmxvY2soY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKLVJlbmRlckZsb3dUaHJlYWQqIFJlbmRlck9iamVjdDo6bG9jYXRlRmxvd1RocmVhZENvbnRh aW5pbmdCbG9jaygpIGNvbnN0CitSZW5kZXJGbG93VGhyZWFkKiBSZW5kZXJPYmplY3Q6OmxvY2F0 ZUZsb3dUaHJlYWRDb250YWluaW5nQmxvY2tOb0NhY2hlKCkgY29uc3QKIHsKICAgICBBU1NFUlQo Zmxvd1RocmVhZFN0YXRlKCkgIT0gTm90SW5zaWRlRmxvd1RocmVhZCk7CiAKLSAgICAvLyBTZWUg aWYgd2UgaGF2ZSB0aGUgdGhyZWFkIGNhY2hlZCBiZWNhdXNlIHdlJ3JlIGluIHRoZSBtaWRkbGUg b2YgbGF5b3V0LgotICAgIFJlbmRlckZsb3dUaHJlYWQqIGZsb3dUaHJlYWQgPSB2aWV3KCkuZmxv d1RocmVhZENvbnRyb2xsZXIoKS5jdXJyZW50UmVuZGVyRmxvd1RocmVhZCgpOwotICAgIGlmIChm bG93VGhyZWFkICYmIChmbG93VGhyZWFkU3RhdGUoKSA9PSBmbG93VGhyZWFkLT5mbG93VGhyZWFk U3RhdGUoKSkpCi0gICAgICAgIHJldHVybiBmbG93VGhyZWFkOwotICAgIAotICAgIC8vIE5vdCBp biB0aGUgbWlkZGxlIG9mIGxheW91dCBzbyBoYXZlIHRvIGZpbmQgdGhlIHRocmVhZCB0aGUgc2xv dyB3YXkuCiAgICAgUmVuZGVyT2JqZWN0KiBjdXJyID0gY29uc3RfY2FzdDxSZW5kZXJPYmplY3Qq Pih0aGlzKTsKICAgICB3aGlsZSAoY3VycikgewogICAgICAgICBpZiAoY3Vyci0+aXNSZW5kZXJG bG93VGhyZWFkKCkpCkBAIC01NDEsNiArNTM1LDMwIEBAIFJlbmRlckZsb3dUaHJlYWQqIFJlbmRl ck9iamVjdDo6bG9jYXRlRmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpIGNvbnN0CiAgICAgcmV0 dXJuIDA7CiB9CiAKK1JlbmRlckZsb3dUaHJlYWQqIFJlbmRlck9iamVjdDo6bG9jYXRlRmxvd1Ro cmVhZENvbnRhaW5pbmdCbG9jaygpIGNvbnN0Cit7CisgICAgQVNTRVJUKGZsb3dUaHJlYWRTdGF0 ZSgpICE9IE5vdEluc2lkZUZsb3dUaHJlYWQpOworCisgICAgLy8gU2VlIGlmIHdlIGhhdmUgdGhl IHRocmVhZCBjYWNoZWQgYmVjYXVzZSB3ZSdyZSBpbiB0aGUgbWlkZGxlIG9mIGxheW91dC4KKyAg ICBSZW5kZXJGbG93VGhyZWFkKiBmbG93VGhyZWFkID0gdmlldygpLmZsb3dUaHJlYWRDb250cm9s bGVyKCkuY3VycmVudFJlbmRlckZsb3dUaHJlYWQoKTsKKyAgICBpZiAoZmxvd1RocmVhZCAmJiAo Zmxvd1RocmVhZFN0YXRlKCkgPT0gZmxvd1RocmVhZC0+Zmxvd1RocmVhZFN0YXRlKCkpKSB7Cisg ICAgICAgIC8vIE1ha2Ugc3VyZSB0aGUgc2xvdyBwYXRoIHdvdWxkIHJldHVybiB0aGUgc2FtZSBy ZXN1bHQgYXMgb3VyIGNhY2hlLgorICAgICAgICBpZiAoZmxvd1RocmVhZC0+aXNSZW5kZXJOYW1l ZEZsb3dUaHJlYWQoKSkgeworICAgICAgICAgICAgLy8gRklYTUU6IEZvciB0aGUgbW9tZW50LCBv bmx5IGFwcGx5IHRoaXMgYXNzZXJ0aW9uIHRvIHJlZ2lvbnMsIGFzIG11bHRpY29sCisgICAgICAg ICAgICAvLyBzdGlsbCBoYXMgc29tZSBpc3N1ZXMgYW5kIHRyaWdnZXJzIHRoaXMgYXNzZXJ0Lgor ICAgICAgICAgICAgLy8gRmFpbGluZyB0ZXN0cyB3aGVuIGVuYWJsaW5nIHRoaXMgZm9yIG11bHRp Y29sOgorICAgICAgICAgICAgLy8gaHR0cDovL2J1aWxkLndlYmtpdC5vcmcvcmVzdWx0cy9BcHBs ZSUyME1hdmVyaWNrcyUyMERlYnVnJTIwV0syJTIwKFRlc3RzKS9yMTY4ODM3JTIwKDQ2NTQpL3Jl c3VsdHMuaHRtbAorICAgICAgICAgICAgLy8gQ3JlYXRlZCBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTQ2IGZvciB0aGlzIGlzc3VlLgorICAgICAgICAgICAgQVNT RVJUKGZsb3dUaHJlYWQgPT0gbG9jYXRlRmxvd1RocmVhZENvbnRhaW5pbmdCbG9ja05vQ2FjaGUo KSk7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gZmxvd1RocmVhZDsKKyAgICB9CisgICAg CisgICAgLy8gTm90IGluIHRoZSBtaWRkbGUgb2YgbGF5b3V0IHNvIGhhdmUgdG8gZmluZCB0aGUg dGhyZWFkIHRoZSBzbG93IHdheS4KKyAgICByZXR1cm4gbG9jYXRlRmxvd1RocmVhZENvbnRhaW5p bmdCbG9ja05vQ2FjaGUoKTsKK30KKwogUmVuZGVyQmxvY2sqIFJlbmRlck9iamVjdDo6Zmlyc3RM aW5lQmxvY2soKSBjb25zdAogewogICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oCmluZGV4IDAxMTJjNGYuLjY5YzEwZmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTg4OSw2ICs4ODksMTAgQEAgcHJvdGVjdGVkOgog CiBwcml2YXRlOgogICAgIFJlbmRlckZsb3dUaHJlYWQqIGxvY2F0ZUZsb3dUaHJlYWRDb250YWlu aW5nQmxvY2soKSBjb25zdDsKKyAgICAKKyAgICAvLyBUaGlzIHdpbGwgd2FsayB0aGUgdHJlZSB0 byBmaW5kIHRoZSBmbG93IHRocmVhZC4KKyAgICBSZW5kZXJGbG93VGhyZWFkKiBsb2NhdGVGbG93 VGhyZWFkQ29udGFpbmluZ0Jsb2NrTm9DYWNoZSgpIGNvbnN0OworICAgIAogICAgIHZvaWQgcmVt b3ZlRnJvbVJlbmRlckZsb3dUaHJlYWQoKTsKICAgICB2b2lkIHJlbW92ZUZyb21SZW5kZXJGbG93 VGhyZWFkUmVjdXJzaXZlKFJlbmRlckZsb3dUaHJlYWQqKTsKIAo= 231577 2014-05-16 09:23:16 -0700 2014-05-16 11:26:53 -0700 Patch for landing 132906.patch text/plain 3916 stavila ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NGQzYjI0Li4zNGYzZDJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTQtMDUtMTUgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgUmVnaW9uc10gQWRkIEFTU0VSVCB0byBtYWtlIHN1cmUgdXNpbmcgdGhlIGZsb3dU aHJlYWQgY2FjaGUgZG9lcyBub3QgcmV0dXJuIGluY29ycmVjdCByZXN1bHRzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5MDYKKworICAgICAgICBS ZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgSWYgZmxvd1RocmVhZENvbnRhaW5p bmdCbG9jaygpIGlzIGNhbGxlZCBvbiBhbiBvYmplY3Qgd2hpY2ggaXMgaW4gYSBkaWZmZXJlbnQK KyAgICAgICAgZmxvdyB0aHJlYWQgdGhhbiB0aGUgb25lIGN1cnJlbnRseSBiZWluZyBsYWlkIG91 dCwgdGhpcyBtZXRob2Qgd2lsbCByZXR1cm4gYW4gaW5jb3JyZWN0CisgICAgICAgIHJlc3VsdC4g SSBhZGRlZCBhbiBhc3NlcnRpb24gZm9yIHRoYXQgdG8gbWFrZSBzdXJlIHdlIGNhdGNoIGFuZCB0 cmVhdCBhbnkgc3VjaCBzY2VuYXJpb3MuCisgICAgICAgIEZvciB0aGUgbW9tZW50LCB0aGlzIGFz c2VydGlvbiBpcyBvbmx5IHZhbGlkYXRlZCBmb3IgcmVnaW9ucywgYXMgbXVsdGljb2wgc3RpbGwg aGFzIHNvbWUgaXNzdWVzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyByZXF1aXJlZC4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyT2JqZWN0Ojpsb2NhdGVGbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrTm9DYWNoZSk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmxvY2F0ZUZsb3dUaHJlYWRDb250YWluaW5nQmxv Y2spOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKwogMjAxNC0wNS0xNiAg QW5kcmVpIEJ1Y3VyICA8YWJ1Y3VyQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNd IFJlZHVjZSB0aGUgUmVuZGVyUmVnaW9uIGludmFzaXZlbmVzcyBpbiByZW5kZXJpbmcgY29kZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAyNWJmNzU5Li4x MjZlZjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAt NTIzLDE2ICs1MjMsMTAgQEAgc3RhdGljIGJvb2wgaGFzRml4ZWRQb3NJbk5hbWVkRmxvd0NvbnRh aW5pbmdCbG9jayhjb25zdCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogICAgIHJldHVybiBmYWxz ZTsKIH0KIAotUmVuZGVyRmxvd1RocmVhZCogUmVuZGVyT2JqZWN0Ojpsb2NhdGVGbG93VGhyZWFk Q29udGFpbmluZ0Jsb2NrKCkgY29uc3QKK1JlbmRlckZsb3dUaHJlYWQqIFJlbmRlck9iamVjdDo6 bG9jYXRlRmxvd1RocmVhZENvbnRhaW5pbmdCbG9ja05vQ2FjaGUoKSBjb25zdAogewogICAgIEFT U0VSVChmbG93VGhyZWFkU3RhdGUoKSAhPSBOb3RJbnNpZGVGbG93VGhyZWFkKTsKIAotICAgIC8v IFNlZSBpZiB3ZSBoYXZlIHRoZSB0aHJlYWQgY2FjaGVkIGJlY2F1c2Ugd2UncmUgaW4gdGhlIG1p ZGRsZSBvZiBsYXlvdXQuCi0gICAgUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCA9IHZpZXco KS5mbG93VGhyZWFkQ29udHJvbGxlcigpLmN1cnJlbnRSZW5kZXJGbG93VGhyZWFkKCk7Ci0gICAg aWYgKGZsb3dUaHJlYWQgJiYgKGZsb3dUaHJlYWRTdGF0ZSgpID09IGZsb3dUaHJlYWQtPmZsb3dU aHJlYWRTdGF0ZSgpKSkKLSAgICAgICAgcmV0dXJuIGZsb3dUaHJlYWQ7Ci0gICAgCi0gICAgLy8g Tm90IGluIHRoZSBtaWRkbGUgb2YgbGF5b3V0IHNvIGhhdmUgdG8gZmluZCB0aGUgdGhyZWFkIHRo ZSBzbG93IHdheS4KICAgICBSZW5kZXJPYmplY3QqIGN1cnIgPSBjb25zdF9jYXN0PFJlbmRlck9i amVjdCo+KHRoaXMpOwogICAgIHdoaWxlIChjdXJyKSB7CiAgICAgICAgIGlmIChjdXJyLT5pc1Jl bmRlckZsb3dUaHJlYWQoKSkKQEAgLTU0Miw2ICs1MzYsMjUgQEAgUmVuZGVyRmxvd1RocmVhZCog UmVuZGVyT2JqZWN0Ojpsb2NhdGVGbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCkgY29uc3QKICAg ICByZXR1cm4gMDsKIH0KIAorUmVuZGVyRmxvd1RocmVhZCogUmVuZGVyT2JqZWN0Ojpsb2NhdGVG bG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCkgY29uc3QKK3sKKyAgICBBU1NFUlQoZmxvd1RocmVh ZFN0YXRlKCkgIT0gTm90SW5zaWRlRmxvd1RocmVhZCk7CisKKyAgICAvLyBTZWUgaWYgd2UgaGF2 ZSB0aGUgdGhyZWFkIGNhY2hlZCBiZWNhdXNlIHdlJ3JlIGluIHRoZSBtaWRkbGUgb2YgbGF5b3V0 LgorICAgIFJlbmRlckZsb3dUaHJlYWQqIGZsb3dUaHJlYWQgPSB2aWV3KCkuZmxvd1RocmVhZENv bnRyb2xsZXIoKS5jdXJyZW50UmVuZGVyRmxvd1RocmVhZCgpOworICAgIGlmIChmbG93VGhyZWFk ICYmIChmbG93VGhyZWFkU3RhdGUoKSA9PSBmbG93VGhyZWFkLT5mbG93VGhyZWFkU3RhdGUoKSkp IHsKKyAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSBzbG93IHBhdGggd291bGQgcmV0dXJuIHRoZSBz YW1lIHJlc3VsdCBhcyBvdXIgY2FjaGUuCisgICAgICAgIC8vIEZJWE1FOiBGb3IgdGhlIG1vbWVu dCwgb25seSBhcHBseSB0aGlzIGFzc2VydGlvbiB0byByZWdpb25zLCBhcyBtdWx0aWNvbAorICAg ICAgICAvLyBzdGlsbCBoYXMgc29tZSBpc3N1ZXMgYW5kIHRyaWdnZXJzIHRoaXMgYXNzZXJ0Lgor ICAgICAgICAvLyBDcmVhdGVkIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzI5NDYgZm9yIHRoaXMgaXNzdWUuCisgICAgICAgIEFTU0VSVCghZmxvd1RocmVhZC0+aXNS ZW5kZXJOYW1lZEZsb3dUaHJlYWQoKSB8fCBmbG93VGhyZWFkID09IGxvY2F0ZUZsb3dUaHJlYWRD b250YWluaW5nQmxvY2tOb0NhY2hlKCkpOworICAgICAgICByZXR1cm4gZmxvd1RocmVhZDsKKyAg ICB9CisgICAgCisgICAgLy8gTm90IGluIHRoZSBtaWRkbGUgb2YgbGF5b3V0IHNvIGhhdmUgdG8g ZmluZCB0aGUgdGhyZWFkIHRoZSBzbG93IHdheS4KKyAgICByZXR1cm4gbG9jYXRlRmxvd1RocmVh ZENvbnRhaW5pbmdCbG9ja05vQ2FjaGUoKTsKK30KKwogUmVuZGVyQmxvY2sqIFJlbmRlck9iamVj dDo6Zmlyc3RMaW5lQmxvY2soKSBjb25zdAogewogICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IGI4MDA0YjYuLjU5YzdkZTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTg5MSw2ICs4OTEsOCBAQCBwcm90 ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgUmVuZGVyRmxvd1RocmVhZCogbG9jYXRlRmxvd1RocmVh ZENvbnRhaW5pbmdCbG9jaygpIGNvbnN0OworICAgIFJlbmRlckZsb3dUaHJlYWQqIGxvY2F0ZUZs b3dUaHJlYWRDb250YWluaW5nQmxvY2tOb0NhY2hlKCkgY29uc3Q7CisgICAgCiAgICAgdm9pZCBy ZW1vdmVGcm9tUmVuZGVyRmxvd1RocmVhZCgpOwogICAgIHZvaWQgcmVtb3ZlRnJvbVJlbmRlckZs b3dUaHJlYWRSZWN1cnNpdmUoUmVuZGVyRmxvd1RocmVhZCopOwogCg==