61639 2011-05-27 08:59:00 -0700 [chromium] Things jump around when selecting anything on the page 2011-06-02 13:51:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 alokp alokp enne jamesr reed oldest_to_newest 411461 0 alokp 2011-05-27 08:59:00 -0700 With accelerated drawing (--enable-accelerated-drawing), things jump around when anything is selected on the page. Test case: http://www.webkit.org/blog-files/3d-transforms/morphing-cubes.html This is happening because when anything is selected, only a portion of a tile is invalidated and updated. LayerTextureUpdaterSkPicture::updateTextureRect does not update a tile subregion properly. 411497 1 95184 alokp 2011-05-27 09:34:59 -0700 Created attachment 95184 proposed patch 411544 2 95184 vangelis 2011-05-27 10:55:33 -0700 Comment on attachment 95184 proposed patch The offset changes look good. Did you mean to include the removal of clear and change in framebufferRenderbuffer with this patch? If so, please add some explanation in the changelog. 411565 3 95198 alokp 2011-05-27 11:18:10 -0700 Created attachment 95198 proposed patch Added explanation for removing glClear to changelog. 411567 4 alokp 2011-05-27 11:18:56 -0700 (In reply to comment #2) > (From update of attachment 95184 [details]) > The offset changes look good. Did you mean to include the removal of clear and change in framebufferRenderbuffer with this patch? If so, please add some explanation in the changelog. Yes I meant to remove glClear. Added explanation to changelog. 413087 5 95198 jamesr 2011-05-31 19:34:52 -0700 Comment on attachment 95198 proposed patch Need a test! 413645 6 alokp 2011-06-01 14:02:07 -0700 This case should be covered by most of the layout tests (pixel) targeting hover/selection/editing when chrome is run in compositing mode. Do you want me write a similar test with a composited layer? I heard that we are planning on running all layout tests in compositing mode too. If so, is there any reason to duplicate tests? 413652 7 jamesr 2011-06-01 14:12:27 -0700 No, you don't need to add redundant test coverage if this bugfix causes existing tests to progress. You do need to record which test(s) covers this change in the ChangeLog and add a new test if there aren't any tests currently that cover this. 413672 8 95665 alokp 2011-06-01 14:30:54 -0700 Created attachment 95665 proposed patch Added test info to changelog 414379 9 95665 jamesr 2011-06-02 13:11:05 -0700 Comment on attachment 95665 proposed patch Seems good! 414384 10 alokp 2011-06-02 13:22:33 -0700 Committed r87949: <http://trac.webkit.org/changeset/87949> 414399 11 enne 2011-06-02 13:36:12 -0700 Maybe I'm missing something, but the editing tests don't get run automatically with the compositor, so if this breaks in the future, we won't know about it. Would compositing/repaint/same-size-invalidation.html have caught this? Or, is there some other automatic test that would? 414403 12 jamesr 2011-06-02 13:39:04 -0700 (In reply to comment #11) > Maybe I'm missing something, but the editing tests don't get run automatically with the compositor, so if this breaks in the future, we won't know about it. > > Would compositing/repaint/same-size-invalidation.html have caught this? Or, is there some other automatic test that would? To be fair, our automated tests don't run with --accelerated-drawing on either. 414405 13 enne 2011-06-02 13:42:11 -0700 (In reply to comment #12) > (In reply to comment #11) > > Maybe I'm missing something, but the editing tests don't get run automatically with the compositor, so if this breaks in the future, we won't know about it. > > > > Would compositing/repaint/same-size-invalidation.html have caught this? Or, is there some other automatic test that would? > > To be fair, our automated tests don't run with --accelerated-drawing on either. Ah, fair enough. I guess manual tests are all that can be done then. 414409 14 alokp 2011-06-02 13:51:22 -0700 (In reply to comment #11) > Maybe I'm missing something, but the editing tests don't get run automatically with the compositor, so if this breaks in the future, we won't know about it. > You are right. As I mentioned in the changelog, they will get run if chrome is run in forced compositing mode. I am looking to see if we can run all layout tests with --force-compositing-mode flag on gpu bots. I will also enable accelerated-drawing once it is stable enough. 95184 2011-05-27 09:34:59 -0700 2011-05-27 11:18:10 -0700 proposed patch 61639.patch text/plain 4374 alokp SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NTE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDUtMjcgIEFsb2sgUHJp eWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBUaGluZ3MganVtcCBhcm91bmQgd2hl biBzZWxlY3RpbmcgYW55dGhpbmcgb24gdGhlIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNjM5CisKKyAgICAgICAgV2ViQ29yZTo6TGF5ZXJU ZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6dXBkYXRlVGV4dHVyZVJlY3Qgd2FzIG5vdCB1cGRhdGlu ZyBhIHRpbGUgc3ViLXJlZ2lvbiBwcm9wZXJseS4KKyAgICAgICAgSXQgZGlkIG5vdCBjb25zaWRl ciBkZXN0LXJlY3Qgd2hlbiBzZWxlY3RpbmcgdGhlIGNsaXAgYW5kIHRyYW5zbGF0aW9uIHJlcXVp cmVkIHRvIGRyYXcgdGhlIGNvbnRlbnQtcmVjdCBpbnRvIGRlc3QtcmVjdC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6dXBkYXRl VGV4dHVyZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJUZXh0dXJlVXBkYXRlclNrUGlj dHVyZTo6Y3JlYXRlRnJhbWVCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuaDoKKwogMjAxMS0wNS0yNyAgUm9iIEJ1 aXMgIDxyYnVpc0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVy bWFubi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuY3Bw CShyZXZpc2lvbiA4NzUxOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MzcsMTUgKzEzNywxNCBAQCB2b2lkIExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OnVwZGF0 CiAgICAgdGV4dHVyZS0+ZnJhbWVidWZmZXJUZXh0dXJlMkQoKTsKICAgICBBU1NFUlQoY29udGV4 dCgpLT5jaGVja0ZyYW1lYnVmZmVyU3RhdHVzKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZF UikgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSX0NPTVBMRVRFKTsKIAotICAgIGNv bnRleHQoKS0+dmlld3BvcnQoMCwgMCwgbV9idWZmZXJTaXplLndpZHRoKCksIG1fYnVmZmVyU2l6 ZS5oZWlnaHQoKSk7Ci0gICAgY2xlYXJGcmFtZUJ1ZmZlcigpOwotCiAgICAgLy8gTm90aWZ5IFNL SUEgdG8gc3luYyBpdHMgaW50ZXJuYWwgR0wgc3RhdGUuCiAgICAgbV9za2lhQ29udGV4dC0+cmVz ZXRDb250ZXh0KCk7Ci0gICAgLy8gT2Zmc2V0IGZyb20gc291cmNlIHJlY3RhbmdsZSB0byB0aGlz IGRlc3RpbmF0aW9uIHJlY3RhbmdsZS4KLSAgICBJbnRQb2ludCBvZmZzZXQoc291cmNlUmVjdC54 KCkgLSBjb250ZW50UmVjdCgpLngoKSwgc291cmNlUmVjdC55KCkgLSBjb250ZW50UmVjdCgpLnko KSk7CiAgICAgbV9jYW52YXMtPnNhdmUoKTsKLSAgICBtX2NhbnZhcy0+dHJhbnNsYXRlKC1vZmZz ZXQueCgpLCAtb2Zmc2V0LnkoKSk7CisgICAgbV9jYW52YXMtPmNsaXBSZWN0KFNrUmVjdChkZXN0 UmVjdCkpOworICAgIC8vIFRyYW5zbGF0ZSB0aGUgb3JpZ2luIG9mIGNvbnRlbnRSZWN0IHRvIHRo YXQgb2YgZGVzdFJlY3QuCisgICAgLy8gTm90ZSB0aGF0IGRlc3RSZWN0IGlzIGRlZmluZWQgcmVs YXRpdmUgdG8gc291cmNlUmVjdC4KKyAgICBtX2NhbnZhcy0+dHJhbnNsYXRlKGNvbnRlbnRSZWN0 KCkueCgpIC0gc291cmNlUmVjdC54KCkgKyBkZXN0UmVjdC54KCksCisgICAgICAgICAgICAgICAg ICAgICAgICBjb250ZW50UmVjdCgpLnkoKSAtIHNvdXJjZVJlY3QueSgpICsgZGVzdFJlY3QueSgp KTsKICAgICBtX2NhbnZhcy0+ZHJhd1BpY3R1cmUobV9waWN0dXJlKTsKICAgICBtX2NhbnZhcy0+ cmVzdG9yZSgpOwogICAgIC8vIEZsdXNoIFNLSUEgY29udGV4dCBzbyB0aGF0IGFsbCB0aGUgcmVu ZGVyZWQgc3R1ZmYgYXBwZWFycyBvbiB0aGUgdGV4dHVyZS4KQEAgLTIxMCw4ICsyMDksNyBAQCBi b29sIExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0CiAgICAgfQogICAgIGNvbnRl eHQoKS0+YmluZFJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBt X2RlcHRoU3RlbmNpbEJ1ZmZlcik7CiAgICAgY29udGV4dCgpLT5yZW5kZXJidWZmZXJTdG9yYWdl KEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIEV4dGVuc2lvbnMzRDo6REVQVEgyNF9T VEVOQ0lMOCwgbV9idWZmZXJTaXplLndpZHRoKCksIG1fYnVmZmVyU2l6ZS5oZWlnaHQoKSk7Ci0g ICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6 RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0FUVEFDSE1FTlQsIEdyYXBo aWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKLSAgICBj b250ZXh0KCktPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFN RUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0FUVEFDSE1FTlQsIEdyYXBoaWNzQ29u dGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKKyAgICBjb250ZXh0 KCktPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZF UiwgR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX1NURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhpY3ND b250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwogCiAgICAgLy8g Q3JlYXRlIGEgc2tpYSBncHUgY2FudmFzLgogICAgIEdyUGxhdGZvcm1TdXJmYWNlRGVzYyB0YXJn ZXREZXNjOwpAQCAtMjMyLDE1ICsyMzAsNiBAQCBib29sIExheWVyVGV4dHVyZVVwZGF0ZXJTa1Bp Y3R1cmU6OmNyZWF0CiAgICAgY29udGV4dCgpLT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250 ZXh0M0Q6OkZSQU1FQlVGRkVSLCAwKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KLQotdm9pZCBMYXll clRleHR1cmVVcGRhdGVyU2tQaWN0dXJlOjpjbGVhckZyYW1lQnVmZmVyKCkKLXsKLSNpZm5kZWYg TkRFQlVHCi0gICAgLy8gQ2xlYXIgdG8gZ3JlZW4gdG8gbWFrZSBpdCBlYXNpZXIgdG8gc3BvdCB1 bnJlbmRlcmVkIHJlZ2lvbnMuCi0gICAgY29udGV4dCgpLT5jbGVhckNvbG9yKDAsIDEsIDAsIDEp OwotICAgIGNvbnRleHQoKS0+Y2xlYXIoR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0JVRkZFUl9C SVQgfCBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9CVUZGRVJfQklUKTsKLSNlbmRpZgotfQog I2VuZGlmIC8vIFNLSUEKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0dXJlVXBkYXRlckNhbnZh cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuaAkocmV2aXNpb24gODc1MTgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVy Q2FudmFzLmgJKHdvcmtpbmcgY29weSkKQEAgLTkxLDcgKzkxLDYgQEAgcHVibGljOgogcHJpdmF0 ZToKICAgICB2b2lkIGRlbGV0ZUZyYW1lQnVmZmVyKCk7CiAgICAgYm9vbCBjcmVhdGVGcmFtZUJ1 ZmZlcigpOwotICAgIHZvaWQgY2xlYXJGcmFtZUJ1ZmZlcigpOwogCiAgICAgR3JDb250ZXh0KiBt X3NraWFDb250ZXh0OyAvLyBTS0lBIGdyYXBoaWNzIGNvbnRleHQuCiAK 95198 2011-05-27 11:18:10 -0700 2011-06-01 14:30:54 -0700 proposed patch 61639.patch text/plain 4649 alokp SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NTE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMjcgIEFsb2sgUHJp eWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBUaGluZ3MganVtcCBhcm91bmQgd2hl biBzZWxlY3RpbmcgYW55dGhpbmcgb24gdGhlIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNjM5CisKKyAgICAgICAgV2ViQ29yZTo6TGF5ZXJU ZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6dXBkYXRlVGV4dHVyZVJlY3Qgd2FzIG5vdCB1cGRhdGlu ZyBhIHRpbGUgc3ViLXJlZ2lvbiBwcm9wZXJseS4KKyAgICAgICAgSXQgZGlkIG5vdCBjb25zaWRl ciBkZXN0LXJlY3Qgd2hlbiBzZWxlY3RpbmcgdGhlIGNsaXAgYW5kIHRyYW5zbGF0aW9uIHJlcXVp cmVkIHRvIGRyYXcgdGhlIGNvbnRlbnQtcmVjdCBpbnRvIGRlc3QtcmVjdC4KKyAgICAgICAgQWxz byByZW1vdmVkIGNsZWFyaW5nIG9mIGZyYW1lYnVmZmVyIGJlY2F1c2UgaXQgdXNlZCB0byBjbGVh ciB0aGUgd2hvbGUgdGlsZSBub3QganVzdCBkZXN0LXJlY3QuCisgICAgICAgIEFuIGFwcHJvcHJp YXRlIHZpZXdwb3J0IGNvdWxkIGJlIHNldCB0byBqdXN0IGNsZWFyIHRoZSBkZXN0LXJlY3QsIGJ1 dCBpdCB3YXMgZGVidWcgb25seSBjb2RlIGFuZCBJIGRpZCBub3Qgd2FudCB0byBtZXNzCisgICAg ICAgIHdpdGggdGhlIHZpZXdwb3J0IHNldCBieSBza2lhLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0dXJlVXBkYXRlckNhbnZhcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlOjp1cGRhdGVUZXh0dXJlUmVj dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlOjpjcmVh dGVGcmFtZUJ1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJUZXh0dXJlVXBkYXRlckNhbnZhcy5oOgorCiAyMDExLTA1LTI3ICBSb2IgQnVpcyAgPHJidWlz QHJpbS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrb2xhcyBaaW1tZXJtYW5uLgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0dXJl VXBkYXRlckNhbnZhcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0dXJlVXBkYXRlckNhbnZhcy5jcHAJKHJldmlzaW9u IDg3NTE4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJUZXh0dXJlVXBkYXRlckNhbnZhcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNywxNSArMTM3 LDE0IEBAIHZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6dXBkYXQKICAgICB0ZXh0 dXJlLT5mcmFtZWJ1ZmZlclRleHR1cmUyRCgpOwogICAgIEFTU0VSVChjb250ZXh0KCktPmNoZWNr RnJhbWVidWZmZXJTdGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSKSA9PSBHcmFw aGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQ09NUExFVEUpOwogCi0gICAgY29udGV4dCgpLT52 aWV3cG9ydCgwLCAwLCBtX2J1ZmZlclNpemUud2lkdGgoKSwgbV9idWZmZXJTaXplLmhlaWdodCgp KTsKLSAgICBjbGVhckZyYW1lQnVmZmVyKCk7Ci0KICAgICAvLyBOb3RpZnkgU0tJQSB0byBzeW5j IGl0cyBpbnRlcm5hbCBHTCBzdGF0ZS4KICAgICBtX3NraWFDb250ZXh0LT5yZXNldENvbnRleHQo KTsKLSAgICAvLyBPZmZzZXQgZnJvbSBzb3VyY2UgcmVjdGFuZ2xlIHRvIHRoaXMgZGVzdGluYXRp b24gcmVjdGFuZ2xlLgotICAgIEludFBvaW50IG9mZnNldChzb3VyY2VSZWN0LngoKSAtIGNvbnRl bnRSZWN0KCkueCgpLCBzb3VyY2VSZWN0LnkoKSAtIGNvbnRlbnRSZWN0KCkueSgpKTsKICAgICBt X2NhbnZhcy0+c2F2ZSgpOwotICAgIG1fY2FudmFzLT50cmFuc2xhdGUoLW9mZnNldC54KCksIC1v ZmZzZXQueSgpKTsKKyAgICBtX2NhbnZhcy0+Y2xpcFJlY3QoU2tSZWN0KGRlc3RSZWN0KSk7Cisg ICAgLy8gVHJhbnNsYXRlIHRoZSBvcmlnaW4gb2YgY29udGVudFJlY3QgdG8gdGhhdCBvZiBkZXN0 UmVjdC4KKyAgICAvLyBOb3RlIHRoYXQgZGVzdFJlY3QgaXMgZGVmaW5lZCByZWxhdGl2ZSB0byBz b3VyY2VSZWN0LgorICAgIG1fY2FudmFzLT50cmFuc2xhdGUoY29udGVudFJlY3QoKS54KCkgLSBz b3VyY2VSZWN0LngoKSArIGRlc3RSZWN0LngoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNv bnRlbnRSZWN0KCkueSgpIC0gc291cmNlUmVjdC55KCkgKyBkZXN0UmVjdC55KCkpOwogICAgIG1f Y2FudmFzLT5kcmF3UGljdHVyZShtX3BpY3R1cmUpOwogICAgIG1fY2FudmFzLT5yZXN0b3JlKCk7 CiAgICAgLy8gRmx1c2ggU0tJQSBjb250ZXh0IHNvIHRoYXQgYWxsIHRoZSByZW5kZXJlZCBzdHVm ZiBhcHBlYXJzIG9uIHRoZSB0ZXh0dXJlLgpAQCAtMjEwLDggKzIwOSw3IEBAIGJvb2wgTGF5ZXJU ZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXQKICAgICB9CiAgICAgY29udGV4dCgpLT5iaW5k UmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVu Y2lsQnVmZmVyKTsKICAgICBjb250ZXh0KCktPnJlbmRlcmJ1ZmZlclN0b3JhZ2UoR3JhcGhpY3ND b250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgRXh0ZW5zaW9uczNEOjpERVBUSDI0X1NURU5DSUw4LCBt X2J1ZmZlclNpemUud2lkdGgoKSwgbV9idWZmZXJTaXplLmhlaWdodCgpKTsKLSAgICBjb250ZXh0 KCktPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZF UiwgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0 M0Q6OlJFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwotICAgIGNvbnRleHQoKS0+ ZnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBH cmFwaGljc0NvbnRleHQzRDo6REVQVEhfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJF TkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOworICAgIGNvbnRleHQoKS0+ZnJhbWVi dWZmZXJSZW5kZXJidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGlj c0NvbnRleHQzRDo6REVQVEhfU1RFTkNJTF9BVFRBQ0hNRU5ULCBHcmFwaGljc0NvbnRleHQzRDo6 UkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7CiAKICAgICAvLyBDcmVhdGUgYSBz a2lhIGdwdSBjYW52YXMuCiAgICAgR3JQbGF0Zm9ybVN1cmZhY2VEZXNjIHRhcmdldERlc2M7CkBA IC0yMzIsMTUgKzIzMCw2IEBAIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3Jl YXQKICAgICBjb250ZXh0KCktPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJB TUVCVUZGRVIsIDApOwogICAgIHJldHVybiB0cnVlOwogfQotCi12b2lkIExheWVyVGV4dHVyZVVw ZGF0ZXJTa1BpY3R1cmU6OmNsZWFyRnJhbWVCdWZmZXIoKQotewotI2lmbmRlZiBOREVCVUcKLSAg ICAvLyBDbGVhciB0byBncmVlbiB0byBtYWtlIGl0IGVhc2llciB0byBzcG90IHVucmVuZGVyZWQg cmVnaW9ucy4KLSAgICBjb250ZXh0KCktPmNsZWFyQ29sb3IoMCwgMSwgMCwgMSk7Ci0gICAgY29u dGV4dCgpLT5jbGVhcihHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQlVGRkVSX0JJVCB8IEdyYXBo aWNzQ29udGV4dDNEOjpTVEVOQ0lMX0JVRkZFUl9CSVQpOwotI2VuZGlmCi19CiAjZW5kaWYgLy8g U0tJQQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJU ZXh0dXJlVXBkYXRlckNhbnZhcy5oCShyZXZpc2lvbiA4NzUxOCkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuaAko d29ya2luZyBjb3B5KQpAQCAtOTEsNyArOTEsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZv aWQgZGVsZXRlRnJhbWVCdWZmZXIoKTsKICAgICBib29sIGNyZWF0ZUZyYW1lQnVmZmVyKCk7Ci0g ICAgdm9pZCBjbGVhckZyYW1lQnVmZmVyKCk7CiAKICAgICBHckNvbnRleHQqIG1fc2tpYUNvbnRl eHQ7IC8vIFNLSUEgZ3JhcGhpY3MgY29udGV4dC4KIAo= 95665 2011-06-01 14:30:54 -0700 2011-06-02 13:11:05 -0700 proposed patch 61639.patch text/plain 5125 alokp SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NTE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDUtMjcgIEFsb2sgUHJp eWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBUaGluZ3MganVtcCBhcm91bmQgd2hl biBzZWxlY3RpbmcgYW55dGhpbmcgb24gdGhlIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNjM5CisKKyAgICAgICAgV2ViQ29yZTo6TGF5ZXJU ZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6dXBkYXRlVGV4dHVyZVJlY3Qgd2FzIG5vdCB1cGRhdGlu ZyBhIHRpbGUgc3ViLXJlZ2lvbiBwcm9wZXJseS4KKyAgICAgICAgSXQgZGlkIG5vdCBjb25zaWRl ciBkZXN0LXJlY3Qgd2hlbiBzZWxlY3RpbmcgdGhlIGNsaXAgYW5kIHRyYW5zbGF0aW9uIHJlcXVp cmVkIHRvIGRyYXcgdGhlIGNvbnRlbnQtcmVjdCBpbnRvIGRlc3QtcmVjdC4KKyAgICAgICAgQWxz byByZW1vdmVkIGNsZWFyaW5nIG9mIGZyYW1lYnVmZmVyIGJlY2F1c2UgaXQgdXNlZCB0byBjbGVh ciB0aGUgd2hvbGUgdGlsZSBub3QganVzdCBkZXN0LXJlY3QuCisgICAgICAgIEFuIGFwcHJvcHJp YXRlIHZpZXdwb3J0IGNvdWxkIGJlIHNldCB0byBqdXN0IGNsZWFyIHRoZSBkZXN0LXJlY3QsIGJ1 dCBpdCB3YXMgZGVidWcgb25seSBjb2RlIGFuZCBJIGRpZCBub3Qgd2FudCB0byBtZXNzCisgICAg ICAgIHdpdGggdGhlIHZpZXdwb3J0IHNldCBieSBza2lhLgorICAgICAgICAKKyAgICAgICAgTm8g bmV3IHRlc3RzLiBUaGlzIGNhc2Ugc2hvdWxkIGJlIGNvdmVyZWQgYnkgbW9zdCBvZiB0aGUgbGF5 b3V0IHRlc3RzIChwaXhlbCkgdGFyZ2V0aW5nIHNlbGVjdGlvbiBvciBob3ZlcmluZyB3aGVuIGNo cm9taXVtIGlzIHJ1biBpbiBjb21wb3NpdGluZyBtb2RlLgorICAgICAgICBIZXJlIGlzIGEgbm9u LWV4aGF1c3RpdmUgbGlzdCBvZiBleGlzdGluZyB0ZXN0cyBjb3ZlcmluZyB0aGlzIGNhc2UuCisg ICAgICAgIFRlc3Q6IGVkaXRpbmcvc2VsZWN0aW9uLzE0OTcxLmh0bWwgKGV4aXN0aW5nKQorICAg ICAgICAgICAgICBlZGl0aW5nL3NlbGVjdGlvbi8zNjkwNzAzLTIuaHRtbCAoZXhpc3RpbmcpCisg ICAgICAgICAgICAgIGVkaXRpbmcvc2VsZWN0aW9uLzQ0MDIzNzUuaHRtbCAoZXhpc3RpbmcpCisg ICAgICAgICAgICAgIGVkaXRpbmcvc2VsZWN0aW9uLzQ4MTgxNDUuaHRtbCAoZXhpc3RpbmcpCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVy Q2FudmFzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1 cmU6OnVwZGF0ZVRleHR1cmVSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVw ZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZUZyYW1lQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmg6CisKIDIwMTEtMDUt MjcgIFJvYiBCdWlzICA8cmJ1aXNAcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtv bGFzIFppbW1lcm1hbm4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVy Q2FudmFzLmNwcAkocmV2aXNpb24gODc1MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTM3LDE1ICsxMzcsMTQgQEAgdm9pZCBMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0 dXJlOjp1cGRhdAogICAgIHRleHR1cmUtPmZyYW1lYnVmZmVyVGV4dHVyZTJEKCk7CiAgICAgQVNT RVJUKGNvbnRleHQoKS0+Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHcmFwaGljc0NvbnRleHQzRDo6 RlJBTUVCVUZGRVIpID09IEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUl9DT01QTEVURSk7 CiAKLSAgICBjb250ZXh0KCktPnZpZXdwb3J0KDAsIDAsIG1fYnVmZmVyU2l6ZS53aWR0aCgpLCBt X2J1ZmZlclNpemUuaGVpZ2h0KCkpOwotICAgIGNsZWFyRnJhbWVCdWZmZXIoKTsKLQogICAgIC8v IE5vdGlmeSBTS0lBIHRvIHN5bmMgaXRzIGludGVybmFsIEdMIHN0YXRlLgogICAgIG1fc2tpYUNv bnRleHQtPnJlc2V0Q29udGV4dCgpOwotICAgIC8vIE9mZnNldCBmcm9tIHNvdXJjZSByZWN0YW5n bGUgdG8gdGhpcyBkZXN0aW5hdGlvbiByZWN0YW5nbGUuCi0gICAgSW50UG9pbnQgb2Zmc2V0KHNv dXJjZVJlY3QueCgpIC0gY29udGVudFJlY3QoKS54KCksIHNvdXJjZVJlY3QueSgpIC0gY29udGVu dFJlY3QoKS55KCkpOwogICAgIG1fY2FudmFzLT5zYXZlKCk7Ci0gICAgbV9jYW52YXMtPnRyYW5z bGF0ZSgtb2Zmc2V0LngoKSwgLW9mZnNldC55KCkpOworICAgIG1fY2FudmFzLT5jbGlwUmVjdChT a1JlY3QoZGVzdFJlY3QpKTsKKyAgICAvLyBUcmFuc2xhdGUgdGhlIG9yaWdpbiBvZiBjb250ZW50 UmVjdCB0byB0aGF0IG9mIGRlc3RSZWN0LgorICAgIC8vIE5vdGUgdGhhdCBkZXN0UmVjdCBpcyBk ZWZpbmVkIHJlbGF0aXZlIHRvIHNvdXJjZVJlY3QuCisgICAgbV9jYW52YXMtPnRyYW5zbGF0ZShj b250ZW50UmVjdCgpLngoKSAtIHNvdXJjZVJlY3QueCgpICsgZGVzdFJlY3QueCgpLAorICAgICAg ICAgICAgICAgICAgICAgICAgY29udGVudFJlY3QoKS55KCkgLSBzb3VyY2VSZWN0LnkoKSArIGRl c3RSZWN0LnkoKSk7CiAgICAgbV9jYW52YXMtPmRyYXdQaWN0dXJlKG1fcGljdHVyZSk7CiAgICAg bV9jYW52YXMtPnJlc3RvcmUoKTsKICAgICAvLyBGbHVzaCBTS0lBIGNvbnRleHQgc28gdGhhdCBh bGwgdGhlIHJlbmRlcmVkIHN0dWZmIGFwcGVhcnMgb24gdGhlIHRleHR1cmUuCkBAIC0yMTAsOCAr MjA5LDcgQEAgYm9vbCBMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlOjpjcmVhdAogICAgIH0K ICAgICBjb250ZXh0KCktPmJpbmRSZW5kZXJidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRF UkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwogICAgIGNvbnRleHQoKS0+cmVuZGVyYnVm ZmVyU3RvcmFnZShHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBFeHRlbnNpb25zM0Q6 OkRFUFRIMjRfU1RFTkNJTDgsIG1fYnVmZmVyU2l6ZS53aWR0aCgpLCBtX2J1ZmZlclNpemUuaGVp Z2h0KCkpOwotICAgIGNvbnRleHQoKS0+ZnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR3JhcGhpY3ND b250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9BVFRBQ0hN RU5ULCBHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZl cik7Ci0gICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRl eHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9BVFRBQ0hNRU5ULCBH cmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7Cisg ICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6 RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9TVEVOQ0lMX0FUVEFDSE1FTlQs IEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsK IAogICAgIC8vIENyZWF0ZSBhIHNraWEgZ3B1IGNhbnZhcy4KICAgICBHclBsYXRmb3JtU3VyZmFj ZURlc2MgdGFyZ2V0RGVzYzsKQEAgLTIzMiwxNSArMjMwLDYgQEAgYm9vbCBMYXllclRleHR1cmVV cGRhdGVyU2tQaWN0dXJlOjpjcmVhdAogICAgIGNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdy YXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgMCk7CiAgICAgcmV0dXJuIHRydWU7CiB9Ci0K LXZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y2xlYXJGcmFtZUJ1ZmZlcigpCi17 Ci0jaWZuZGVmIE5ERUJVRwotICAgIC8vIENsZWFyIHRvIGdyZWVuIHRvIG1ha2UgaXQgZWFzaWVy IHRvIHNwb3QgdW5yZW5kZXJlZCByZWdpb25zLgotICAgIGNvbnRleHQoKS0+Y2xlYXJDb2xvcigw LCAxLCAwLCAxKTsKLSAgICBjb250ZXh0KCktPmNsZWFyKEdyYXBoaWNzQ29udGV4dDNEOjpDT0xP Ul9CVUZGRVJfQklUIHwgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQlVGRkVSX0JJVCk7Ci0j ZW5kaWYKLX0KICNlbmRpZiAvLyBTS0lBCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGV4dHVyZVVw ZGF0ZXJDYW52YXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmgJKHJldmlzaW9uIDg3NTE4 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0 dXJlVXBkYXRlckNhbnZhcy5oCSh3b3JraW5nIGNvcHkpCkBAIC05MSw3ICs5MSw2IEBAIHB1Ymxp YzoKIHByaXZhdGU6CiAgICAgdm9pZCBkZWxldGVGcmFtZUJ1ZmZlcigpOwogICAgIGJvb2wgY3Jl YXRlRnJhbWVCdWZmZXIoKTsKLSAgICB2b2lkIGNsZWFyRnJhbWVCdWZmZXIoKTsKIAogICAgIEdy Q29udGV4dCogbV9za2lhQ29udGV4dDsgLy8gU0tJQSBncmFwaGljcyBjb250ZXh0LgogCg==