116539 2013-05-21 08:24:08 -0700 [BlackBerry] Make screen updates dependent on the existence of a drawing buffer 2013-05-26 23:55:03 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson cgarcia commit-queue rwlbuis tonikitoo xan.lopez oldest_to_newest 891774 0 jpetsovits 2013-05-21 08:24:08 -0700 We currently use a suspend counter to ensure that if a target buffer is missing initially, blitting to screen / target buffer will not happen. The patch below reduces complexity by relying on the current state, rather than the suspend counter, which in turn makes it possible to simplify the code in setCompositor(). 891782 1 202432 jpetsovits 2013-05-21 08:35:07 -0700 Created attachment 202432 Patch 891803 2 202436 jpetsovits 2013-05-21 08:53:13 -0700 Created attachment 202436 Patch Whoops, forgot to include the description part of the commit message. 893481 3 202860 jpetsovits 2013-05-24 15:55:10 -0700 Created attachment 202860 Patch Not sure why the patch didn't like to be applied. It cherry-picked fine from my git branch onto (git-)SVN trunk, ChangeLog aside. Trying again - this time coming straight from the svn/master branch, hopefully the bots like me better this time. 893885 4 anilsson 2013-05-26 21:09:03 -0700 LGTM, passed internal review :) 893897 5 202860 commit-queue 2013-05-26 23:55:01 -0700 Comment on attachment 202860 Patch Clearing flags on attachment: 202860 Committed r150735: <http://trac.webkit.org/changeset/150735> 893898 6 commit-queue 2013-05-26 23:55:03 -0700 All reviewed patches have been landed. Closing bug. 202432 2013-05-21 08:35:07 -0700 2013-05-21 08:53:08 -0700 Patch bug-116539-20130521153345.patch text/plain 3736 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAwMjhmOTRmZTEyMDg0YjU3YjM1NDE4YWY1MjZlNTdlYTRhNTdiOTg2Li43ZjczYmZjNGY0 ZjI2MDMxNWQxZGExYjBiYzJmNmM5YTUwNTQ3YjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMy0wNS0yMSAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gTWFrZSBzY3Jl ZW4gdXBkYXRlcyBkZXBlbmRlbnQgb24gdGhlIGV4aXN0ZW5jZSBvZiBhIGRyYXdpbmcgYnVmZmVy LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2NTM5 CisgICAgICAgIEludGVybmFsIFBSIDMzMDkxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IFhpYW9ibyBXYW5nIGFu ZCBBcnZpZCBOaWxzc29uLgorCisgICAgICAgICogQXBpL0JhY2tpbmdTdG9yZS5jcHA6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OnVwZGF0ZVN1c3Bl bmRTY3JlZW5VcGRhdGVTdGF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tp bmdTdG9yZVByaXZhdGU6OmNyZWF0ZVN1cmZhY2VzKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5j cHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpzZXRDb21w b3NpdG9yKToKKwogMjAxMy0wNS0wMyAgSmFja3kgSmlhbmcgIDx6aGFqaWFuZ0BibGFja2JlcnJ5 LmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gUGFnZSByZW5kZXJpbmcgc2NhbGUgaXMgY2hh bmdlZCBhZnRlciBnbyBiYWNrIGFuZCBmb3J3YXJkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKaW5kZXggNmJmNGM3MTM0MTBkYzg2YTBhNzA4MjhkZGJi MGIwYzA3NDM1ZmIxMC4uZTYwZjRhZGRhMDA4NzU5M2FmZGUxMjczYjM3MDAyMzgyYTVjMTJhYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcApAQCAt NDA5LDYgKzQwOSw3IEBAIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6dXBkYXRlU3VzcGVuZFNj cmVlblVwZGF0ZVN0YXRlKGJvb2wqIGhhc1N5bmNlZFRvVXNlckluCiAgICAgICAgICYmIChtX3N1 c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzIHx8ICFtX3JlbmRlclF1ZXVlLT5oYXNDdXJyZW50Vmlz aWJsZVpvb21Kb2IoKSk7IC8vIEJhY2tpbmdzdG9yZSBpcyBub3QgdXNhYmxlIHdoaWxlIHdlJ3Jl IHdhaXRpbmcgZm9yIGFuICgiYXRvbWljIikgem9vbSBqb2IgdG8gZmluaXNoLgogCiAgICAgYm9v bCBzaG91bGRTdXNwZW5kID0gbV9zdXNwZW5kU2NyZWVuVXBkYXRlQ291bnRlcldlYktpdFRocmVh ZAorICAgICAgICB8fCAhYnVmZmVyKCkKICAgICAgICAgfHwgIW1fd2ViUGFnZS0+aXNWaXNpYmxl KCkKICAgICAgICAgfHwgKCFpc0JhY2tpbmdTdG9yZVVzYWJsZSAmJiAhbV93ZWJQYWdlLT5kLT5j b21wb3NpdG9yRHJhd3NSb290TGF5ZXIoKSk7CiAKQEAgLTE2OTQsOSArMTY5NSw5IEBAIHZvaWQg QmFja2luZ1N0b3JlUHJpdmF0ZTo6Y3JlYXRlU3VyZmFjZXMoKQogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgLy8gRG9uJ3QgdHJ5IHRvIGJsaXQgdG8gc2NyZWVuIHVubGVzcyB3ZSBoYXZl IGEgYnVmZmVyLgotICAgIGlmICghYnVmZmVyKCkpCi0gICAgICAgIHN1c3BlbmRTY3JlZW5VcGRh dGVzKCk7CisgICAgLy8gSW5pdGlhbGl6ZSAoaW5pdGlhbGx5LCBwcm9iYWJseSBzdXNwZW5kKSBz Y3JlZW4gdXBkYXRlcyBiYXNlZCBvbiB2YXJpb3VzCisgICAgLy8gY29uZGl0aW9ucywgaW5jbHVk aW5nIHdoZXRoZXIgb3Igbm90IHdlIGhhdmUgYSBkcmF3aW5nIHRhcmdldCBidWZmZXIuCisgICAg dXBkYXRlU3VzcGVuZFNjcmVlblVwZGF0ZVN0YXRlKCk7CiAKICAgICBTdXJmYWNlUG9vbCogc3Vy ZmFjZVBvb2wgPSBTdXJmYWNlUG9vbDo6Z2xvYmFsU3VyZmFjZVBvb2woKTsKICAgICBzdXJmYWNl UG9vbC0+aW5pdGlhbGl6ZSh0aWxlU2l6ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2UuY3BwCmluZGV4IGJiYTA3ZjgyN2E0ZDZjYWU1YzA0MzBiMmE0NmQwMzExZWMwM2Y5 ZDMuLmYwYTNiOGNjNmVmODczODA3YmQ1NDFlYmFkM2MwODEyM2QzYzI1ZGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtNTM2OCwxNSArNTM2OCwxMyBAQCB2 b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRDb21wb3NpdG9yKFBhc3NSZWZQdHI8V2ViUGFnZUNvbXBv c2l0b3JQcml2YXRlPiBjb21wb3NpdAogICAgIC8vIFRoYXQgc2VlbXMgZXh0cmVtZWx5IGxpa2Vs eSB0byBiZSB0aGUgY2FzZSwgYnV0IGxldCdzIGFzc2VydCBqdXN0IHRvIG1ha2Ugc3VyZS4KICAg ICBBU1NFUlQod2ViS2l0VGhyZWFkTWVzc2FnZUNsaWVudCgpLT5pc0N1cnJlbnRUaHJlYWQoKSk7 CiAKLSAgICBpZiAobV9jb21wb3NpdG9yIHx8IChtX2NsaWVudC0+d2luZG93KCkgJiYgbV9jbGll bnQtPndpbmRvdygpLT5idWZmZXIoKSkpCi0gICAgICAgIG1fYmFja2luZ1N0b3JlLT5kLT5zdXNw ZW5kU2NyZWVuVXBkYXRlcygpOworICAgIG1fYmFja2luZ1N0b3JlLT5kLT5zdXNwZW5kU2NyZWVu VXBkYXRlcygpOwogCiAgICAgLy8gVGhlIG1fY29tcG9zaXRvciBtZW1iZXIgaGFzIHRvIGJlIG1v ZGlmaWVkIGR1cmluZyBhIHN5bmMgY2FsbCBmb3IgdGhyZWFkCiAgICAgLy8gc2FmZSBhY2Nlc3Mg dG8gbV9jb21wb3NpdG9yIGFuZCBpdHMgcmVmY291bnQuCiAgICAgdXNlckludGVyZmFjZVRocmVh ZE1lc3NhZ2VDbGllbnQoKS0+ZGlzcGF0Y2hTeW5jTWVzc2FnZShjcmVhdGVNZXRob2RDYWxsTWVz c2FnZSgmV2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JIZWxwZXIsIHRoaXMsIGNvbXBvc2l0 b3IpKTsKIAotICAgIGlmIChtX2NvbXBvc2l0b3IgfHwgKG1fY2xpZW50LT53aW5kb3coKSAmJiBt X2NsaWVudC0+d2luZG93KCktPmJ1ZmZlcigpKSkgLy8gdGhlIG5ldyBjb21wb3NpdG9yLCBpZiBv bmUgd2FzIHNldAotICAgICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+cmVzdW1lU2NyZWVuVXBkYXRl cyhCYWNraW5nU3RvcmU6OlJlbmRlckFuZEJsaXQpOworICAgIG1fYmFja2luZ1N0b3JlLT5kLT5y ZXN1bWVTY3JlZW5VcGRhdGVzKEJhY2tpbmdTdG9yZTo6UmVuZGVyQW5kQmxpdCk7CiB9CiAKIHZv aWQgV2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JIZWxwZXIoUGFzc1JlZlB0cjxXZWJQYWdl Q29tcG9zaXRvclByaXZhdGU+IGNvbXBvc2l0b3IpCg== 202436 2013-05-21 08:53:13 -0700 2013-05-24 15:55:06 -0700 Patch bug-116539-20130521155151.patch text/plain 3928 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAwMjhmOTRmZTEyMDg0YjU3YjM1NDE4YWY1MjZlNTdlYTRhNTdiOTg2Li44NjU3OTBjYzY0 ZDcyMWYyNGFiNjk5NmEzMjg0MDI1ZGVkOGEwNmY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMy0wNS0yMSAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gTWFrZSBzY3Jl ZW4gdXBkYXRlcyBkZXBlbmRlbnQgb24gdGhlIGV4aXN0ZW5jZSBvZiBhIGRyYXdpbmcgYnVmZmVy LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2NTM5 CisgICAgICAgIEludGVybmFsIFBSIDMzMDkxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IFhpYW9ibyBXYW5nIGFu ZCBBcnZpZCBOaWxzc29uLgorCisgICAgICAgIFRoaXMgcmVkdWNlcyBjb21wbGV4aXR5IGJ5IHJl bHlpbmcgb24gdGhlIGN1cnJlbnQgc3RhdGUsCisgICAgICAgIHJhdGhlciB0aGFuIHRoZSBzdXNw ZW5kIGNvdW50ZXIsIHdoaWNoIGluIHR1cm4gbWFrZXMgaXQKKyAgICAgICAgcG9zc2libGUgdG8g c2ltcGxpZnkgdGhlIGNvZGUgaW4gc2V0Q29tcG9zaXRvcigpLgorCisgICAgICAgICogQXBpL0Jh Y2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9y ZVByaXZhdGU6OnVwZGF0ZVN1c3BlbmRTY3JlZW5VcGRhdGVTdGF0ZSk6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OmNyZWF0ZVN1cmZhY2VzKToKKyAg ICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Oldl YlBhZ2VQcml2YXRlOjpzZXRDb21wb3NpdG9yKToKKwogMjAxMy0wNS0wMyAgSmFja3kgSmlhbmcg IDx6aGFqaWFuZ0BibGFja2JlcnJ5LmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gUGFnZSBy ZW5kZXJpbmcgc2NhbGUgaXMgY2hhbmdlZCBhZnRlciBnbyBiYWNrIGFuZCBmb3J3YXJkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKaW5kZXggNmJmNGM3 MTM0MTBkYzg2YTBhNzA4MjhkZGJiMGIwYzA3NDM1ZmIxMC4uZTYwZjRhZGRhMDA4NzU5M2FmZGUx MjczYjM3MDAyMzgyYTVjMTJhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9CYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv QmFja2luZ1N0b3JlLmNwcApAQCAtNDA5LDYgKzQwOSw3IEBAIHZvaWQgQmFja2luZ1N0b3JlUHJp dmF0ZTo6dXBkYXRlU3VzcGVuZFNjcmVlblVwZGF0ZVN0YXRlKGJvb2wqIGhhc1N5bmNlZFRvVXNl ckluCiAgICAgICAgICYmIChtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzIHx8ICFtX3JlbmRl clF1ZXVlLT5oYXNDdXJyZW50VmlzaWJsZVpvb21Kb2IoKSk7IC8vIEJhY2tpbmdzdG9yZSBpcyBu b3QgdXNhYmxlIHdoaWxlIHdlJ3JlIHdhaXRpbmcgZm9yIGFuICgiYXRvbWljIikgem9vbSBqb2Ig dG8gZmluaXNoLgogCiAgICAgYm9vbCBzaG91bGRTdXNwZW5kID0gbV9zdXNwZW5kU2NyZWVuVXBk YXRlQ291bnRlcldlYktpdFRocmVhZAorICAgICAgICB8fCAhYnVmZmVyKCkKICAgICAgICAgfHwg IW1fd2ViUGFnZS0+aXNWaXNpYmxlKCkKICAgICAgICAgfHwgKCFpc0JhY2tpbmdTdG9yZVVzYWJs ZSAmJiAhbV93ZWJQYWdlLT5kLT5jb21wb3NpdG9yRHJhd3NSb290TGF5ZXIoKSk7CiAKQEAgLTE2 OTQsOSArMTY5NSw5IEBAIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6Y3JlYXRlU3VyZmFjZXMo KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8gRG9uJ3QgdHJ5IHRvIGJsaXQgdG8g c2NyZWVuIHVubGVzcyB3ZSBoYXZlIGEgYnVmZmVyLgotICAgIGlmICghYnVmZmVyKCkpCi0gICAg ICAgIHN1c3BlbmRTY3JlZW5VcGRhdGVzKCk7CisgICAgLy8gSW5pdGlhbGl6ZSAoaW5pdGlhbGx5 LCBwcm9iYWJseSBzdXNwZW5kKSBzY3JlZW4gdXBkYXRlcyBiYXNlZCBvbiB2YXJpb3VzCisgICAg Ly8gY29uZGl0aW9ucywgaW5jbHVkaW5nIHdoZXRoZXIgb3Igbm90IHdlIGhhdmUgYSBkcmF3aW5n IHRhcmdldCBidWZmZXIuCisgICAgdXBkYXRlU3VzcGVuZFNjcmVlblVwZGF0ZVN0YXRlKCk7CiAK ICAgICBTdXJmYWNlUG9vbCogc3VyZmFjZVBvb2wgPSBTdXJmYWNlUG9vbDo6Z2xvYmFsU3VyZmFj ZVBvb2woKTsKICAgICBzdXJmYWNlUG9vbC0+aW5pdGlhbGl6ZSh0aWxlU2l6ZSgpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGJiYTA3ZjgyN2E0ZDZjYWU1 YzA0MzBiMmE0NmQwMzExZWMwM2Y5ZDMuLmYwYTNiOGNjNmVmODczODA3YmQ1NDFlYmFkM2MwODEy M2QzYzI1ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAt NTM2OCwxNSArNTM2OCwxMyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRDb21wb3NpdG9yKFBh c3NSZWZQdHI8V2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlPiBjb21wb3NpdAogICAgIC8vIFRoYXQg c2VlbXMgZXh0cmVtZWx5IGxpa2VseSB0byBiZSB0aGUgY2FzZSwgYnV0IGxldCdzIGFzc2VydCBq dXN0IHRvIG1ha2Ugc3VyZS4KICAgICBBU1NFUlQod2ViS2l0VGhyZWFkTWVzc2FnZUNsaWVudCgp LT5pc0N1cnJlbnRUaHJlYWQoKSk7CiAKLSAgICBpZiAobV9jb21wb3NpdG9yIHx8IChtX2NsaWVu dC0+d2luZG93KCkgJiYgbV9jbGllbnQtPndpbmRvdygpLT5idWZmZXIoKSkpCi0gICAgICAgIG1f YmFja2luZ1N0b3JlLT5kLT5zdXNwZW5kU2NyZWVuVXBkYXRlcygpOworICAgIG1fYmFja2luZ1N0 b3JlLT5kLT5zdXNwZW5kU2NyZWVuVXBkYXRlcygpOwogCiAgICAgLy8gVGhlIG1fY29tcG9zaXRv ciBtZW1iZXIgaGFzIHRvIGJlIG1vZGlmaWVkIGR1cmluZyBhIHN5bmMgY2FsbCBmb3IgdGhyZWFk CiAgICAgLy8gc2FmZSBhY2Nlc3MgdG8gbV9jb21wb3NpdG9yIGFuZCBpdHMgcmVmY291bnQuCiAg ICAgdXNlckludGVyZmFjZVRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ZGlzcGF0Y2hTeW5jTWVzc2Fn ZShjcmVhdGVNZXRob2RDYWxsTWVzc2FnZSgmV2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JI ZWxwZXIsIHRoaXMsIGNvbXBvc2l0b3IpKTsKIAotICAgIGlmIChtX2NvbXBvc2l0b3IgfHwgKG1f Y2xpZW50LT53aW5kb3coKSAmJiBtX2NsaWVudC0+d2luZG93KCktPmJ1ZmZlcigpKSkgLy8gdGhl IG5ldyBjb21wb3NpdG9yLCBpZiBvbmUgd2FzIHNldAotICAgICAgICBtX2JhY2tpbmdTdG9yZS0+ ZC0+cmVzdW1lU2NyZWVuVXBkYXRlcyhCYWNraW5nU3RvcmU6OlJlbmRlckFuZEJsaXQpOworICAg IG1fYmFja2luZ1N0b3JlLT5kLT5yZXN1bWVTY3JlZW5VcGRhdGVzKEJhY2tpbmdTdG9yZTo6UmVu ZGVyQW5kQmxpdCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JIZWxw ZXIoUGFzc1JlZlB0cjxXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU+IGNvbXBvc2l0b3IpCg== 202860 2013-05-24 15:55:10 -0700 2013-05-26 23:55:01 -0700 Patch bug-116539-20130524225341.patch text/plain 3810 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBjNmMxOWJhNTc2ZmJjMmNmY2RkOWI3YmZmOTc1ODBmZmZlNzRhMjUzLi40NjljMzc1NTY4 Mjk2M2Y0NDE0OGZlYzQ1YmU4MDc0NmE4ZWUxZGU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMy0wNS0yNCAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gTWFrZSBzY3Jl ZW4gdXBkYXRlcyBkZXBlbmRlbnQgb24gdGhlIGV4aXN0ZW5jZSBvZiBhIGRyYXdpbmcgYnVmZmVy LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2NTM5 CisgICAgICAgIEludGVybmFsIFBSIDMzMDkxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IFhpYW9ibyBXYW5nIGFu ZCBBcnZpZCBOaWxzc29uLgorCisgICAgICAgIFRoaXMgcmVkdWNlcyBjb21wbGV4aXR5IGJ5IHJl bHlpbmcgb24gdGhlIGN1cnJlbnQgc3RhdGUsCisgICAgICAgIHJhdGhlciB0aGFuIHRoZSBzdXNw ZW5kIGNvdW50ZXIsIHdoaWNoIGluIHR1cm4gbWFrZXMgaXQKKyAgICAgICAgcG9zc2libGUgdG8g c2ltcGxpZnkgdGhlIGNvZGUgaW4gc2V0Q29tcG9zaXRvcigpLgorCisgICAgICAgICogQXBpL0Jh Y2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9y ZVByaXZhdGU6OnVwZGF0ZVN1c3BlbmRTY3JlZW5VcGRhdGVTdGF0ZSk6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OmNyZWF0ZVN1cmZhY2VzKToKKyAg ICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Oldl YlBhZ2VQcml2YXRlOjpzZXRDb21wb3NpdG9yKToKKwogMjAxMy0wNS0yNCAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBQYWdlUG9wdXAgY29k ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUu Y3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCmluZGV4 IGJiOWQzZjZiYjVjYTU0ZWQ4NmZmZGJiYTQ2NGU2MWM5MmFmNDI4YzguLjFkYjU0M2MyZjU4Yjc1 ZjEzYzMxMjVjYTlmMTMyZWU0ZmI0OGJiNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKQEAgLTQxMCw2ICs0MTAsNyBAQCB2b2lkIEJhY2tpbmdT dG9yZVByaXZhdGU6OnVwZGF0ZVN1c3BlbmRTY3JlZW5VcGRhdGVTdGF0ZShib29sKiBoYXNTeW5j ZWRUb1VzZXJJbgogICAgICAgICAmJiAobV9zdXNwZW5kQmFja2luZ1N0b3JlVXBkYXRlcyB8fCAh bV9yZW5kZXJRdWV1ZS0+aGFzQ3VycmVudFZpc2libGVab29tSm9iKCkpOyAvLyBCYWNraW5nc3Rv cmUgaXMgbm90IHVzYWJsZSB3aGlsZSB3ZSdyZSB3YWl0aW5nIGZvciBhbiAoImF0b21pYyIpIHpv b20gam9iIHRvIGZpbmlzaC4KIAogICAgIGJvb2wgc2hvdWxkU3VzcGVuZCA9IG1fc3VzcGVuZFNj cmVlblVwZGF0ZUNvdW50ZXJXZWJLaXRUaHJlYWQKKyAgICAgICAgfHwgIWJ1ZmZlcigpCiAgICAg ICAgIHx8ICFtX3dlYlBhZ2UtPmlzVmlzaWJsZSgpCiAgICAgICAgIHx8ICghaXNCYWNraW5nU3Rv cmVVc2FibGUgJiYgIW1fd2ViUGFnZS0+ZC0+Y29tcG9zaXRvckRyYXdzUm9vdExheWVyKCkpOwog CkBAIC0xNjk4LDkgKzE2OTksOSBAQCB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmNyZWF0ZVN1 cmZhY2VzKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIC8vIERvbid0IHRyeSB0byBi bGl0IHRvIHNjcmVlbiB1bmxlc3Mgd2UgaGF2ZSBhIGJ1ZmZlci4KLSAgICBpZiAoIWJ1ZmZlcigp KQotICAgICAgICBzdXNwZW5kU2NyZWVuVXBkYXRlcygpOworICAgIC8vIEluaXRpYWxpemUgKGlu aXRpYWxseSwgcHJvYmFibHkgc3VzcGVuZCkgc2NyZWVuIHVwZGF0ZXMgYmFzZWQgb24gdmFyaW91 cworICAgIC8vIGNvbmRpdGlvbnMsIGluY2x1ZGluZyB3aGV0aGVyIG9yIG5vdCB3ZSBoYXZlIGEg ZHJhd2luZyB0YXJnZXQgYnVmZmVyLgorICAgIHVwZGF0ZVN1c3BlbmRTY3JlZW5VcGRhdGVTdGF0 ZSgpOwogCiAgICAgU3VyZmFjZVBvb2wqIHN1cmZhY2VQb29sID0gU3VyZmFjZVBvb2w6Omdsb2Jh bFN1cmZhY2VQb29sKCk7CiAgICAgc3VyZmFjZVBvb2wtPmluaXRpYWxpemUodGlsZVNpemUoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA4NzgzNmE0NmM1 OWZmYTJkZWJjOWQwZjMzZTU5NjNiNTAwNDkyYTg5Li42NjE1NGQ4OTI2N2MwM2IxZDg0ZDA5ODY3 N2RiNDZiYjJjMmFmYmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAKQEAgLTUzMzksMTUgKzUzMzksMTMgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6c2V0Q29tcG9z aXRvcihQYXNzUmVmUHRyPFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZT4gY29tcG9zaXQKICAgICAv LyBUaGF0IHNlZW1zIGV4dHJlbWVseSBsaWtlbHkgdG8gYmUgdGhlIGNhc2UsIGJ1dCBsZXQncyBh c3NlcnQganVzdCB0byBtYWtlIHN1cmUuCiAgICAgQVNTRVJUKHdlYktpdFRocmVhZE1lc3NhZ2VD bGllbnQoKS0+aXNDdXJyZW50VGhyZWFkKCkpOwogCi0gICAgaWYgKG1fY29tcG9zaXRvciB8fCBt X2NsaWVudC0+d2luZG93KCkpCi0gICAgICAgIG1fYmFja2luZ1N0b3JlLT5kLT5zdXNwZW5kU2Ny ZWVuVXBkYXRlcygpOworICAgIG1fYmFja2luZ1N0b3JlLT5kLT5zdXNwZW5kU2NyZWVuVXBkYXRl cygpOwogCiAgICAgLy8gVGhlIG1fY29tcG9zaXRvciBtZW1iZXIgaGFzIHRvIGJlIG1vZGlmaWVk IGR1cmluZyBhIHN5bmMgY2FsbCBmb3IgdGhyZWFkCiAgICAgLy8gc2FmZSBhY2Nlc3MgdG8gbV9j b21wb3NpdG9yIGFuZCBpdHMgcmVmY291bnQuCiAgICAgdXNlckludGVyZmFjZVRocmVhZE1lc3Nh Z2VDbGllbnQoKS0+ZGlzcGF0Y2hTeW5jTWVzc2FnZShjcmVhdGVNZXRob2RDYWxsTWVzc2FnZSgm V2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JIZWxwZXIsIHRoaXMsIGNvbXBvc2l0b3IpKTsK IAotICAgIGlmIChtX2NvbXBvc2l0b3IgfHwgbV9jbGllbnQtPndpbmRvdygpKSAvLyB0aGUgbmV3 IGNvbXBvc2l0b3IsIGlmIG9uZSB3YXMgc2V0Ci0gICAgICAgIG1fYmFja2luZ1N0b3JlLT5kLT5y ZXN1bWVTY3JlZW5VcGRhdGVzKEJhY2tpbmdTdG9yZTo6UmVuZGVyQW5kQmxpdCk7CisgICAgbV9i YWNraW5nU3RvcmUtPmQtPnJlc3VtZVNjcmVlblVwZGF0ZXMoQmFja2luZ1N0b3JlOjpSZW5kZXJB bmRCbGl0KTsKIH0KIAogdm9pZCBXZWJQYWdlUHJpdmF0ZTo6c2V0Q29tcG9zaXRvckhlbHBlcihQ YXNzUmVmUHRyPFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZT4gY29tcG9zaXRvcikK