79139 2012-02-21 12:20:25 -0800 CCLayerTreeHostImpl calls didDraw more frequently than willDraw 2012-02-22 13:00:17 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P1 Normal --- 0 tdresser webkit-unassigned enne jamesr webkit.review.bot oldest_to_newest 561126 0 tdresser 2012-02-21 12:20:25 -0800 In some contexts, CCLayerTreeHostImpl doesn't call willDraw, but does call didDraw. This results in crashes in CCVideoLayerImpl. 561145 1 128024 tdresser 2012-02-21 12:43:22 -0800 Created attachment 128024 Patch 561210 2 128024 enne 2012-02-21 14:09:48 -0800 Comment on attachment 128024 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128024&action=review Can you add a unit test for a layer with an empty visibleLayerRect to make sure there's no mismatch between didDraw/willDraw? > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:281 > + && !CCLayerTreeHostCommon::renderSurfaceContributesToTarget(*it, it.targetRenderSurfaceLayer()->id())) I think this conditional is redundant with it.representsItself(). 561408 3 128024 jamesr 2012-02-21 17:24:04 -0800 Comment on attachment 128024 Patch R- for the redundant check and lack of test. Otherwise I think this is fine. 561979 4 128214 tdresser 2012-02-22 07:38:30 -0800 Created attachment 128214 Patch 562191 5 128214 jamesr 2012-02-22 11:39:01 -0800 Comment on attachment 128214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128214&action=review R=me > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:280 > + if (it.representsItself() > + && !it->visibleLayerRect().isEmpty()) just put this on one line 562204 6 128257 tdresser 2012-02-22 11:50:52 -0800 Created attachment 128257 Patch 562289 7 128257 webkit.review.bot 2012-02-22 13:00:10 -0800 Comment on attachment 128257 Patch Clearing flags on attachment: 128257 Committed r108542: <http://trac.webkit.org/changeset/108542> 562290 8 webkit.review.bot 2012-02-22 13:00:17 -0800 All reviewed patches have been landed. Closing bug. 128024 2012-02-21 12:43:22 -0800 2012-02-22 07:38:26 -0800 Patch bug-79139-20120221154321.patch text/plain 2639 tdresser U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJhZmZhNTA3ZjBmNmZi MGM0ZTIxYzMzMGY0ZTVkZTU5OWZkNzkyZC4uZWU4ZTBjODg3MGUxYmFmZGJkZDYyZWRkOTQ4MGI0 NTMxMzEyMTYxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAyLTIxICBUaW0g RHJlc3NlciAgPHRkcmVzc2VyQGNocm9taXVtLm9yZz4KKworICAgICAgICBDQ0xheWVyVHJlZUhv c3RJbXBsIGNhbGxzIGRpZERyYXcgbW9yZSBmcmVxdWVudGx5IHRoYW4gd2lsbERyYXcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MTM5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgZGlk RHJhdyBpcyBjYWxsZWQgaWYgYW5kIG9ubHkgaWYgd2lsbERyYXcgd2FzIGNhbGxlZCBwcmV2aW91 c2x5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjpk cmF3TGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Zp ZGVvTGF5ZXJJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDVmlkZW9MYXllckltcGw6OmRp ZERyYXcpOgorCiAyMDEyLTAyLTIxICBBbGV4YW5kZXIgRsOmcsO4eSAgPGFsZXhhbmRlci5mYWVy b3lAbm9raWEuY29tPgogCiAgICAgICAgIFJlbW92ZSBzdHlsZXNoZWV0IHBvaW50ZXIgZnJvbSBT dHlsZVByb3BlcnR5U2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCmlu ZGV4IDA1NGJlYjMyZWU1MzU5Y2JjNWJhNTRmOTFiNmE5NmMxNTQwZmY1YjUuLmFkMTIyNzAwYTIz MWE4ZjE4YWE0ZDczNzc1NDViMjE3OTIzYmU4ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdEltcGwuY3BwCkBAIC0yNzYsMTAgKzI3NiwxMSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9z dEltcGw6OmRyYXdMYXllcnMoKQogCiAgICAgQ0NMYXllckl0ZXJhdG9yVHlwZSBlbmQgPSBDQ0xh eWVySXRlcmF0b3JUeXBlOjplbmQoJnJlbmRlclN1cmZhY2VMYXllckxpc3QpOwogICAgIGZvciAo Q0NMYXllckl0ZXJhdG9yVHlwZSBpdCA9IENDTGF5ZXJJdGVyYXRvclR5cGU6OmJlZ2luKCZyZW5k ZXJTdXJmYWNlTGF5ZXJMaXN0KTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGlmIChpdC5y ZXByZXNlbnRzSXRzZWxmKCkpCisgICAgICAgIGlmIChpdC5yZXByZXNlbnRzSXRzZWxmKCkKKyAg ICAgICAgICAgICYmICFpdC0+dmlzaWJsZUxheWVyUmVjdCgpLmlzRW1wdHkoKQorICAgICAgICAg ICAgJiYgIUNDTGF5ZXJUcmVlSG9zdENvbW1vbjo6cmVuZGVyU3VyZmFjZUNvbnRyaWJ1dGVzVG9U YXJnZXQoKml0LCBpdC50YXJnZXRSZW5kZXJTdXJmYWNlTGF5ZXIoKS0+aWQoKSkpCiAgICAgICAg ICAgICBpdC0+ZGlkRHJhdygpOwogICAgIH0KLQogICAgIG1fbGF5ZXJSZW5kZXJlci0+ZmluaXNo RHJhd2luZ0ZyYW1lKCk7CiAKICAgICArK21fZnJhbWVOdW1iZXI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1ZpZGVvTGF5ZXJJbXBs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVmlk ZW9MYXllckltcGwuY3BwCmluZGV4IDczMTliMTU3YWNmYWFiMDJhYjY4YjFmYzFmMDA5N2E2ZDFl MWE3MDQuLjhmMWMwNDU2NGEyYWZiYmI0NjM0ODYyYzI4OTFjNjA3OTNhYjlkZGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVmlkZW9M YXllckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDVmlkZW9MYXllckltcGwuY3BwCkBAIC0xNTgsNiArMTU4LDcgQEAgdm9pZCBDQ1Zp ZGVvTGF5ZXJJbXBsOjpkaWREcmF3KCkKICAgICBmb3IgKHVuc2lnbmVkIHBsYW5lID0gMDsgcGxh bmUgPCBtX2ZyYW1lLT5wbGFuZXMoKTsgKytwbGFuZSkKICAgICAgICAgbV90ZXh0dXJlc1twbGFu ZV0ubV90ZXh0dXJlLT51bnJlc2VydmUoKTsKICAgICBtX3Byb3ZpZGVyLT5wdXRDdXJyZW50RnJh bWUobV9mcmFtZSk7CisgICAgbV9mcmFtZSA9IDA7CiB9CiAKIEludFNpemUgQ0NWaWRlb0xheWVy SW1wbDo6Y29tcHV0ZVZpc2libGVTaXplKGNvbnN0IFZpZGVvRnJhbWVDaHJvbWl1bSogZnJhbWUs IHVuc2lnbmVkIHBsYW5lKQo= 128214 2012-02-22 07:38:30 -0800 2012-02-22 11:50:39 -0800 Patch bug-79139-20120222103829.patch text/plain 5983 tdresser U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJhZmZhNTA3ZjBmNmZi MGM0ZTIxYzMzMGY0ZTVkZTU5OWZkNzkyZC4uZTE4OTdhZDU0NWE3MTdiYWU0ZmQ3NWQ5Y2RiMWMw MDY5MzA3ZWZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTIyICBUaW0g RHJlc3NlciAgPHRkcmVzc2VyQGNocm9taXVtLm9yZz4KKworICAgICAgICBDQ0xheWVyVHJlZUhv c3RJbXBsIGNhbGxzIGRpZERyYXcgbW9yZSBmcmVxdWVudGx5IHRoYW4gd2lsbERyYXcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MTM5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgZGlk RHJhdyBpcyBjYWxsZWQgaWYgYW5kIG9ubHkgaWYgd2lsbERyYXcgd2FzIGNhbGxlZCBwcmV2aW91 c2x5LgorCisgICAgICAgIENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmRpZERyYXdOb3RDYWxsZWRP bkhpZGRlbkxheWVyIGhhcyBiZWVuIGFkZGVkIHRvIGVuc3VyZSB0aGF0CisgICAgICAgIGhpZGRl biBsYXllcnMsIGZvciB3aGljaCB3aWxsRHJhdyBpcyBub3QgY2FsbGVkLCB3aWxsIGFsc28gbm90 IGhhdmUgZGlkRHJhdyBjYWxsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5 ZXJUcmVlSG9zdEltcGw6OmRyYXdMYXllcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDVmlkZW9MYXllckltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NW aWRlb0xheWVySW1wbDo6ZGlkRHJhdyk6CisKIDIwMTItMDItMjEgIEFsZXhhbmRlciBGw6Zyw7h5 ICA8YWxleGFuZGVyLmZhZXJveUBub2tpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHN0eWxlc2hl ZXQgcG9pbnRlciBmcm9tIFN0eWxlUHJvcGVydHlTZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK aW5kZXggOGUyOTg2YWNlMGE3NWIzMGU1NzU3ZmE3MzQ0NjBjNmRmZGQ5ZTE5Mi4uNDNiZmQ2MzFj OWQxMzlkODBmOTVlNDRjNDkwMjU2NzM4YjU3N2MzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wMi0yMiAgVGltIERyZXNzZXIgIDx0ZHJlc3NlckBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ0NMYXllclRyZWVIb3N0SW1wbCBjYWxscyBkaWREcmF3 IG1vcmUgZnJlcXVlbnRseSB0aGFuIHdpbGxEcmF3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTEzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3Bw OgorICAgICAgICAoV2ViS2l0OjpEaWREcmF3Q2hlY2tMYXllcjo6d2lsbERyYXcpOgorICAgICAg ICAoRGlkRHJhd0NoZWNrTGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpEaWREcmF3Q2hlY2tMYXll cjo6d2lsbERyYXdDYWxsZWQpOgorICAgICAgICAoV2ViS2l0OjpEaWREcmF3Q2hlY2tMYXllcjo6 RGlkRHJhd0NoZWNrTGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorICAgICAgICAo V2ViS2l0KToKKwogMjAxMi0wMi0yMSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBbVjhdIFdlYiBJbnNwZWN0b3I6IHNldCBicmVha3BvaW50L3BhdXNl IGRvZXNuJ3Qgd29yayB3aGVuIHdvcmtlciBpcyBpbiBhIHRpZ2h0IGxvb3AKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVl SG9zdEltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKaW5kZXggMDU0YmViMzJlZTUzNTljYmM1YmE1NGY5 MWI2YTk2YzE1NDBmZjViNS4uNTEyZTc3NjE2ZWRkNzFmZDcyNDhkN2MwZGFlN2M0OWVhODE2YjEy NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKQEAgLTI3NiwxMCAr Mjc2LDEwIEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6ZHJhd0xheWVycygpCiAKICAgICBD Q0xheWVySXRlcmF0b3JUeXBlIGVuZCA9IENDTGF5ZXJJdGVyYXRvclR5cGU6OmVuZCgmcmVuZGVy U3VyZmFjZUxheWVyTGlzdCk7CiAgICAgZm9yIChDQ0xheWVySXRlcmF0b3JUeXBlIGl0ID0gQ0NM YXllckl0ZXJhdG9yVHlwZTo6YmVnaW4oJnJlbmRlclN1cmZhY2VMYXllckxpc3QpOyBpdCAhPSBl bmQ7ICsraXQpIHsKLSAgICAgICAgaWYgKGl0LnJlcHJlc2VudHNJdHNlbGYoKSkKKyAgICAgICAg aWYgKGl0LnJlcHJlc2VudHNJdHNlbGYoKQorICAgICAgICAgICAgJiYgIWl0LT52aXNpYmxlTGF5 ZXJSZWN0KCkuaXNFbXB0eSgpKQogICAgICAgICAgICAgaXQtPmRpZERyYXcoKTsKICAgICB9Ci0K ICAgICBtX2xheWVyUmVuZGVyZXItPmZpbmlzaERyYXdpbmdGcmFtZSgpOwogCiAgICAgKyttX2Zy YW1lTnVtYmVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NWaWRlb0xheWVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1ZpZGVvTGF5ZXJJbXBsLmNwcAppbmRleCA3MzE5YjE1 N2FjZmFhYjAyYWI2OGIxZmMxZjAwOTdhNmQxZTFhNzA0Li44ZjFjMDQ1NjRhMmFmYmJiNDYzNDg2 MmMyODkxYzYwNzkzYWI5ZGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ1ZpZGVvTGF5ZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1ZpZGVvTGF5ZXJJbXBsLmNwcApA QCAtMTU4LDYgKzE1OCw3IEBAIHZvaWQgQ0NWaWRlb0xheWVySW1wbDo6ZGlkRHJhdygpCiAgICAg Zm9yICh1bnNpZ25lZCBwbGFuZSA9IDA7IHBsYW5lIDwgbV9mcmFtZS0+cGxhbmVzKCk7ICsrcGxh bmUpCiAgICAgICAgIG1fdGV4dHVyZXNbcGxhbmVdLm1fdGV4dHVyZS0+dW5yZXNlcnZlKCk7CiAg ICAgbV9wcm92aWRlci0+cHV0Q3VycmVudEZyYW1lKG1fZnJhbWUpOworICAgIG1fZnJhbWUgPSAw OwogfQogCiBJbnRTaXplIENDVmlkZW9MYXllckltcGw6OmNvbXB1dGVWaXNpYmxlU2l6ZShjb25z dCBWaWRlb0ZyYW1lQ2hyb21pdW0qIGZyYW1lLCB1bnNpZ25lZCBwbGFuZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5j cHAKaW5kZXggODIwNzMzYjQ3MjA4YzZlY2ZmMTdjODhhMjUyYjNkZDc4ZDZmZGRkMS4uMWQ5OTRk MDBkMDhmZWY0MTZkYWNmYzExNWQ2MjE1MDkzY2JkMWM4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKQEAg LTI4NSwxMiArMjg1LDE5IEBAIHB1YmxpYzoKICAgICAgICAgbV9kaWREcmF3Q2FsbGVkID0gdHJ1 ZTsKICAgICB9CiAKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbERyYXcoTGF5ZXJSZW5kZXJlckNocm9t aXVtKikKKyAgICB7CisgICAgICAgIG1fd2lsbERyYXdDYWxsZWQgPSB0cnVlOworICAgIH0KKwog ICAgIGJvb2wgZGlkRHJhd0NhbGxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlkRHJhd0NhbGxlZDsg fQorICAgIGJvb2wgd2lsbERyYXdDYWxsZWQoKSBjb25zdCB7IHJldHVybiBtX3dpbGxEcmF3Q2Fs bGVkOyB9CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgRGlkRHJhd0NoZWNrTGF5ZXIoaW50IGlk KQogICAgICAgICA6IENDTGF5ZXJJbXBsKGlkKQogICAgICAgICAsIG1fZGlkRHJhd0NhbGxlZChm YWxzZSkKKyAgICAgICAgLCBtX3dpbGxEcmF3Q2FsbGVkKGZhbHNlKQogICAgIHsKICAgICAgICAg c2V0QW5jaG9yUG9pbnQoRmxvYXRQb2ludCgwLCAwKSk7CiAgICAgICAgIHNldEJvdW5kcyhJbnRT aXplKDEwLCAxMCkpOwpAQCAtMjk4LDggKzMwNSw0NSBAQCBwcml2YXRlOgogICAgIH0KIAogICAg IGJvb2wgbV9kaWREcmF3Q2FsbGVkOworICAgIGJvb2wgbV93aWxsRHJhd0NhbGxlZDsKIH07CiAK K1RFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgZGlkRHJhd05vdENhbGxlZE9uSGlkZGVu TGF5ZXIpCit7CitHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBhdHRyczsKKyAgICBSZWZQ dHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNvbnRleHQgPSBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6 OmNyZWF0ZUdyYXBoaWNzQ29udGV4dEZyb21XZWJDb250ZXh0KGFkb3B0UHRyKG5ldyBGYWtlV2Vi R3JhcGhpY3NDb250ZXh0M0QoKSksIGF0dHJzLCAwLCBHcmFwaGljc0NvbnRleHQzRDo6UmVuZGVy RGlyZWN0bHlUb0hvc3RXaW5kb3csIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6Rm9yVXNlT25U aGlzVGhyZWFkKTsKKyAgICBtX2hvc3RJbXBsLT5pbml0aWFsaXplTGF5ZXJSZW5kZXJlcihjb250 ZXh0KTsKKworICAgIC8vIEVuc3VyZSB2aXNpYmxlTGF5ZXJSZWN0IGZvciByb290IGxheWVyIGlz IGVtcHR5CisgICAgbV9ob3N0SW1wbC0+c2V0Vmlld3BvcnRTaXplKEludFNpemUoMCwgMCkpOwor CisgICAgUmVmUHRyPERpZERyYXdDaGVja0xheWVyPiByb290ID0gRGlkRHJhd0NoZWNrTGF5ZXI6 OmNyZWF0ZSgwKTsKKyAgICBtX2hvc3RJbXBsLT5zZXRSb290TGF5ZXIocm9vdCk7CisKKyAgICBF WFBFQ1RfRkFMU0Uocm9vdC0+d2lsbERyYXdDYWxsZWQoKSk7CisgICAgRVhQRUNUX0ZBTFNFKHJv b3QtPmRpZERyYXdDYWxsZWQoKSk7CisKKyAgICBtX2hvc3RJbXBsLT5kcmF3TGF5ZXJzKCk7CisK KyAgICBFWFBFQ1RfRkFMU0Uocm9vdC0+d2lsbERyYXdDYWxsZWQoKSk7CisgICAgRVhQRUNUX0ZB TFNFKHJvb3QtPmRpZERyYXdDYWxsZWQoKSk7CisKKyAgICBFWFBFQ1RfVFJVRShyb290LT52aXNp YmxlTGF5ZXJSZWN0KCkuaXNFbXB0eSgpKTsKKworICAgIC8vIEVuc3VyZSB2aXNpYmxlTGF5ZXJS ZWN0IGZvciByb290IGxheWVyIGlzIG5vdCBlbXB0eQorICAgIG1faG9zdEltcGwtPnNldFZpZXdw b3J0U2l6ZShJbnRTaXplKDEwLCAxMCkpOworCisgICAgRVhQRUNUX0ZBTFNFKHJvb3QtPndpbGxE cmF3Q2FsbGVkKCkpOworICAgIEVYUEVDVF9GQUxTRShyb290LT5kaWREcmF3Q2FsbGVkKCkpOwor CisgICAgbV9ob3N0SW1wbC0+ZHJhd0xheWVycygpOworCisgICAgRVhQRUNUX1RSVUUocm9vdC0+ d2lsbERyYXdDYWxsZWQoKSk7CisgICAgRVhQRUNUX1RSVUUocm9vdC0+ZGlkRHJhd0NhbGxlZCgp KTsKKworICAgIEVYUEVDVF9GQUxTRShyb290LT52aXNpYmxlTGF5ZXJSZWN0KCkuaXNFbXB0eSgp KTsKK30KKwogVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBkaWREcmF3Q2FsbGVkT25B bGxMYXllcnMpCiB7CiAgICAgR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMgYXR0cnM7Cg== 128257 2012-02-22 11:50:52 -0800 2012-02-22 13:00:10 -0800 Patch bug-79139-20120222145051.patch text/plain 5969 tdresser U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJhZmZhNTA3ZjBmNmZi MGM0ZTIxYzMzMGY0ZTVkZTU5OWZkNzkyZC4uZTE4OTdhZDU0NWE3MTdiYWU0ZmQ3NWQ5Y2RiMWMw MDY5MzA3ZWZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTIyICBUaW0g RHJlc3NlciAgPHRkcmVzc2VyQGNocm9taXVtLm9yZz4KKworICAgICAgICBDQ0xheWVyVHJlZUhv c3RJbXBsIGNhbGxzIGRpZERyYXcgbW9yZSBmcmVxdWVudGx5IHRoYW4gd2lsbERyYXcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MTM5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgZGlk RHJhdyBpcyBjYWxsZWQgaWYgYW5kIG9ubHkgaWYgd2lsbERyYXcgd2FzIGNhbGxlZCBwcmV2aW91 c2x5LgorCisgICAgICAgIENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmRpZERyYXdOb3RDYWxsZWRP bkhpZGRlbkxheWVyIGhhcyBiZWVuIGFkZGVkIHRvIGVuc3VyZSB0aGF0CisgICAgICAgIGhpZGRl biBsYXllcnMsIGZvciB3aGljaCB3aWxsRHJhdyBpcyBub3QgY2FsbGVkLCB3aWxsIGFsc28gbm90 IGhhdmUgZGlkRHJhdyBjYWxsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5 ZXJUcmVlSG9zdEltcGw6OmRyYXdMYXllcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDVmlkZW9MYXllckltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NW aWRlb0xheWVySW1wbDo6ZGlkRHJhdyk6CisKIDIwMTItMDItMjEgIEFsZXhhbmRlciBGw6Zyw7h5 ICA8YWxleGFuZGVyLmZhZXJveUBub2tpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHN0eWxlc2hl ZXQgcG9pbnRlciBmcm9tIFN0eWxlUHJvcGVydHlTZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK aW5kZXggOGUyOTg2YWNlMGE3NWIzMGU1NzU3ZmE3MzQ0NjBjNmRmZGQ5ZTE5Mi4uNDNiZmQ2MzFj OWQxMzlkODBmOTVlNDRjNDkwMjU2NzM4YjU3N2MzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wMi0yMiAgVGltIERyZXNzZXIgIDx0ZHJlc3NlckBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ0NMYXllclRyZWVIb3N0SW1wbCBjYWxscyBkaWREcmF3 IG1vcmUgZnJlcXVlbnRseSB0aGFuIHdpbGxEcmF3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTEzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3Bw OgorICAgICAgICAoV2ViS2l0OjpEaWREcmF3Q2hlY2tMYXllcjo6d2lsbERyYXcpOgorICAgICAg ICAoRGlkRHJhd0NoZWNrTGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpEaWREcmF3Q2hlY2tMYXll cjo6d2lsbERyYXdDYWxsZWQpOgorICAgICAgICAoV2ViS2l0OjpEaWREcmF3Q2hlY2tMYXllcjo6 RGlkRHJhd0NoZWNrTGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorICAgICAgICAo V2ViS2l0KToKKwogMjAxMi0wMi0yMSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBbVjhdIFdlYiBJbnNwZWN0b3I6IHNldCBicmVha3BvaW50L3BhdXNl IGRvZXNuJ3Qgd29yayB3aGVuIHdvcmtlciBpcyBpbiBhIHRpZ2h0IGxvb3AKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVl SG9zdEltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKaW5kZXggMDU0YmViMzJlZTUzNTljYmM1YmE1NGY5 MWI2YTk2YzE1NDBmZjViNS4uNjgwNmJjYThjY2IzZDI0MWE0ZjIxMzJkNzhkNmQ1YWFlOTFhM2Q2 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHAKQEAgLTI3NiwxMCAr Mjc2LDkgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBsOjpkcmF3TGF5ZXJzKCkKIAogICAgIEND TGF5ZXJJdGVyYXRvclR5cGUgZW5kID0gQ0NMYXllckl0ZXJhdG9yVHlwZTo6ZW5kKCZyZW5kZXJT dXJmYWNlTGF5ZXJMaXN0KTsKICAgICBmb3IgKENDTGF5ZXJJdGVyYXRvclR5cGUgaXQgPSBDQ0xh eWVySXRlcmF0b3JUeXBlOjpiZWdpbigmcmVuZGVyU3VyZmFjZUxheWVyTGlzdCk7IGl0ICE9IGVu ZDsgKytpdCkgewotICAgICAgICBpZiAoaXQucmVwcmVzZW50c0l0c2VsZigpKQorICAgICAgICBp ZiAoaXQucmVwcmVzZW50c0l0c2VsZigpICYmICFpdC0+dmlzaWJsZUxheWVyUmVjdCgpLmlzRW1w dHkoKSkKICAgICAgICAgICAgIGl0LT5kaWREcmF3KCk7CiAgICAgfQotCiAgICAgbV9sYXllclJl bmRlcmVyLT5maW5pc2hEcmF3aW5nRnJhbWUoKTsKIAogICAgICsrbV9mcmFtZU51bWJlcjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND VmlkZW9MYXllckltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NWaWRlb0xheWVySW1wbC5jcHAKaW5kZXggNzMxOWIxNTdhY2ZhYWIwMmFiNjhi MWZjMWYwMDk3YTZkMWUxYTcwNC4uOGYxYzA0NTY0YTJhZmJiYjQ2MzQ4NjJjMjg5MWM2MDc5M2Fi OWRkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NWaWRlb0xheWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NWaWRlb0xheWVySW1wbC5jcHAKQEAgLTE1OCw2ICsxNTgs NyBAQCB2b2lkIENDVmlkZW9MYXllckltcGw6OmRpZERyYXcoKQogICAgIGZvciAodW5zaWduZWQg cGxhbmUgPSAwOyBwbGFuZSA8IG1fZnJhbWUtPnBsYW5lcygpOyArK3BsYW5lKQogICAgICAgICBt X3RleHR1cmVzW3BsYW5lXS5tX3RleHR1cmUtPnVucmVzZXJ2ZSgpOwogICAgIG1fcHJvdmlkZXIt PnB1dEN1cnJlbnRGcmFtZShtX2ZyYW1lKTsKKyAgICBtX2ZyYW1lID0gMDsKIH0KIAogSW50U2l6 ZSBDQ1ZpZGVvTGF5ZXJJbXBsOjpjb21wdXRlVmlzaWJsZVNpemUoY29uc3QgVmlkZW9GcmFtZUNo cm9taXVtKiBmcmFtZSwgdW5zaWduZWQgcGxhbmUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNwcCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCmluZGV4IDgyMDcz M2I0NzIwOGM2ZWNmZjE3Yzg4YTI1MmIzZGQ3OGQ2ZmRkZDEuLjFkOTk0ZDAwZDA4ZmVmNDE2ZGFj ZmMxMTVkNjIxNTA5M2NiZDFjODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCkBAIC0yODUsMTIgKzI4NSwx OSBAQCBwdWJsaWM6CiAgICAgICAgIG1fZGlkRHJhd0NhbGxlZCA9IHRydWU7CiAgICAgfQogCisg ICAgdmlydHVhbCB2b2lkIHdpbGxEcmF3KExheWVyUmVuZGVyZXJDaHJvbWl1bSopCisgICAgewor ICAgICAgICBtX3dpbGxEcmF3Q2FsbGVkID0gdHJ1ZTsKKyAgICB9CisKICAgICBib29sIGRpZERy YXdDYWxsZWQoKSBjb25zdCB7IHJldHVybiBtX2RpZERyYXdDYWxsZWQ7IH0KKyAgICBib29sIHdp bGxEcmF3Q2FsbGVkKCkgY29uc3QgeyByZXR1cm4gbV93aWxsRHJhd0NhbGxlZDsgfQogCiBwcml2 YXRlOgogICAgIGV4cGxpY2l0IERpZERyYXdDaGVja0xheWVyKGludCBpZCkKICAgICAgICAgOiBD Q0xheWVySW1wbChpZCkKICAgICAgICAgLCBtX2RpZERyYXdDYWxsZWQoZmFsc2UpCisgICAgICAg ICwgbV93aWxsRHJhd0NhbGxlZChmYWxzZSkKICAgICB7CiAgICAgICAgIHNldEFuY2hvclBvaW50 KEZsb2F0UG9pbnQoMCwgMCkpOwogICAgICAgICBzZXRCb3VuZHMoSW50U2l6ZSgxMCwgMTApKTsK QEAgLTI5OCw4ICszMDUsNDUgQEAgcHJpdmF0ZToKICAgICB9CiAKICAgICBib29sIG1fZGlkRHJh d0NhbGxlZDsKKyAgICBib29sIG1fd2lsbERyYXdDYWxsZWQ7CiB9OwogCitURVNUX0YoQ0NMYXll clRyZWVIb3N0SW1wbFRlc3QsIGRpZERyYXdOb3RDYWxsZWRPbkhpZGRlbkxheWVyKQoreworR3Jh cGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMgYXR0cnM7CisgICAgUmVmUHRyPEdyYXBoaWNzQ29u dGV4dDNEPiBjb250ZXh0ID0gR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpjcmVhdGVHcmFwaGlj c0NvbnRleHRGcm9tV2ViQ29udGV4dChhZG9wdFB0cihuZXcgRmFrZVdlYkdyYXBoaWNzQ29udGV4 dDNEKCkpLCBhdHRycywgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJlbmRlckRpcmVjdGx5VG9Ib3N0 V2luZG93LCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OkZvclVzZU9uVGhpc1RocmVhZCk7Cisg ICAgbV9ob3N0SW1wbC0+aW5pdGlhbGl6ZUxheWVyUmVuZGVyZXIoY29udGV4dCk7CisKKyAgICAv LyBFbnN1cmUgdmlzaWJsZUxheWVyUmVjdCBmb3Igcm9vdCBsYXllciBpcyBlbXB0eQorICAgIG1f aG9zdEltcGwtPnNldFZpZXdwb3J0U2l6ZShJbnRTaXplKDAsIDApKTsKKworICAgIFJlZlB0cjxE aWREcmF3Q2hlY2tMYXllcj4gcm9vdCA9IERpZERyYXdDaGVja0xheWVyOjpjcmVhdGUoMCk7Cisg ICAgbV9ob3N0SW1wbC0+c2V0Um9vdExheWVyKHJvb3QpOworCisgICAgRVhQRUNUX0ZBTFNFKHJv b3QtPndpbGxEcmF3Q2FsbGVkKCkpOworICAgIEVYUEVDVF9GQUxTRShyb290LT5kaWREcmF3Q2Fs bGVkKCkpOworCisgICAgbV9ob3N0SW1wbC0+ZHJhd0xheWVycygpOworCisgICAgRVhQRUNUX0ZB TFNFKHJvb3QtPndpbGxEcmF3Q2FsbGVkKCkpOworICAgIEVYUEVDVF9GQUxTRShyb290LT5kaWRE cmF3Q2FsbGVkKCkpOworCisgICAgRVhQRUNUX1RSVUUocm9vdC0+dmlzaWJsZUxheWVyUmVjdCgp LmlzRW1wdHkoKSk7CisKKyAgICAvLyBFbnN1cmUgdmlzaWJsZUxheWVyUmVjdCBmb3Igcm9vdCBs YXllciBpcyBub3QgZW1wdHkKKyAgICBtX2hvc3RJbXBsLT5zZXRWaWV3cG9ydFNpemUoSW50U2l6 ZSgxMCwgMTApKTsKKworICAgIEVYUEVDVF9GQUxTRShyb290LT53aWxsRHJhd0NhbGxlZCgpKTsK KyAgICBFWFBFQ1RfRkFMU0Uocm9vdC0+ZGlkRHJhd0NhbGxlZCgpKTsKKworICAgIG1faG9zdElt cGwtPmRyYXdMYXllcnMoKTsKKworICAgIEVYUEVDVF9UUlVFKHJvb3QtPndpbGxEcmF3Q2FsbGVk KCkpOworICAgIEVYUEVDVF9UUlVFKHJvb3QtPmRpZERyYXdDYWxsZWQoKSk7CisKKyAgICBFWFBF Q1RfRkFMU0Uocm9vdC0+dmlzaWJsZUxheWVyUmVjdCgpLmlzRW1wdHkoKSk7Cit9CisKIFRFU1Rf RihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgZGlkRHJhd0NhbGxlZE9uQWxsTGF5ZXJzKQogewog ICAgIEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHJzOwo=