102397 2012-11-15 09:00:06 -0800 [BlackBerry] Fix suspend/resume assertion in setCompositor() 2012-11-15 09:58:20 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson manyoso mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 768140 0 jpetsovits 2012-11-15 09:00:06 -0800 If a compositor is used but no surface pool is ever allocated (which is a perfectly valid use case), initial suspension of the backingstore is skipped because of an early return. This will cause an assertion to be triggered and a bug. Fix this by suspending it before the return. With Adam Treat's recent change to split suspension of screen and backingstore into two different functions, this can now be reduced to a mere screen (blitting) suspension. That was the original intention of this code. 768145 1 174459 jpetsovits 2012-11-15 09:03:26 -0800 Created attachment 174459 Patch 768209 2 174459 webkit.review.bot 2012-11-15 09:58:17 -0800 Comment on attachment 174459 Patch Clearing flags on attachment: 174459 Committed r134788: <http://trac.webkit.org/changeset/134788> 768210 3 webkit.review.bot 2012-11-15 09:58:20 -0800 All reviewed patches have been landed. Closing bug. 174459 2012-11-15 09:03:26 -0800 2012-11-15 09:58:17 -0800 Patch bug-102397-20121115120120.patch text/plain 4139 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0Nzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBkNGNjMzU2ZmE0NWU5NzU0ZjVmMmNkYzhkZTQ1NmY5Yjg0ZjdjZDZjLi4zMDRkZWM3ZjQz NTEyODU4NmY3Nzk0NjRlNDU0NTZiYmMzOTk2MTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0xMS0xNSAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBGaXggc3VzcGVuZC9yZXN1 bWUgYXNzZXJ0aW9uIGluIHNldENvbXBvc2l0b3IoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjM5NworICAgICAgICBSSU0gUFIgMjQ0NzAxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgYSBjb21w b3NpdG9yIGlzIHVzZWQgYnV0IG5vIHN1cmZhY2UgcG9vbCBpcyBldmVyCisgICAgICAgIGFsbG9j YXRlZCAod2hpY2ggaXMgYSBwZXJmZWN0bHkgdmFsaWQgdXNlIGNhc2UpLCBpbml0aWFsCisgICAg ICAgIHN1c3BlbnNpb24gb2YgdGhlIGJhY2tpbmdzdG9yZSBpcyBza2lwcGVkIGJlY2F1c2Ugb2Yg YW4KKyAgICAgICAgZWFybHkgcmV0dXJuLiBUaGlzIHdpbGwgY2F1c2UgYW4gYXNzZXJ0aW9uIHRv IGJlIHRyaWdnZXJlZAorICAgICAgICBhbmQgYSBidWcuIEZpeCB0aGlzIGJ5IHN1c3BlbmRpbmcg aXQgYmVmb3JlIHRoZSByZXR1cm4uCisKKyAgICAgICAgV2l0aCBBZGFtIFRyZWF0J3MgcmVjZW50 IGNoYW5nZSB0byBzcGxpdCBzdXNwZW5zaW9uIG9mCisgICAgICAgIHNjcmVlbiBhbmQgYmFja2lu Z3N0b3JlIGludG8gdHdvIGRpZmZlcmVudCBmdW5jdGlvbnMsCisgICAgICAgIHRoaXMgY2FuIG5v dyBiZSByZWR1Y2VkIHRvIGEgbWVyZSBzY3JlZW4gKGJsaXR0aW5nKQorICAgICAgICBzdXNwZW5z aW9uLiBUaGF0IHdhcyB0aGUgb3JpZ2luYWwgaW50ZW50aW9uIG9mIHRoaXMgY29kZS4KKworICAg ICAgICAqIEFwaS9CYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpCYWNraW5nU3RvcmVQcml2YXRlOjpjcmVhdGVTdXJmYWNlcyk6CisgICAgICAgICogQXBpL1dl YlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6 c2V0Q29tcG9zaXRvcik6CisKIDIwMTItMTEtMTQgIEpha29iIFBldHNvdml0cyAgPGpwZXRzb3Zp dHNAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gTGVhdmUgc3VyZmFjZSByZXNpemlu ZyB0byB0aGUgY2xpZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9CYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5n U3RvcmUuY3BwCmluZGV4IDg0MmM5N2M4MGM1NTRiMGRmNWEwZjcxMzBkM2MwZjBhODgxNzRkNmYu LmJlYmMzZTU0M2FiNDNhNDgyOGRhOTQ0OTBiOGZkYzk0YjFjMmUzMDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKQEAgLTIwNjksNiArMjA2OSwx MCBAQCB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmNyZWF0ZVN1cmZhY2VzKCkKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAorICAgIC8vIERvbid0IHRyeSB0byBibGl0IHRvIHNjcmVlbiB1bmxl c3Mgd2UgaGF2ZSBhIGJ1ZmZlci4KKyAgICBpZiAoIWJ1ZmZlcigpKQorICAgICAgICBzdXNwZW5k U2NyZWVuVXBkYXRlcygpOworCiAgICAgU3VyZmFjZVBvb2wqIHN1cmZhY2VQb29sID0gU3VyZmFj ZVBvb2w6Omdsb2JhbFN1cmZhY2VQb29sKCk7CiAgICAgc3VyZmFjZVBvb2wtPmluaXRpYWxpemUo dGlsZVNpemUoKSk7CiAKQEAgLTIxMDEsMTMgKzIxMDUsNiBAQCB2b2lkIEJhY2tpbmdTdG9yZVBy aXZhdGU6OmNyZWF0ZVN1cmZhY2VzKCkKICAgICBzd2FwU3RhdGUoKTsKIAogICAgIGNyZWF0ZVZp c2libGVUaWxlQnVmZmVyRm9yV2ViUGFnZShtX3dlYlBhZ2UtPmQpOwotCi0gICAgLy8gRG9uJ3Qg dHJ5IHRvIGJsaXQgdG8gc2NyZWVuIHVubGVzcyB3ZSBoYXZlIGEgYnVmZmVyLgotICAgIGlmICgh YnVmZmVyKCkpIHsKLSAgICAgICAgLy8gRklYTUU6IERvIHdlIHJlYWxseSBuZWVkIHRvIHN1c3Bl bmQvcmVzdW1lIGJvdGggYmFja2luZ3N0b3JlIGFuZCBzY3JlZW4gaGVyZT8KLSAgICAgICAgc3Vz cGVuZEJhY2tpbmdTdG9yZVVwZGF0ZXMoKTsKLSAgICAgICAgc3VzcGVuZFNjcmVlblVwZGF0ZXMo KTsKLSAgICB9CiB9CiAKIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6Y3JlYXRlVmlzaWJsZVRp bGVCdWZmZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXgg ZjFlYzFlMzQwMDU1YmE4ZDA2MDJhOTdkNzI1OGZhOTMwMTk4NjQ2Zi4uMjRjYzdkYjQ3NjgzOTIy MGU2ZmNhNDk2YjdlYThkODhjOThlOGZlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2UuY3BwCkBAIC01Mjc5LDIxICs1Mjc5LDE1IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6 OnNldENvbXBvc2l0b3IoUGFzc1JlZlB0cjxXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU+IGNvbXBv c2l0CiAgICAgLy8gVGhhdCBzZWVtcyBleHRyZW1lbHkgbGlrZWx5IHRvIGJlIHRoZSBjYXNlLCBi dXQgbGV0J3MgYXNzZXJ0IGp1c3QgdG8gbWFrZSBzdXJlLgogICAgIEFTU0VSVCh3ZWJLaXRUaHJl YWRNZXNzYWdlQ2xpZW50KCktPmlzQ3VycmVudFRocmVhZCgpKTsKIAotICAgIGlmIChtX2NvbXBv c2l0b3IgfHwgbV9jbGllbnQtPndpbmRvdygpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBEbyB3ZSBy ZWFsbHkgbmVlZCB0byBzdXNwZW5kL3Jlc3VtZSBib3RoIGJhY2tpbmdzdG9yZSBhbmQgc2NyZWVu IGhlcmU/Ci0gICAgICAgIG1fYmFja2luZ1N0b3JlLT5kLT5zdXNwZW5kQmFja2luZ1N0b3JlVXBk YXRlcygpOworICAgIGlmIChtX2NvbXBvc2l0b3IgfHwgbV9jbGllbnQtPndpbmRvdygpKQogICAg ICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+c3VzcGVuZFNjcmVlblVwZGF0ZXMoKTsKLSAgICB9CiAK ICAgICAvLyBUaGUgbV9jb21wb3NpdG9yIG1lbWJlciBoYXMgdG8gYmUgbW9kaWZpZWQgZHVyaW5n IGEgc3luYyBjYWxsIGZvciB0aHJlYWQKICAgICAvLyBzYWZlIGFjY2VzcyB0byBtX2NvbXBvc2l0 b3IgYW5kIGl0cyByZWZjb3VudC4KICAgICB1c2VySW50ZXJmYWNlVGhyZWFkTWVzc2FnZUNsaWVu dCgpLT5kaXNwYXRjaFN5bmNNZXNzYWdlKGNyZWF0ZU1ldGhvZENhbGxNZXNzYWdlKCZXZWJQYWdl UHJpdmF0ZTo6c2V0Q29tcG9zaXRvckhlbHBlciwgdGhpcywgY29tcG9zaXRvcikpOwogCi0gICAg aWYgKG1fY29tcG9zaXRvciB8fCBtX2NsaWVudC0+d2luZG93KCkpIHsgLy8gdGhlIG5ldyBjb21w b3NpdG9yLCBpZiBvbmUgd2FzIHNldAotICAgICAgICAvLyBGSVhNRTogRG8gd2UgcmVhbGx5IG5l ZWQgdG8gc3VzcGVuZC9yZXN1bWUgYm90aCBiYWNraW5nc3RvcmUgYW5kIHNjcmVlbiBoZXJlPwot ICAgICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+cmVzdW1lQmFja2luZ1N0b3JlVXBkYXRlcygpOwor ICAgIGlmIChtX2NvbXBvc2l0b3IgfHwgbV9jbGllbnQtPndpbmRvdygpKSAvLyB0aGUgbmV3IGNv bXBvc2l0b3IsIGlmIG9uZSB3YXMgc2V0CiAgICAgICAgIG1fYmFja2luZ1N0b3JlLT5kLT5yZXN1 bWVTY3JlZW5VcGRhdGVzKEJhY2tpbmdTdG9yZTo6UmVuZGVyQW5kQmxpdCk7Ci0gICAgfQogfQog CiB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRDb21wb3NpdG9ySGVscGVyKFBhc3NSZWZQdHI8V2Vi UGFnZUNvbXBvc2l0b3JQcml2YXRlPiBjb21wb3NpdG9yKQo=