131574 2014-04-11 16:57:28 -0700 Lots of compositing test failures after r167152 2014-04-14 08:43:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton benjamin burg commit-queue esprehn+autocc glenn kondapallykalyan sergio simon.fraser oldest_to_newest 1000119 0 thorton 2014-04-11 16:57:28 -0700 Because of the extra empty layer in the tree. 1000120 1 229181 thorton 2014-04-11 16:58:57 -0700 Created attachment 229181 as-yet untested patch waiting on a build at the moment 1000130 2 229184 thorton 2014-04-11 17:27:35 -0700 Created attachment 229184 patch 1000139 3 229188 thorton 2014-04-11 17:49:06 -0700 Created attachment 229188 patch 1000146 4 thorton 2014-04-11 18:26:18 -0700 http://trac.webkit.org/changeset/167177 1000372 5 benjamin 2014-04-13 20:54:33 -0700 The tree is still red, can you please have a look? 1000402 6 thorton 2014-04-13 23:25:27 -0700 Wat, fixed the majority but there's one left? That is bizarre... I will look right away. 1000417 7 thorton 2014-04-14 00:13:18 -0700 Reopening to fix the one remaining failure. 1000420 8 thorton 2014-04-14 00:24:57 -0700 If we have a layer, skip one of its children, then want its grandchildren listed in its children's place, we won't correctly skip any grandchildren that want skipping. This mechanism (my fault in the first place, from many months ago) is a bit flawed. Will fix. 1000421 9 229268 thorton 2014-04-14 00:42:33 -0700 Created attachment 229268 part 2 1000491 10 229268 darin 2014-04-14 08:36:22 -0700 Comment on attachment 229268 part 2 View in context: https://bugs.webkit.org/attachment.cgi?id=229268&action=review > Source/WebCore/platform/graphics/GraphicsLayer.cpp:596 > + for (size_t childIndex = 0; childIndex < children.size(); childIndex++) { > + GraphicsLayer* child = children[childIndex]; This should use a C++11 for loop: for (auto* child : children) { 1000494 11 thorton 2014-04-14 08:43:10 -0700 http://trac.webkit.org/changeset/167246 229181 2014-04-11 16:58:57 -0700 2014-04-11 17:27:35 -0700 as-yet untested patch dumps.diff text/plain 2396 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYmQ0NTgwLi5jMjYxZTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTQtMDQtMTEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgTG90cyBvZiBjb21wb3NpdGluZyB0ZXN0IGZhaWx1cmVzIGFmdGVyIHIxNjcxNTIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTU3NAor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnNob3VsZFNraXBMYXllckluRHVtcCk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkb2N1bWVudE92ZXJsYXlSb290TGF5ZXIpOgorICAg ICAgICBTa2lwIHRoZSBkb2N1bWVudC1yZWxhdGl2ZSBwYWdlIG92ZXJsYXkgcm9vdCBsYXllciBp biBsYXllciB0cmVlIGR1bXBzLAorICAgICAgICBmb3IgY29uc2lzdGVuY3kgYmV0d2VlbiBwbGF0 Zm9ybXMuCisKKzIwMTQtMDQtMTEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CisKICAgICAgICAgW2lPUyBXZWJLaXQyXSBGaW5kLWluLXBhZ2UgaW5kaWNhdG9yCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE1MTAKICAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTQ3Nzc3PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCBlOGUzOTg0Li4zYWExMDJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtMjI4 OCw3ICsyMjg4LDE0IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjppc1RyYWNraW5nUmVwYWlu dHMoKSBjb25zdAogYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnNob3VsZFNraXBMYXllckluRHVt cChjb25zdCBHcmFwaGljc0xheWVyKiBsYXllcikgY29uc3QKIHsKICAgICAvLyBTa2lwIHRoZSBy b290IHRpbGUgY2FjaGUncyBmbGF0dGVuaW5nIGxheWVyLgotICAgIHJldHVybiBtX2lzTWFpbkZy YW1lUmVuZGVyVmlld0xheWVyICYmIGxheWVyICYmIGxheWVyID09IG1fY2hpbGRDb250YWlubWVu dExheWVyLmdldCgpOworICAgIGlmIChtX2lzTWFpbkZyYW1lUmVuZGVyVmlld0xheWVyICYmIGxh eWVyICYmIGxheWVyID09IG1fY2hpbGRDb250YWlubWVudExheWVyLmdldCgpKQorICAgICAgICBy ZXR1cm4gdHJ1ZTsKKworICAgIC8vIFNraXAgdGhlIGRvY3VtZW50LXJlbGF0aXZlIHBhZ2Ugb3Zl cmxheSByb290IGxheWVyLgorICAgIGlmIChsYXllciAmJiBsYXllciA9PSBjb21wb3NpdG9yKCku ZG9jdW1lbnRPdmVybGF5Um9vdExheWVyKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAg cmV0dXJuIGZhbHNlOwogfQogCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6c2hvdWxkRHVtcFBy b3BlcnR5Rm9yTGF5ZXIoY29uc3QgR3JhcGhpY3NMYXllciogbGF5ZXIsIGNvbnN0IGNoYXIqIHBy b3BlcnR5TmFtZSkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuaAppbmRleCAyMDgyMDZhLi4yNThiMGQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0zMDUsNiArMzA1 LDcgQEAgcHVibGljOgogICAgIENvbG9yIHJvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpIGNv bnN0IHsgcmV0dXJuIG1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENvbG9yOyB9CiAKICAgICB2b2lk IHNldERvY3VtZW50T3ZlcmxheVJvb3RMYXllcihHcmFwaGljc0xheWVyKik7CisgICAgR3JhcGhp Y3NMYXllciogZG9jdW1lbnRPdmVybGF5Um9vdExheWVyKCkgY29uc3QgeyByZXR1cm4gbV9kb2N1 bWVudE92ZXJsYXlSb290TGF5ZXI7IH0KIAogcHJpdmF0ZToKICAgICBjbGFzcyBPdmVybGFwTWFw Owo= 229184 2014-04-11 17:27:35 -0700 2014-04-11 17:49:06 -0700 patch dumps.diff text/plain 1604 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0YzQwYTQ4Li5lMmFjNWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTQtMDQtMTEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgTG90cyBvZiBjb21wb3NpdGluZyB0ZXN0IGZhaWx1cmVzIGFmdGVyIHIxNjcxNTIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTU3NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5Q29udHJvbGxlci5oOgorICAgICAgICBTa2lwIHBhZ2Ug b3ZlcmxheSBsYXllcnMgaW4gbGF5ZXIgdHJlZSBkdW1wcywgZm9yIGNvbnNpc3RlbmN5IGJldHdl ZW4gcGxhdGZvcm1zLgorCisyMDE0LTA0LTExICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgorCiAgICAgICAgIFtpT1MgV2ViS2l0Ml0gRmluZC1pbi1wYWdlIGluZGljYXRv cgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNTEw CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjU0Nzc3Nz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaAppbmRl eCAwYTg3NzZmLi5mMDRiNzI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5Q29udHJvbGxlci5oCkBAIC04NCw2ICs4NCw3IEBA IHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHBhaW50Q29udGVudHMoY29uc3QgV2ViQ29yZTo6 R3JhcGhpY3NMYXllciosIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJQYWludGluZ1BoYXNlLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGNsaXBSZWN0 KSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgY29uc3Qg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbW1pdENoYW5nZXNGb3JMYXllcihjb25z dCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKikgY29uc3Qgb3ZlcnJpZGUgeyB9CisgICAgdmlydHVh bCBib29sIHNob3VsZFNraXBMYXllckluRHVtcChjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVy KikgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgc3RkOjp1bmlxdWVfcHRy PFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI+IG1fZG9jdW1lbnRPdmVybGF5Um9vdExheWVyOwogICAg IHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpHcmFwaGljc0xheWVyPiBtX3ZpZXdPdmVybGF5Um9v dExheWVyOwo= 229188 2014-04-11 17:49:06 -0700 2014-04-11 18:07:28 -0700 patch dumps.diff text/plain 3231 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYmQ0NTgwLi5hMWQ1MDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTQtMDQtMTEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgTG90cyBvZiBjb21wb3NpdGluZyB0ZXN0IGZhaWx1cmVzIGFmdGVyIHIxNjcxNTIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTU3NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyOjpkdW1wUHJvcGVydGllcyk6CisgICAgICAgIFdlIHdlcmUgYXNraW5nIHRoZSBwYXJl bnQncyBjbGllbnQgd2hldGhlciB0aGUgY2hpbGQgc2hvdWxkIGJlIGR1bXBlZCwKKyAgICAgICAg YnV0IHJlYWxseSB0aGUgY2hpbGQncyBjbGllbnQgaXMgdGhlIG9uZSB3aG8gc2hvdWxkIGRlY2lk ZS4KKworMjAxNC0wNC0xMSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K KwogICAgICAgICBbaU9TIFdlYktpdDJdIEZpbmQtaW4tcGFnZSBpbmRpY2F0b3IKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTUxMAogICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTY1NDc3Nzc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IDBmZTg4ZDYuLjI0NzJhZjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3Bw CkBAIC03NTcsNyArNzU3LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyOjpkdW1wUHJvcGVydGllcyhU ZXh0U3RyZWFtJiB0cywgaW50IGluZGVudCwgTGF5ZXJUcmVlQXNUZXh0QmUKICAgICAgICAgdW5z aWduZWQgdG90YWxDaGlsZENvdW50ID0gbV9jaGlsZHJlbi5zaXplKCk7CiAgICAgICAgIGZvciAo c2l6ZV90IGNoaWxkSW5kZXggPSAwOyBjaGlsZEluZGV4IDwgbV9jaGlsZHJlbi5zaXplKCk7IGNo aWxkSW5kZXgrKykgewogICAgICAgICAgICAgR3JhcGhpY3NMYXllciogY2hpbGQgPSBtX2NoaWxk cmVuW2NoaWxkSW5kZXhdOwotICAgICAgICAgICAgaWYgKCFtX2NsaWVudC0+c2hvdWxkU2tpcExh eWVySW5EdW1wKGNoaWxkKSkgeworICAgICAgICAgICAgaWYgKCFjaGlsZC0+Y2xpZW50KCktPnNo b3VsZFNraXBMYXllckluRHVtcChjaGlsZCkpIHsKICAgICAgICAgICAgICAgICBjaGlsZC0+ZHVt cExheWVyKGNoaWxkcmVuU3RyZWFtLCBpbmRlbnQgKyAyLCBiZWhhdmlvcik7CiAgICAgICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGM0MGE0OC4uZTJh YzVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDE0LTA0LTExICBUaW0gSG9ydG9u ICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCisgICAgICAgIExvdHMgb2YgY29tcG9zaXRp bmcgdGVzdCBmYWlsdXJlcyBhZnRlciByMTY3MTUyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE1NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheUNv bnRyb2xsZXIuaDoKKyAgICAgICAgU2tpcCBwYWdlIG92ZXJsYXkgbGF5ZXJzIGluIGxheWVyIHRy ZWUgZHVtcHMsIGZvciBjb25zaXN0ZW5jeSBiZXR3ZWVuIHBsYXRmb3Jtcy4KKworMjAxNC0wNC0x MSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9T IFdlYktpdDJdIEZpbmQtaW4tcGFnZSBpbmRpY2F0b3IKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTUxMAogICAgICAgICA8cmRhcjovL3Byb2JsZW0v MTY1NDc3Nzc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv UGFnZU92ZXJsYXlDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmgKaW5kZXggMGE4Nzc2Zi4uZjA0YjcyNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5Q29udHJv bGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zlcmxh eUNvbnRyb2xsZXIuaApAQCAtODQsNiArODQsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBwYWludENvbnRlbnRzKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqLCBXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQmLCBXZWJDb3JlOjpHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFzZSwgY29u c3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBjbGlwUmVjdCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBm bG9hdCBkZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9p ZCBkaWRDb21taXRDaGFuZ2VzRm9yTGF5ZXIoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciop IGNvbnN0IG92ZXJyaWRlIHsgfQorICAgIHZpcnR1YWwgYm9vbCBzaG91bGRTa2lwTGF5ZXJJbkR1 bXAoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciopIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJu IHRydWU7IH0KIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpHcmFwaGljc0xheWVyPiBt X2RvY3VtZW50T3ZlcmxheVJvb3RMYXllcjsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6 R3JhcGhpY3NMYXllcj4gbV92aWV3T3ZlcmxheVJvb3RMYXllcjsK 229268 2014-04-14 00:42:33 -0700 2014-04-14 08:36:21 -0700 part 2 dump.diff text/plain 2972 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzYmQ2ZDQ2Li44ZDJjNzRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTQtMDQtMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTG90cyBvZiBjb21wb3NpdGluZyB0ZXN0IGZhaWx1cmVzIGFmdGVyIHIxNjcxNTIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTU3NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkdW1wQ2hp bGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6ZHVtcFByb3BlcnRpZXMp OgorICAgICAgICBNYWtlIGNoaWxkLWR1bXBpbmcgcmVjdXJzaXZlIHNvIHRoYXQgd2UgY2FuIGVh c2lseSBza2lwIGxheWVycyB1cCB0byBhbnkgZGVwdGguCisKIDIwMTQtMDQtMTIgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSB1bmlxdWVfcHRyIGZvciBGaWxs TGF5ZXI6Om1fbmV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0xheWVyLmNwcAppbmRleCAyNDcyYWY2Li41NDMxMzUwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcApAQCAtNTg5LDYg KzU4OSwyMSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXI6OmR1bXBMYXllcihUZXh0U3RyZWFtJiB0cywg aW50IGluZGVudCwgTGF5ZXJUcmVlQXNUZXh0QmVoYXZpbwogICAgIHRzIDw8ICIpXG4iOwogfQog CitzdGF0aWMgdm9pZCBkdW1wQ2hpbGRyZW4oVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFZlY3RvcjxH cmFwaGljc0xheWVyKj4mIGNoaWxkcmVuLCB1bnNpZ25lZCYgdG90YWxDaGlsZENvdW50LCBpbnQg aW5kZW50LCBMYXllclRyZWVBc1RleHRCZWhhdmlvciBiZWhhdmlvcikKK3sKKyAgICB0b3RhbENo aWxkQ291bnQgKz0gY2hpbGRyZW4uc2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGNoaWxkSW5kZXgg PSAwOyBjaGlsZEluZGV4IDwgY2hpbGRyZW4uc2l6ZSgpOyBjaGlsZEluZGV4KyspIHsKKyAgICAg ICAgR3JhcGhpY3NMYXllciogY2hpbGQgPSBjaGlsZHJlbltjaGlsZEluZGV4XTsKKyAgICAgICAg aWYgKCFjaGlsZC0+Y2xpZW50KCktPnNob3VsZFNraXBMYXllckluRHVtcChjaGlsZCkpIHsKKyAg ICAgICAgICAgIGNoaWxkLT5kdW1wTGF5ZXIodHMsIGluZGVudCArIDIsIGJlaGF2aW9yKTsKKyAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgdG90YWxDaGlsZENvdW50 LS07CisgICAgICAgIGR1bXBDaGlsZHJlbih0cywgY2hpbGQtPmNoaWxkcmVuKCksIHRvdGFsQ2hp bGRDb3VudCwgaW5kZW50LCBiZWhhdmlvcik7CisgICAgfQorfQorCiB2b2lkIEdyYXBoaWNzTGF5 ZXI6OmR1bXBQcm9wZXJ0aWVzKFRleHRTdHJlYW0mIHRzLCBpbnQgaW5kZW50LCBMYXllclRyZWVB c1RleHRCZWhhdmlvciBiZWhhdmlvcikgY29uc3QKIHsKICAgICBpZiAobV9wb3NpdGlvbiAhPSBG bG9hdFBvaW50KCkpIHsKQEAgLTc1NCwxOSArNzY5LDkgQEAgdm9pZCBHcmFwaGljc0xheWVyOjpk dW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgaW50IGluZGVudCwgTGF5ZXJUcmVlQXNUZXh0 QmUKICAgICAKICAgICBpZiAobV9jaGlsZHJlbi5zaXplKCkpIHsKICAgICAgICAgVGV4dFN0cmVh bSBjaGlsZHJlblN0cmVhbTsKLSAgICAgICAgdW5zaWduZWQgdG90YWxDaGlsZENvdW50ID0gbV9j aGlsZHJlbi5zaXplKCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGNoaWxkSW5kZXggPSAwOyBjaGls ZEluZGV4IDwgbV9jaGlsZHJlbi5zaXplKCk7IGNoaWxkSW5kZXgrKykgewotICAgICAgICAgICAg R3JhcGhpY3NMYXllciogY2hpbGQgPSBtX2NoaWxkcmVuW2NoaWxkSW5kZXhdOwotICAgICAgICAg ICAgaWYgKCFjaGlsZC0+Y2xpZW50KCktPnNob3VsZFNraXBMYXllckluRHVtcChjaGlsZCkpIHsK LSAgICAgICAgICAgICAgICBjaGlsZC0+ZHVtcExheWVyKGNoaWxkcmVuU3RyZWFtLCBpbmRlbnQg KyAyLCBiZWhhdmlvcik7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9 Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyKj4m IGdyYW5kQ2hpbGRyZW4gPSBjaGlsZC0+Y2hpbGRyZW4oKTsKLSAgICAgICAgICAgIHRvdGFsQ2hp bGRDb3VudCArPSBncmFuZENoaWxkcmVuLnNpemUoKSAtIDE7Ci0gICAgICAgICAgICBmb3IgKHNp emVfdCBncmFuZENoaWxkSW5kZXggPSAwOyBncmFuZENoaWxkSW5kZXggPCBncmFuZENoaWxkcmVu LnNpemUoKTsgZ3JhbmRDaGlsZEluZGV4KyspCi0gICAgICAgICAgICAgICAgZ3JhbmRDaGlsZHJl bltncmFuZENoaWxkSW5kZXhdLT5kdW1wTGF5ZXIoY2hpbGRyZW5TdHJlYW0sIGluZGVudCArIDIs IGJlaGF2aW9yKTsKLSAgICAgICAgfQorCisgICAgICAgIHVuc2lnbmVkIHRvdGFsQ2hpbGRDb3Vu dCA9IDA7CisgICAgICAgIGR1bXBDaGlsZHJlbihjaGlsZHJlblN0cmVhbSwgbV9jaGlsZHJlbiwg dG90YWxDaGlsZENvdW50LCBpbmRlbnQsIGJlaGF2aW9yKTsKIAogICAgICAgICB3cml0ZUluZGVu dChjaGlsZHJlblN0cmVhbSwgaW5kZW50ICsgMSk7CiAgICAgICAgIGNoaWxkcmVuU3RyZWFtIDw8 ICIpXG4iOwo=