88889 2012-06-12 10:43:59 -0700 [BlackBerry] Scale was incorrect when reloading a simple web page after initial load 2012-06-27 11:46:59 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jkjiang jkjiang manyoso mfeil rwlbuis staikos tonikitoo yong.li.webkit oldest_to_newest 647061 0 jkjiang 2012-06-12 10:43:59 -0700 PR164442 647064 1 jkjiang 2012-06-12 10:48:18 -0700 When reloading a web page with the load type FrameLoadTypeSame after the initial load, the scale of the web page can became incorrect. 647206 2 147136 jkjiang 2012-06-12 13:09:20 -0700 Created attachment 147136 Committed, r=atreat 647330 3 147136 manyoso 2012-06-12 14:24:59 -0700 Comment on attachment 147136 Committed, r=atreat Looks good Jacky! 647363 4 jkjiang 2012-06-12 14:48:46 -0700 Committed r120124: <https://trac.webkit.org/changeset/120124> 658134 5 jkjiang 2012-06-26 17:07:44 -0700 Reopen it, will fix one more issue. 658138 6 jkjiang 2012-06-26 17:13:49 -0700 (In reply to comment #5) > Reopen it, will fix one more issue. Please see another issue's reproduce steps on #comment 6 of PR164442. 658147 7 149643 jkjiang 2012-06-26 17:30:09 -0700 Created attachment 149643 Patch 2 This patch is to fix the second issue on #comment 6 of PR164442. 658267 8 149643 tonikitoo 2012-06-26 19:36:16 -0700 Comment on attachment 149643 Patch 2 It is conceptually strange that FrameLoadTypeStandard dispatchDidFirstVisuallyNonEmptyLayout is called after load finished state. What kind of navigation have FrameLoadTypeStarndard? The way this bug manifests should be stated in the changelog. 658598 9 jkjiang 2012-06-27 07:42:03 -0700 (In reply to comment #8) > (From update of attachment 149643 [details]) > It is conceptually strange that FrameLoadTypeStandard dispatchDidFirstVisuallyNonEmptyLayout is called after load finished state. > > What kind of navigation have FrameLoadTypeStarndard? The way this bug manifests should be stated in the changelog. As I have talked with Antonio, I would mention the timer here to be more clear. 658677 10 149767 jkjiang 2012-06-27 09:52:55 -0700 Created attachment 149767 Updated patch Updated the patch based on the comments. 658698 11 149767 tonikitoo 2012-06-27 10:32:54 -0700 Comment on attachment 149767 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=149767&action=review > Source/WebKit/blackberry/Api/WebPage.cpp:1642 > + // For FrameLoadTypeSame or FrameLoadTypeStandard load, the layout timer can be fired which can call dispatchDidFirstVisuallyNonEmptyLayout() loads? 658702 12 jkjiang 2012-06-27 10:39:49 -0700 (In reply to comment #11) > (From update of attachment 149767 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=149767&action=review > > > Source/WebKit/blackberry/Api/WebPage.cpp:1642 > > + // For FrameLoadTypeSame or FrameLoadTypeStandard load, the layout timer can be fired which can call dispatchDidFirstVisuallyNonEmptyLayout() > > loads? Should be load, I use "or" here. 658747 13 149767 jkjiang 2012-06-27 11:46:49 -0700 Comment on attachment 149767 Updated patch Committed manually r121355: http://trac.webkit.org/changeset/121355 147136 2012-06-12 13:09:20 -0700 2012-06-12 14:49:30 -0700 Committed, r=atreat bug-88889-20120612160919.patch text/plain 5182 jkjiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxZmFlYzVhZGRmNGU2NDA0ODNlYTk3MDQ5MjQ3YjhjMWZlZDY5NTI4Li4xNGY4MGRhNmUz YWRhYTgwYzExMmM0NjFjNTc0NjAzNzM1ZmQ3MzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0wNi0xMiAgSmFja3kgSmlhbmcgIDx6aGFqaWFu Z0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBTY2FsZSB3YXMgaW5jb3JyZWN0IHdo ZW4gcmVsb2FkaW5nIGEgc2ltcGxlIHdlYiBwYWdlIGFmdGVyIGluaXRpYWwgbG9hZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg4ODkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQUjogMTY0NDQyCisgICAg ICAgIFdoZW4gd2Ugd2VyZSByZWxvYWRpbmcgYSB3ZWIgcGFnZSB3aXRoIHRoZSBsb2FkIHR5cGUg RnJhbWVMb2FkVHlwZVNhbWUKKyAgICAgICAgYWZ0ZXIgdGhlIGluaXRpYWwgbG9hZCwgdGhlIGZp cnN0IGxheW91dCB0aW1lciB3YXMgZmlyZWQgYWZ0ZXIgdGhlIGxvYWQKKyAgICAgICAgRmluaXNo ZWQgc3RhdGUsIGluIHdoaWNoIGNhc2UgdGhlIHdlYiBwYWdlIHdvdWxkIGhhdmUgbm8gY2hhbmNl IHRvIHpvb20KKyAgICAgICAgdG8gdGhlIGluaXRpYWwgc2NhbGUgZHVyaW5nIHRoZSBsYXlvdXQg YXMgaXQgd2FzIG9ubHkgZm9yIGxvYWQKKyAgICAgICAgQ29tbWl0dGVkIHN0YXRlLiBUaGlzIHBh dGNoIHRha2VzIGNhcmUgb2YgaXQuCisKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpsYXlvdXRGaW5pc2hlZCk6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpzaG91bGRab29t VG9Jbml0aWFsU2NhbGVPbkxvYWQpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6Onpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCk6 CisgICAgICAgICogQXBpL1dlYlBhZ2VfcC5oOgorICAgICAgICAoV2ViUGFnZVByaXZhdGUpOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNo RGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KToKKwogMjAxMi0wNi0xMiAgQ3J5c3RhbCBa aGFuZyAgPGhhaXpoYW5nQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEZpeCBjcmFz aCBpbiBJbnB1dEhhbmRsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3Bw CmluZGV4IGQ5MmJlNjMzYTRjYTE5ZDg4MGQ1ZTY1YmI4MTk2YjY5MjBkZjhmNzguLjkyODdjYjNl NjM4ZWU2OWRkODlhMjgwYWQ0ZTUzYWFhYjcyMzQ1MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtMTU1NCw3ICsxNTU0LDcgQEAgdm9pZCBXZWJQYWdlUHJp dmF0ZTo6bGF5b3V0RmluaXNoZWQoKQogCiAgICAgbV9uZXN0ZWRMYXlvdXRGaW5pc2hlZENvdW50 Kys7CiAKLSAgICBpZiAobG9hZFN0YXRlKCkgPT0gQ29tbWl0dGVkKQorICAgIGlmIChzaG91bGRa b29tVG9Jbml0aWFsU2NhbGVPbkxvYWQoKSkKICAgICAgICAgem9vbVRvSW5pdGlhbFNjYWxlT25M b2FkKCk7CiAgICAgZWxzZSBpZiAobG9hZFN0YXRlKCkgIT0gTm9uZSkKICAgICAgICAgbm90aWZ5 VHJhbnNmb3JtZWRDb250ZW50c1NpemVDaGFuZ2VkKCk7CkBAIC0xNTkxLDYgKzE1OTEsMTggQEAg dm9pZCBXZWJQYWdlUHJpdmF0ZTo6bGF5b3V0RmluaXNoZWQoKQogICAgIH0KIH0KIAorYm9vbCBX ZWJQYWdlUHJpdmF0ZTo6c2hvdWxkWm9vbVRvSW5pdGlhbFNjYWxlT25Mb2FkKCkgY29uc3QKK3sK KyAgICAvLyBGb3IgRnJhbWVMb2FkVHlwZVNhbWUgbG9hZCwgdGhlIGZpcnN0IGxheW91dCB0aW1l ciBjYW4gYmUgZmlyZWQgYWZ0ZXIgdGhlIGxvYWQgRmluaXNoZWQgc3RhdGUuIFdlIHNob3VsZAor ICAgIC8vIHpvb20gdG8gaW5pdGlhbCBzY2FsZSBmb3IgdGhpcyBjYXNlIGFzIHdlbGwsIG90aGVy d2lzZSB0aGUgc2NhbGUgb2YgdGhlIHdlYiBwYWdlIGNhbiBiZSBpbmNvcnJlY3QuCisgICAgRnJh bWVMb2FkVHlwZSBmcmFtZUxvYWRUeXBlID0gRnJhbWVMb2FkVHlwZVN0YW5kYXJkOworICAgIGlm IChtX21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+bG9hZGVyKCkpCisgICAgICAgIGZyYW1lTG9h ZFR5cGUgPSBtX21haW5GcmFtZS0+bG9hZGVyKCktPmxvYWRUeXBlKCk7CisgICAgaWYgKG1fbG9h ZFN0YXRlID09IENvbW1pdHRlZCB8fCAobV9sb2FkU3RhdGUgPT0gRmluaXNoZWQgJiYgZnJhbWVM b2FkVHlwZSA9PSBGcmFtZUxvYWRUeXBlU2FtZSkpCisgICAgICAgIHJldHVybiB0cnVlOworICAg IHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBXZWJQYWdlUHJpdmF0ZTo6em9vbVRvSW5pdGlhbFNj YWxlT25Mb2FkKCkKIHsKICNpZiBERUJVR19XRUJQQUdFX0xPQUQKQEAgLTE2MjgsNyArMTY0MCw3 IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6Onpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCgpCiAgICAg aWYgKG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5sb2FkZXIoKSAmJiBtX21haW5GcmFtZS0+ bG9hZGVyKCktPnNob3VsZFJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpKQogICAg ICAgICBzaG91bGRab29tID0gZmFsc2U7CiAKLSAgICBpZiAoc2hvdWxkWm9vbSAmJiBsb2FkU3Rh dGUoKSA9PSBDb21taXR0ZWQpIHsKKyAgICBpZiAoc2hvdWxkWm9vbSAmJiBzaG91bGRab29tVG9J bml0aWFsU2NhbGVPbkxvYWQoKSkgewogICAgICAgICAvLyBQcmVzZXJ2ZSBhdCB0b3AgYW5kIGF0 IGxlZnQgcG9zaXRpb24sIHRvIGF2b2lkIHNjcm9sbGluZwogICAgICAgICAvLyB0byBhIG5vbiB0 b3AtbGVmdCBwb3NpdGlvbiBmb3Igd2ViIHBhZ2Ugd2l0aCB2aWV3cG9ydCBtZXRhIHRhZwogICAg ICAgICAvLyB0aGF0IHNwZWNpZmllcyBhbiBpbml0aWFsLXNjYWxlIHRoYXQgaXMgem9vbWVkIGlu LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKaW5kZXggMzQ2OTc4MDY4 N2FmOTFkMWQwYjJmODJlNmQ0YjEzNjA1ZjQyYWMyNC4uMGMxNTllOWRhZjQ4MzE4ZmY3NmUxNGU3 MzY2MjQ0MWY4YzRkZWJhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Vf cC5oCkBAIC0yMDQsNiArMjA0LDcgQEAgcHVibGljOgogICAgIHZvaWQgbm90aWZ5UG9wdXBBdXRv ZmlsbERpYWxvZyhjb25zdCBWZWN0b3I8U3RyaW5nPiYsIGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm KTsKICAgICB2b2lkIG5vdGlmeURpc21pc3NBdXRvZmlsbERpYWxvZygpOwogCisgICAgYm9vbCBz aG91bGRab29tVG9Jbml0aWFsU2NhbGVPbkxvYWQoKSBjb25zdDsKICAgICAvLyBDYWxsZWQgYWNj b3JkaW5nIHRvIG91ciBoZXVyaXN0aWMgb3IgZnJvbSBzZXRMb2FkU3RhdGUgZGVwZW5kaW5nIG9u IHdoZXRoZXIgd2UgaGF2ZSBhIHZpcnR1YWwgdmlld3BvcnQuCiAgICAgdm9pZCB6b29tVG9Jbml0 aWFsU2NhbGVPbkxvYWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0Jl cnJ5LmNwcAppbmRleCAwOGVjY2UwNWM5ZmJlOWFiMTc3MWVmNzk3MzdiYTAwMjNkMzZmMDAyLi41 OWNmNzhiY2M4MjRlYzY3MWVhYjhiNDg2ZDEzNmM3ODYzMTU1YmI5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAtODI0LDEwICs4MjQsNyBAQCB2b2lk IEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6ZGlzcGF0Y2hEaWRGaXJzdFZpc3VhbGx5Tm9u RW1wdHlMYXlvdXQoKQogCiAgICAgcmVhZHlUb1JlbmRlcih0cnVlKTsKIAotICAgIC8vIEZJWE1F OiBXZSBzaG91bGRuJ3QgYmUgZ2V0dGluZyBoZXJlIGlmIHdlIGFyZSBub3QgaW4gdGhlIENvbW1p dHRlZCBzdGF0ZSBidXQgd2UgYXJlCi0gICAgLy8gc28gd2UgY2FuIG5vdCBhc3NlcnQgb24gdGhh dCByaWdodCBub3cuIEJ1dCB3ZSBvbmx5IHdhbnQgdG8gZG8gdGhpcyBvbiBsb2FkLgotICAgIC8v IFJJTSBCdWcgIzU1NQotICAgIGlmIChtX3dlYlBhZ2VQcml2YXRlLT5sb2FkU3RhdGUoKSA9PSBX ZWJQYWdlUHJpdmF0ZTo6Q29tbWl0dGVkKSB7CisgICAgaWYgKG1fd2ViUGFnZVByaXZhdGUtPnNo b3VsZFpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCgpKSB7CiAgICAgICAgIG1fd2ViUGFnZVByaXZh dGUtPnpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCgpOyAvLyBTZXQgdGhlIHByb3BlciB6b29tIGxl dmVsIGZpcnN0LgogICAgICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX2JhY2tpbmdTdG9yZS0+ZC0+ Y2xlYXJWaXNpYmxlWm9vbSgpOyAvLyBDbGVhciB0aGUgdmlzaWJsZSB6b29tIHNpbmNlIHdlJ3Jl IGV4cGxpY2l0bHkgcmVuZGVyaW5nK2JsaXR0aW5nIGJlbG93LgogICAgICAgICBtX3dlYlBhZ2VQ cml2YXRlLT5tX2JhY2tpbmdTdG9yZS0+ZC0+cmVuZGVyVmlzaWJsZUNvbnRlbnRzKCk7Cg== 149643 2012-06-26 17:30:09 -0700 2012-06-27 09:52:13 -0700 Patch 2 org88889_2.patch text/plain 3073 jkjiang RnJvbSBlZGRjMjkzMWY2NjdlOGNjNmFjMGMyNTA0MjlhZGEzZTkyOTJmNzc0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWNreSBKaWFuZyA8emhhamlhbmdAcmltLmNvbT4KRGF0ZTog VHVlLCAyNiBKdW4gMjAxMiAyMDoxNzoyNSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja0Jl cnJ5XSBTY2FsZSB3YXMgaW5jb3JyZWN0IHdoZW4gcmVsb2FkaW5nIGEgc2ltcGxlIHdlYgogcGFn ZSBhZnRlciBpbml0aWFsIGxvYWQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04ODg4OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuClBhdGNoIGJ5IEphY2t5IEpp YW5nIDx6aGFqaWFuZ0ByaW0uY29tPgoKUFI6IDE2NDQ0MgpGb3IgRnJhbWVMb2FkVHlwZVN0YW5k YXJkIGxvYWQsIGRpc3BhdGNoRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0CmNhbiBhbHNv IGJlIGNhbGxlZCBhZnRlciB0aGUgbG9hZCBGaW5pc2hlZCBzdGF0ZSwgd2Ugc2hvdWxkIGdpdmUg aXQgYQpjaGFuY2UgdG8gem9vbSB0byBpbml0aWFsIHNjYWxlLgoKKiBBcGkvV2ViUGFnZS5jcHA6 CihCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpzaG91bGRab29tVG9Jbml0aWFs U2NhbGVPbkxvYWQpOgotLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAgfCAgICA2ICsrKy0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyAgICAg ICB8ICAgMTUgKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMo KyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAKaW5kZXggMjk0ZGMyMi4uNTNiNDc2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2UuY3BwCkBAIC0xNjM5LDEyICsxNjM5LDEyIEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6 OmxheW91dEZpbmlzaGVkKCkKIAogYm9vbCBXZWJQYWdlUHJpdmF0ZTo6c2hvdWxkWm9vbVRvSW5p dGlhbFNjYWxlT25Mb2FkKCkgY29uc3QKIHsKLSAgICAvLyBGb3IgRnJhbWVMb2FkVHlwZVNhbWUg bG9hZCwgdGhlIGZpcnN0IGxheW91dCB0aW1lciBjYW4gYmUgZmlyZWQgYWZ0ZXIgdGhlIGxvYWQg RmluaXNoZWQgc3RhdGUuIFdlIHNob3VsZAotICAgIC8vIHpvb20gdG8gaW5pdGlhbCBzY2FsZSBm b3IgdGhpcyBjYXNlIGFzIHdlbGwsIG90aGVyd2lzZSB0aGUgc2NhbGUgb2YgdGhlIHdlYiBwYWdl IGNhbiBiZSBpbmNvcnJlY3QuCisgICAgLy8gRm9yIEZyYW1lTG9hZFR5cGVTYW1lIG9yIEZyYW1l TG9hZFR5cGVTdGFuZGFyZCBsb2FkLCBkaXNwYXRjaERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dCBjYW4gYmUgY2FsbGVkIGFmdGVyIHRoZSBsb2FkIEZpbmlzaGVkIHN0YXRlLgorICAgIC8v IFdlIHNob3VsZCB6b29tIHRvIGluaXRpYWwgc2NhbGUgZm9yIHRoaXMgY2FzZSBhcyB3ZWxsLCBv dGhlcndpc2UgdGhlIHNjYWxlIG9mIHRoZSB3ZWIgcGFnZSBjYW4gYmUgaW5jb3JyZWN0LgogICAg IEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlwZSA9IEZyYW1lTG9hZFR5cGVTdGFuZGFyZDsKICAg ICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmxvYWRlcigpKQogICAgICAgICBmcmFt ZUxvYWRUeXBlID0gbV9tYWluRnJhbWUtPmxvYWRlcigpLT5sb2FkVHlwZSgpOwotICAgIGlmICht X2xvYWRTdGF0ZSA9PSBDb21taXR0ZWQgfHwgKG1fbG9hZFN0YXRlID09IEZpbmlzaGVkICYmIGZy YW1lTG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlwZVNhbWUpKQorICAgIGlmIChtX2xvYWRTdGF0ZSA9 PSBDb21taXR0ZWQgfHwgKG1fbG9hZFN0YXRlID09IEZpbmlzaGVkICYmIChmcmFtZUxvYWRUeXBl ID09IEZyYW1lTG9hZFR5cGVTYW1lIHx8IGZyYW1lTG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlwZVN0 YW5kYXJkKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIHJldHVybiBmYWxzZTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDExYThiOWEuLjkyYzVjNmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTA2LTI2ICBKYWNr eSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CiAKKyAgICAgICAgW0JsYWNrQmVycnldIFNjYWxl IHdhcyBpbmNvcnJlY3Qgd2hlbiByZWxvYWRpbmcgYSBzaW1wbGUgd2ViIHBhZ2UgYWZ0ZXIgaW5p dGlhbCBsb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04ODg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFBSOiAxNjQ0NDIKKyAgICAgICAgRm9yIEZyYW1lTG9hZFR5cGVTdGFuZGFyZCBsb2FkLCBkaXNw YXRjaERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dAorICAgICAgICBjYW4gYWxzbyBiZSBj YWxsZWQgYWZ0ZXIgdGhlIGxvYWQgRmluaXNoZWQgc3RhdGUsIHdlIHNob3VsZCBnaXZlIGl0IGEK KyAgICAgICAgY2hhbmNlIHRvIHpvb20gdG8gaW5pdGlhbCBzY2FsZS4KKworICAgICAgICAqIEFw aS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZh dGU6OnNob3VsZFpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCk6CisKKzIwMTItMDYtMjYgIEphY2t5 IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KKwogICAgICAgICBbQmxhY2tCZXJyeV0gV3Jvbmcg c2NhbGUgYWZ0ZXIgbGVhdmluZyBmdWxsc2NyZWVuIDx2aWRlbz4KICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NTQ2CiAKLS0gCjEuNy41LjQKCg== 149767 2012-06-27 09:52:55 -0700 2012-06-27 11:46:48 -0700 Updated patch org88889_3.patch text/plain 3364 jkjiang RnJvbSBiYzIxMjA3NGFlZDljMzFlMDhkYWM5YzRhMmVjYjA2ZWRhZWI4ODg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWNreSBKaWFuZyA8emhhamlhbmdAcmltLmNvbT4KRGF0ZTog V2VkLCAyNyBKdW4gMjAxMiAxMjo0NzowMyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja0Jl cnJ5XSBTY2FsZSB3YXMgaW5jb3JyZWN0IHdoZW4gcmVsb2FkaW5nIGEgc2ltcGxlIHdlYgogcGFn ZSBhZnRlciBpbml0aWFsIGxvYWQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04ODg4OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpQUjogMTY0NDQyCkZvciBG cmFtZUxvYWRUeXBlU3RhbmRhcmQgbG9hZCwgdGhlIGxheW91dCB0aW1lciBjYW4gYmUgZmlyZWQg d2hpY2ggY2FuCmNhbGwgZGlzcGF0Y2hEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQoKSBh ZnRlciB0aGUgbG9hZCBGaW5pc2hlZApzdGF0ZSwgaW4gd2hpY2ggY2FzZSB0aGUgd2ViIHBhZ2Ug d2lsbCBoYXZlIG5vIGNoYW5jZSB0byB6b29tIHRvCmluaXRpYWwgc2NhbGUuIFdlIHNob3VsZCBn aXZlIGl0IGEgY2hhbmNlIGFzIHdlbGwgYXMgRnJhbWVMb2FkVHlwZVNhbWUKbG9hZC4KCiogQXBp L1dlYlBhZ2UuY3BwOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6c2hvdWxk Wm9vbVRvSW5pdGlhbFNjYWxlT25Mb2FkKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2UuY3BwIHwgICAgNyArKysrLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv Q2hhbmdlTG9nICAgICAgIHwgICAxNyArKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2Vk LCAyMSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IDZlOTk1YmQuLmFiNTAyYTggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtMTYzOSwxMiArMTYzOSwxMyBAQCB2b2lk IFdlYlBhZ2VQcml2YXRlOjpsYXlvdXRGaW5pc2hlZCgpCiAKIGJvb2wgV2ViUGFnZVByaXZhdGU6 OnNob3VsZFpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCgpIGNvbnN0CiB7Ci0gICAgLy8gRm9yIEZy YW1lTG9hZFR5cGVTYW1lIGxvYWQsIHRoZSBmaXJzdCBsYXlvdXQgdGltZXIgY2FuIGJlIGZpcmVk IGFmdGVyIHRoZSBsb2FkIEZpbmlzaGVkIHN0YXRlLiBXZSBzaG91bGQKLSAgICAvLyB6b29tIHRv IGluaXRpYWwgc2NhbGUgZm9yIHRoaXMgY2FzZSBhcyB3ZWxsLCBvdGhlcndpc2UgdGhlIHNjYWxl IG9mIHRoZSB3ZWIgcGFnZSBjYW4gYmUgaW5jb3JyZWN0LgorICAgIC8vIEZvciBGcmFtZUxvYWRU eXBlU2FtZSBvciBGcmFtZUxvYWRUeXBlU3RhbmRhcmQgbG9hZCwgdGhlIGxheW91dCB0aW1lciBj YW4gYmUgZmlyZWQgd2hpY2ggY2FuIGNhbGwgZGlzcGF0Y2hEaWRGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXQoKQorICAgIC8vIGFmdGVyIHRoZSBsb2FkIEZpbmlzaGVkIHN0YXRlLCBpbiB3aGlj aCBjYXNlIHRoZSB3ZWIgcGFnZSB3aWxsIGhhdmUgbm8gY2hhbmNlIHRvIHpvb20gdG8gaW5pdGlh bCBzY2FsZS4gU28gd2Ugc2hvdWxkIGdpdmUgaXQgYSBjaGFuY2UsCisgICAgLy8gb3RoZXJ3aXNl IHRoZSBzY2FsZSBvZiB0aGUgd2ViIHBhZ2UgY2FuIGJlIGluY29ycmVjdC4KICAgICBGcmFtZUxv YWRUeXBlIGZyYW1lTG9hZFR5cGUgPSBGcmFtZUxvYWRUeXBlU3RhbmRhcmQ7CiAgICAgaWYgKG1f bWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5sb2FkZXIoKSkKICAgICAgICAgZnJhbWVMb2FkVHlw ZSA9IG1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+bG9hZFR5cGUoKTsKLSAgICBpZiAobV9sb2FkU3Rh dGUgPT0gQ29tbWl0dGVkIHx8IChtX2xvYWRTdGF0ZSA9PSBGaW5pc2hlZCAmJiBmcmFtZUxvYWRU eXBlID09IEZyYW1lTG9hZFR5cGVTYW1lKSkKKyAgICBpZiAobV9sb2FkU3RhdGUgPT0gQ29tbWl0 dGVkIHx8IChtX2xvYWRTdGF0ZSA9PSBGaW5pc2hlZCAmJiAoZnJhbWVMb2FkVHlwZSA9PSBGcmFt ZUxvYWRUeXBlU2FtZSB8fCBmcmFtZUxvYWRUeXBlID09IEZyYW1lTG9hZFR5cGVTdGFuZGFyZCkp KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gZmFsc2U7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0NoYW5nZUxvZwppbmRleCA0ZTU3OTc1Li42MjAxNDM4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAxMi0wNi0yNyAgSmFja3kgSmlhbmcg IDx6aGFqaWFuZ0ByaW0uY29tPgogCisgICAgICAgIFtCbGFja0JlcnJ5XSBTY2FsZSB3YXMgaW5j b3JyZWN0IHdoZW4gcmVsb2FkaW5nIGEgc2ltcGxlIHdlYiBwYWdlIGFmdGVyIGluaXRpYWwgbG9h ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg4ODkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQUjogMTY0 NDQyCisgICAgICAgIEZvciBGcmFtZUxvYWRUeXBlU3RhbmRhcmQgbG9hZCwgdGhlIGxheW91dCB0 aW1lciBjYW4gYmUgZmlyZWQgd2hpY2ggY2FuCisgICAgICAgIGNhbGwgZGlzcGF0Y2hEaWRGaXJz dFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQoKSBhZnRlciB0aGUgbG9hZCBGaW5pc2hlZAorICAgICAg ICBzdGF0ZSwgaW4gd2hpY2ggY2FzZSB0aGUgd2ViIHBhZ2Ugd2lsbCBoYXZlIG5vIGNoYW5jZSB0 byB6b29tIHRvCisgICAgICAgIGluaXRpYWwgc2NhbGUuIFdlIHNob3VsZCBnaXZlIGl0IGEgY2hh bmNlIGFzIHdlbGwgYXMgRnJhbWVMb2FkVHlwZVNhbWUKKyAgICAgICAgbG9hZC4KKworICAgICAg ICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFn ZVByaXZhdGU6OnNob3VsZFpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCk6CisKKzIwMTItMDYtMjcg IEphY2t5IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KKwogICAgICAgICBbQmxhY2tCZXJyeV0g V3Jvbmcgc2NhbGUgYWZ0ZXIgbGVhdmluZyBmdWxsc2NyZWVuIDx2aWRlbz4KICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NTQ2CiAKLS0gCjEuNy41LjQK Cg==