30530 2009-10-19 13:37:40 -0700 Replace QWebFrame::clipContentsToViewport with better API 2009-10-21 10:40:02 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 29843 1 kenneth webkit-unassigned hausmann rich oldest_to_newest 155862 0 41444 kenneth 2009-10-19 13:37:40 -0700 Created attachment 41444 First part of the clipContentsToViewport fix (introduce paint method, deprecate render) We had a quick round of API review with Matthias here at the DevDays and came up with the following suggestions for changes: * QWebFrame::clipContentsToViewport: 1) Remove the property 2) Deprecate QWebFrame::render() 3) Introduce QWebFrame::paint(QWebFrame::PaintOptions opts = QWebFrame::AllElements), so that one can for eaxmple call frame->paint(QWebFrame::Contents); frame->paint(QWebFrame::Contents | QWebFrame::ScrollBars); 155866 1 kenneth 2009-10-19 13:40:04 -0700 Follow up patch will remove the clipContentsToViewport property 155888 2 41444 vestbo 2009-10-19 14:05:27 -0700 Comment on attachment 41444 First part of the clipContentsToViewport fix (introduce paint method, deprecate render) Let's discuss this further before landing 155918 3 41454 kenneth 2009-10-19 14:42:36 -0700 Created attachment 41454 Second version incorporating feedback from IRC 155969 4 rich 2009-10-19 15:46:28 -0700 Might be worth considering making the numbers for the enum a bit bigger so that if you later want to add intermediate layers they can still have an id that reflects the stacking order. eg. 0x10, 0x20 etc. instead of 0x01, 0x02. 156271 5 kenneth 2009-10-20 13:16:51 -0700 Landed in 49850 156535 6 41454 eric 2009-10-21 10:40:02 -0700 Comment on attachment 41454 Second version incorporating feedback from IRC Supposedly this patch was landed, so removing r?. 41444 2009-10-19 13:37:40 -0700 2009-10-19 14:42:36 -0700 First part of the clipContentsToViewport fix (introduce paint method, deprecate render) 0001-Introduce-new-paint-method-on-QWebFrame-which-suppo.patch text/plain 6467 kenneth RnJvbSA5MzZiMDdkYTY4YzFhMzBmNmU5MmFmYmI3MzY1NDk2MmIwYjk0MGVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBNb24sIDE5IE9jdCAyMDA5IDE3OjI5OjEzIC0wMzAwClN1YmplY3Q6 IFtQQVRDSF0gSW50cm9kdWNlIG5ldyBwYWludCBtZXRob2Qgb24gUVdlYkZyYW1lLCB3aGljaCBz dXBwb3J0cyBzcGVjaWZ5aW5nCiB3aGljaCBwYXJ0cyB0byBwYWludCAoc2Nyb2xsYmFycywgY29u dGVudHMsIHBhbi1pY29uKS4KClBhdGNoIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuIDxr ZW5uZXRoQHdlYmtpdC5vcmc+IG9uIDIwMDktMTAtMTkKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgpEZXByZWNhdGUgcmVuZGVyKCkuCgoqIEFwaS9xd2ViZnJhbWUuY3BwOgooUVdlYkZyYW1l UHJpdmF0ZTo6cmVuZGVyUHJpdmF0ZSk6CihRV2ViRnJhbWU6OnBhaW50KToKKFFXZWJGcmFtZTo6 cmVuZGVyKToKKiBBcGkvcXdlYmZyYW1lLmg6CiogQXBpL3F3ZWJmcmFtZV9wLmg6Ci0tLQogV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIHwgICA3MCArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0KIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmggICB8ICAgMTUgKysr KysrKystCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmggfCAgICAyICstCiBXZWJLaXQvcXQv Q2hhbmdlTG9nICAgICAgICAgfCAgIDE2ICsrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgODMg aW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmluZGV4IGQyYzMy NGQuLjVmM2JlNTUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTIzMiw3ICsyMzIsNyBAQCBXZWJDb3Jl OjpTY3JvbGxiYXIqIFFXZWJGcmFtZVByaXZhdGU6OnZlcnRpY2FsU2Nyb2xsQmFyKCkgY29uc3QK ICAgICByZXR1cm4gZnJhbWUtPnZpZXcoKS0+dmVydGljYWxTY3JvbGxiYXIoKTsKIH0KIAotdm9p ZCBRV2ViRnJhbWVQcml2YXRlOjpyZW5kZXJQcml2YXRlKFFQYWludGVyICpwYWludGVyLCBjb25z dCBRUmVnaW9uICZjbGlwKQordm9pZCBRV2ViRnJhbWVQcml2YXRlOjpyZW5kZXJQcml2YXRlKFFQ YWludGVyICpwYWludGVyLCBRV2ViRnJhbWU6OlBhcnRzIHBhcnRzLCBjb25zdCBRUmVnaW9uICZj bGlwKQogewogICAgIGlmICghZnJhbWUtPnZpZXcoKSB8fCAhZnJhbWUtPmNvbnRlbnRSZW5kZXJl cigpKQogICAgICAgICByZXR1cm47CkBAIC0yNDEsMjQgKzI0MSw1MCBAQCB2b2lkIFFXZWJGcmFt ZVByaXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFSZWdpb24g JmNsaXApCiAgICAgaWYgKHZlY3Rvci5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IGZyYW1lLT52aWV3KCk7Ci0gICAgdmlldy0+bGF5 b3V0SWZOZWVkZWRSZWN1cnNpdmUoKTsKLQogICAgIEdyYXBoaWNzQ29udGV4dCBjb250ZXh0KHBh aW50ZXIpOworICAgIGlmIChjb250ZXh0LnBhaW50aW5nRGlzYWJsZWQoKSAmJiAhY29udGV4dC51 cGRhdGluZ0NvbnRyb2xUaW50cygpKQorICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoY2xpcFJl bmRlclRvVmlld3BvcnQpCi0gICAgICAgIHZpZXctPnBhaW50KCZjb250ZXh0LCB2ZWN0b3IuZmly c3QoKSk7Ci0gICAgZWxzZQotICAgICAgICB2aWV3LT5wYWludENvbnRlbnRzKCZjb250ZXh0LCB2 ZWN0b3IuZmlyc3QoKSk7CisgICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZp ZXcoKTsKKyAgICB2aWV3LT5sYXlvdXRJZk5lZWRlZFJlY3Vyc2l2ZSgpOwogCi0gICAgZm9yIChp bnQgaSA9IDE7IGkgPCB2ZWN0b3Iuc2l6ZSgpOyArK2kpIHsKKyAgICBmb3IgKGludCBpID0gMDsg aSA8IHZlY3Rvci5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBRUmVjdCYgY2xpcFJlY3Qg PSB2ZWN0b3IuYXQoaSk7CiAgICAgICAgIHBhaW50ZXItPnNhdmUoKTsKICAgICAgICAgcGFpbnRl ci0+c2V0Q2xpcFJlY3QoY2xpcFJlY3QsIFF0OjpJbnRlcnNlY3RDbGlwKTsKLSAgICAgICAgaWYg KGNsaXBSZW5kZXJUb1ZpZXdwb3J0KQotICAgICAgICAgICAgdmlldy0+cGFpbnQoJmNvbnRleHQs IGNsaXBSZWN0KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdmlldy0+cGFpbnRDb250ZW50 cygmY29udGV4dCwgY2xpcFJlY3QpOworCisgICAgICAgIGlmIChwYXJ0cyAmIFFXZWJGcmFtZTo6 Q29udGVudHMpIHsKKyAgICAgICAgICAgIGNvbnRleHQuc2F2ZSgpOworCisgICAgICAgICAgICBR UmVjdCByZWN0ID0gY2xpcFJlY3QuaW50ZXJzZWN0ZWQodmlldy0+ZnJhbWVSZWN0KCkpOworICAg ICAgICAgICAgY29udGV4dC50cmFuc2xhdGUodmlldy0+eCgpLCB2aWV3LT55KCkpOworICAgICAg ICAgICAgcmVjdC50cmFuc2xhdGUoLSB2aWV3LT54KCksIC0gdmlldy0+eSgpKTsKKyAgICAgICAg ICAgIGNvbnRleHQudHJhbnNsYXRlKC0gdmlldy0+c2Nyb2xsWCgpLCAtIHZpZXctPnNjcm9sbFko KSk7CisgICAgICAgICAgICByZWN0LnRyYW5zbGF0ZSh2aWV3LT5zY3JvbGxYKCksIHZpZXctPnNj cm9sbFkoKSk7CisgICAgICAgICAgICBjb250ZXh0LmNsaXAodmlldy0+dmlzaWJsZUNvbnRlbnRS ZWN0KCkpOworCisgICAgICAgICAgICB2aWV3LT5wYWludENvbnRlbnRzKCZjb250ZXh0LCByZWN0 KTsKKworICAgICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CisgICAgICAgIH0KKworICAgICAg ICBpZiAocGFydHMgJiBRV2ViRnJhbWU6OlNjcm9sbEJhcnMKKyAgICAgICAgICAgICYmICF2aWV3 LT5zY3JvbGxiYXJzU3VwcHJlc3NlZCgpCisgICAgICAgICAgICAmJiAodmlldy0+aG9yaXpvbnRh bFNjcm9sbGJhcigpIHx8IHZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkpKSB7CisgICAgICAgICAg ICBjb250ZXh0LnNhdmUoKTsKKworICAgICAgICAgICAgUVJlY3QgcmVjdCA9IGNsaXBSZWN0Lmlu dGVyc2VjdGVkKHZpZXctPmZyYW1lUmVjdCgpKTsKKyAgICAgICAgICAgIGNvbnRleHQudHJhbnNs YXRlKHZpZXctPngoKSwgdmlldy0+eSgpKTsKKyAgICAgICAgICAgIHJlY3QudHJhbnNsYXRlKC0g dmlldy0+eCgpLCAtIHZpZXctPnkoKSk7CisKKyAgICAgICAgICAgIHZpZXctPnBhaW50U2Nyb2xs YmFycygmY29udGV4dCwgcmVjdCk7CisKKyAgICAgICAgICAgIGNvbnRleHQucmVzdG9yZSgpOwor ICAgICAgICB9CisKKyAgICAgICAgaWYgKHBhcnRzICYgUVdlYkZyYW1lOjpQYW5JY29uKQorICAg ICAgICAgICAgdmlldy0+cGFpbnRQYW5TY3JvbGxJY29uKCZjb250ZXh0KTsKKwogICAgICAgICBw YWludGVyLT5yZXN0b3JlKCk7CiAgICAgfQogfQpAQCAtOTQ2LDI0ICs5NzIsMzQgQEAgdm9pZCBR V2ViRnJhbWU6OnNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IFFQb2ludCAmcG9zKQogfQogCiAvKiEK LSAgUmVuZGVyIHRoZSBmcmFtZSBpbnRvIFxhIHBhaW50ZXIgY2xpcHBpbmcgdG8gXGEgY2xpcC4K KyAgXHNpbmNlIDQuNgorICBQYWludHMgdGhlIFxhIHBhcnRzIG9mIHRoZSBmcmFtZSB1c2luZyBc YSBwYWludGVyIGNsaXBwaW5nIHRvIFxhIGNsaXAuCiAKICAgXHNhIHByaW50KCkKICovCisKK3Zv aWQgUVdlYkZyYW1lOjpwYWludChRUGFpbnRlciogcGFpbnRlciwgUGFydHMgcGFydHMsIGNvbnN0 IFFSZWdpb24mIGNsaXApCit7CisgICAgZC0+cmVuZGVyUHJpdmF0ZShwYWludGVyLCBwYXJ0cywg KCFjbGlwLmlzRW1wdHkoKSkgPyBjbGlwIDogUVJlZ2lvbihkLT5mcmFtZS0+dmlldygpLT5mcmFt ZVJlY3QoKSkpOworfQorCisvKiEKKyAgXGludGVybmFsCisqLwogdm9pZCBRV2ViRnJhbWU6OnJl bmRlcihRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVJlZ2lvbiAmY2xpcCkKIHsKLSAgICBkLT5y ZW5kZXJQcml2YXRlKHBhaW50ZXIsIGNsaXApOworICAgIGQtPnJlbmRlclByaXZhdGUocGFpbnRl ciwgQWxsUGFydHMsIGNsaXApOwogfQogCiAvKiEKLSAgUmVuZGVyIHRoZSBmcmFtZSBpbnRvIFxh IHBhaW50ZXIuCisgIFxpbnRlcm5hbAogKi8KIHZvaWQgUVdlYkZyYW1lOjpyZW5kZXIoUVBhaW50 ZXIgKnBhaW50ZXIpCiB7CiAgICAgaWYgKCFkLT5mcmFtZS0+dmlldygpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBkLT5yZW5kZXJQcml2YXRlKHBhaW50ZXIsIFFSZWdpb24oZC0+ZnJhbWUtPnZp ZXcoKS0+ZnJhbWVSZWN0KCkpKTsKKyAgICBkLT5yZW5kZXJQcml2YXRlKHBhaW50ZXIsIEFsbFBh cnRzLCBRUmVnaW9uKGQtPmZyYW1lLT52aWV3KCktPmZyYW1lUmVjdCgpKSk7CiB9CiAKIC8qIQpk aWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9BcGkvcXdl YmZyYW1lLmgKaW5kZXggNTVjNzNiNC4uMmY5NjRmYSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC0xNjUsOCAr MTY1LDE5IEBAIHB1YmxpYzoKICAgICBRUG9pbnQgc2Nyb2xsUG9zaXRpb24oKSBjb25zdDsKICAg ICB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IFFQb2ludCAmcG9zKTsKIAotICAgIHZvaWQg cmVuZGVyKFFQYWludGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9uICZjbGlwKTsKLSAgICB2b2lk IHJlbmRlcihRUGFpbnRlciAqcGFpbnRlcik7CisgICAgdm9pZCByZW5kZXIoUVBhaW50ZXIqLCBj b25zdCBRUmVnaW9uJiBjbGlwKTsKKyAgICB2b2lkIHJlbmRlcihRUGFpbnRlciopOworCisgICAg ZW51bSBQYXJ0cyB7CisgICAgICAgIENvbnRlbnRzID0gMHgwMSwKKyAgICAgICAgU2Nyb2xsQmFy cyA9IDB4MDIsCisgICAgICAgIFBhbkljb24gPSAweDA0LAorCisgICAgICAgIEFsbFBhcnRzID0g MHhmZgorICAgIH07CisKKyAgICB2b2lkIHBhaW50KFFQYWludGVyKiwgUGFydHMgcGFydHMgPSBB bGxQYXJ0cywgY29uc3QgUVJlZ2lvbiYgY2xpcCA9IFFSZWdpb24oKSk7CisKICAgICBib29sIGNs aXBSZW5kZXJUb1ZpZXdwb3J0KCkgY29uc3Q7CiAgICAgdm9pZCBzZXRDbGlwUmVuZGVyVG9WaWV3 cG9ydChib29sIGNsaXBSZW5kZXJUb1ZpZXdwb3J0KTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L0FwaS9xd2ViZnJhbWVfcC5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oCmluZGV4IDYz MmY4M2EuLmMyYWJmOGIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lX3AuaAor KysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmgKQEAgLTgyLDcgKzgyLDcgQEAgcHVibGlj OgogICAgIHN0YXRpYyBXZWJDb3JlOjpGcmFtZSogY29yZShRV2ViRnJhbWUqKTsKICAgICBzdGF0 aWMgUVdlYkZyYW1lKiBraXQoV2ViQ29yZTo6RnJhbWUqKTsKIAotICAgIHZvaWQgcmVuZGVyUHJp dmF0ZShRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVJlZ2lvbiAmY2xpcCk7CisgICAgdm9pZCBy ZW5kZXJQcml2YXRlKFFQYWludGVyKiwgUVdlYkZyYW1lOjpQYXJ0cywgY29uc3QgUVJlZ2lvbiYg Y2xpcCk7CiAKICAgICBRV2ViRnJhbWUgKnE7CiAgICAgUXQ6OlNjcm9sbEJhclBvbGljeSBob3Jp em9udGFsU2Nyb2xsQmFyUG9saWN5OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBi L1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNDEwNmI5OS4uMDk3ZTBlYiAxMDA2NDQKLS0tIGEv V2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTkgQEAKKzIwMDktMTAtMTkgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3 ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEludHJvZHVjZSBuZXcgcGFpbnQgbWV0aG9kIG9uIFFXZWJGcmFtZSwgd2hpY2ggc3VwcG9y dHMgc3BlY2lmeWluZworICAgICAgICB3aGljaCBwYXJ0cyB0byBwYWludCAoc2Nyb2xsYmFycywg Y29udGVudHMsIHBhbi1pY29uKS4KKworICAgICAgICBEZXByZWNhdGUgcmVuZGVyKCkuCisKKyAg ICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKFFXZWJGcmFtZVByaXZhdGU6OnJl bmRlclByaXZhdGUpOgorICAgICAgICAoUVdlYkZyYW1lOjpwYWludCk6CisgICAgICAgIChRV2Vi RnJhbWU6OnJlbmRlcik6CisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5oOgorICAgICAgICAqIEFw aS9xd2ViZnJhbWVfcC5oOgorCiAyMDA5LTEwLTE5ICBWaWF0Y2hlc2xhdiBPc3RhcGVua28gIDxv c3RhcGVua28udmlhdGNoZXNsYXZAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFy aXlhIEhpZGF5YXQuCi0tIAoxLjYuMC40Cgo= 41454 2009-10-19 14:42:36 -0700 2009-10-21 10:40:01 -0700 Second version incorporating feedback from IRC 0001-Introduce-new-paint-method-on-QWebFrame-which-suppo.patch text/plain 6608 kenneth RnJvbSAyM2IwYzk3ODFhNjNhYTA4ZjdiMjU3M2RmMDgyMzVjOGU4MzU5YTU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBNb24sIDE5IE9jdCAyMDA5IDE3OjI5OjEzIC0wMzAwClN1YmplY3Q6 IFtQQVRDSF0gSW50cm9kdWNlIG5ldyBwYWludCBtZXRob2Qgb24gUVdlYkZyYW1lLCB3aGljaCBz dXBwb3J0cyBzcGVjaWZ5aW5nCiB3aGljaCBwYXJ0cyB0byBwYWludCAoc2Nyb2xsYmFycywgY29u dGVudHMsIHBhbi1pY29uKS4KClBhdGNoIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuIDxr ZW5uZXRoQHdlYmtpdC5vcmc+IG9uIDIwMDktMTAtMTkKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgpEZXByZWNhdGUgcmVuZGVyKCkuCgoqIEFwaS9xd2ViZnJhbWUuY3BwOgooUVdlYkZyYW1l UHJpdmF0ZTo6cmVuZGVyUHJpdmF0ZSk6CihRV2ViRnJhbWU6OnBhaW50KToKKFFXZWJGcmFtZTo6 cmVuZGVyKToKKiBBcGkvcXdlYmZyYW1lLmg6CiogQXBpL3F3ZWJmcmFtZV9wLmg6Ci0tLQogV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIHwgICA3MSArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oICAgfCAgIDE0ICsr KysrKystCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmggfCAgICAyICstCiBXZWJLaXQvcXQv Q2hhbmdlTG9nICAgICAgICAgfCAgIDE2ICsrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgODQg aW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmluZGV4IGQyYzMy NGQuLjNiZWRmNmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTIzMiw3ICsyMzIsNyBAQCBXZWJDb3Jl OjpTY3JvbGxiYXIqIFFXZWJGcmFtZVByaXZhdGU6OnZlcnRpY2FsU2Nyb2xsQmFyKCkgY29uc3QK ICAgICByZXR1cm4gZnJhbWUtPnZpZXcoKS0+dmVydGljYWxTY3JvbGxiYXIoKTsKIH0KIAotdm9p ZCBRV2ViRnJhbWVQcml2YXRlOjpyZW5kZXJQcml2YXRlKFFQYWludGVyICpwYWludGVyLCBjb25z dCBRUmVnaW9uICZjbGlwKQordm9pZCBRV2ViRnJhbWVQcml2YXRlOjpyZW5kZXJQcml2YXRlKFFQ YWludGVyICpwYWludGVyLCBRV2ViRnJhbWU6OlJlbmRlckxheWVyIGxheWVyLCBjb25zdCBRUmVn aW9uICZjbGlwKQogewogICAgIGlmICghZnJhbWUtPnZpZXcoKSB8fCAhZnJhbWUtPmNvbnRlbnRS ZW5kZXJlcigpKQogICAgICAgICByZXR1cm47CkBAIC0yNDEsMjQgKzI0MSw1MCBAQCB2b2lkIFFX ZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUoUVBhaW50ZXIgKnBhaW50ZXIsIGNvbnN0IFFS ZWdpb24gJmNsaXApCiAgICAgaWYgKHZlY3Rvci5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsK IAotICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IGZyYW1lLT52aWV3KCk7Ci0gICAgdmll dy0+bGF5b3V0SWZOZWVkZWRSZWN1cnNpdmUoKTsKLQogICAgIEdyYXBoaWNzQ29udGV4dCBjb250 ZXh0KHBhaW50ZXIpOworICAgIGlmIChjb250ZXh0LnBhaW50aW5nRGlzYWJsZWQoKSAmJiAhY29u dGV4dC51cGRhdGluZ0NvbnRyb2xUaW50cygpKQorICAgICAgICByZXR1cm47CiAKLSAgICBpZiAo Y2xpcFJlbmRlclRvVmlld3BvcnQpCi0gICAgICAgIHZpZXctPnBhaW50KCZjb250ZXh0LCB2ZWN0 b3IuZmlyc3QoKSk7Ci0gICAgZWxzZQotICAgICAgICB2aWV3LT5wYWludENvbnRlbnRzKCZjb250 ZXh0LCB2ZWN0b3IuZmlyc3QoKSk7CisgICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3ID0gZnJh bWUtPnZpZXcoKTsKKyAgICB2aWV3LT5sYXlvdXRJZk5lZWRlZFJlY3Vyc2l2ZSgpOwogCi0gICAg Zm9yIChpbnQgaSA9IDE7IGkgPCB2ZWN0b3Iuc2l6ZSgpOyArK2kpIHsKKyAgICBmb3IgKGludCBp ID0gMDsgaSA8IHZlY3Rvci5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBRUmVjdCYgY2xp cFJlY3QgPSB2ZWN0b3IuYXQoaSk7CiAgICAgICAgIHBhaW50ZXItPnNhdmUoKTsKICAgICAgICAg cGFpbnRlci0+c2V0Q2xpcFJlY3QoY2xpcFJlY3QsIFF0OjpJbnRlcnNlY3RDbGlwKTsKLSAgICAg ICAgaWYgKGNsaXBSZW5kZXJUb1ZpZXdwb3J0KQotICAgICAgICAgICAgdmlldy0+cGFpbnQoJmNv bnRleHQsIGNsaXBSZWN0KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdmlldy0+cGFpbnRD b250ZW50cygmY29udGV4dCwgY2xpcFJlY3QpOworCisgICAgICAgIGlmIChsYXllciAmIFFXZWJG cmFtZTo6Q29udGVudHNMYXllcikgeworICAgICAgICAgICAgY29udGV4dC5zYXZlKCk7CisKKyAg ICAgICAgICAgIFFSZWN0IHJlY3QgPSBjbGlwUmVjdC5pbnRlcnNlY3RlZCh2aWV3LT5mcmFtZVJl Y3QoKSk7CisgICAgICAgICAgICBjb250ZXh0LnRyYW5zbGF0ZSh2aWV3LT54KCksIHZpZXctPnko KSk7CisgICAgICAgICAgICByZWN0LnRyYW5zbGF0ZSgtIHZpZXctPngoKSwgLSB2aWV3LT55KCkp OworICAgICAgICAgICAgY29udGV4dC50cmFuc2xhdGUoLSB2aWV3LT5zY3JvbGxYKCksIC0gdmll dy0+c2Nyb2xsWSgpKTsKKyAgICAgICAgICAgIHJlY3QudHJhbnNsYXRlKHZpZXctPnNjcm9sbFgo KSwgdmlldy0+c2Nyb2xsWSgpKTsKKyAgICAgICAgICAgIGNvbnRleHQuY2xpcCh2aWV3LT52aXNp YmxlQ29udGVudFJlY3QoKSk7CisKKyAgICAgICAgICAgIHZpZXctPnBhaW50Q29udGVudHMoJmNv bnRleHQsIHJlY3QpOworCisgICAgICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKKyAgICAgICAg fQorCisgICAgICAgIGlmIChsYXllciAmIFFXZWJGcmFtZTo6U2Nyb2xsQmFyTGF5ZXIKKyAgICAg ICAgICAgICYmICF2aWV3LT5zY3JvbGxiYXJzU3VwcHJlc3NlZCgpCisgICAgICAgICAgICAmJiAo dmlldy0+aG9yaXpvbnRhbFNjcm9sbGJhcigpIHx8IHZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkp KSB7CisgICAgICAgICAgICBjb250ZXh0LnNhdmUoKTsKKworICAgICAgICAgICAgUVJlY3QgcmVj dCA9IGNsaXBSZWN0LmludGVyc2VjdGVkKHZpZXctPmZyYW1lUmVjdCgpKTsKKyAgICAgICAgICAg IGNvbnRleHQudHJhbnNsYXRlKHZpZXctPngoKSwgdmlldy0+eSgpKTsKKyAgICAgICAgICAgIHJl Y3QudHJhbnNsYXRlKC0gdmlldy0+eCgpLCAtIHZpZXctPnkoKSk7CisKKyAgICAgICAgICAgIHZp ZXctPnBhaW50U2Nyb2xsYmFycygmY29udGV4dCwgcmVjdCk7CisKKyAgICAgICAgICAgIGNvbnRl eHQucmVzdG9yZSgpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGxheWVyICYgUVdlYkZyYW1l OjpQYW5JY29uTGF5ZXIpCisgICAgICAgICAgICB2aWV3LT5wYWludFBhblNjcm9sbEljb24oJmNv bnRleHQpOworCiAgICAgICAgIHBhaW50ZXItPnJlc3RvcmUoKTsKICAgICB9CiB9CkBAIC05NDYs MTMgKzk3MiwyNiBAQCB2b2lkIFFXZWJGcmFtZTo6c2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgUVBv aW50ICZwb3MpCiB9CiAKIC8qIQotICBSZW5kZXIgdGhlIGZyYW1lIGludG8gXGEgcGFpbnRlciBj bGlwcGluZyB0byBcYSBjbGlwLgorICBcc2luY2UgNC42CisgIFJlbmRlciB0aGUgXGEgbGF5ZXIg b2YgdGhlIGZyYW1lIHVzaW5nIFxhIHBhaW50ZXIgY2xpcHBpbmcgdG8gXGEgY2xpcC4KIAogICBc c2EgcHJpbnQoKQogKi8KKwordm9pZCBRV2ViRnJhbWU6OnJlbmRlcihRUGFpbnRlciogcGFpbnRl ciwgUmVuZGVyTGF5ZXIgbGF5ZXIsIGNvbnN0IFFSZWdpb24mIGNsaXApCit7CisgICAgaWYgKCFj bGlwLmlzRW1wdHkoKSkKKyAgICAgICAgZC0+cmVuZGVyUHJpdmF0ZShwYWludGVyLCBsYXllciwg Y2xpcCk7CisgICAgZWxzZSBpZiAoZC0+ZnJhbWUtPnZpZXcoKSkKKyAgICAgICAgZC0+cmVuZGVy UHJpdmF0ZShwYWludGVyLCBsYXllciwgUVJlZ2lvbihkLT5mcmFtZS0+dmlldygpLT5mcmFtZVJl Y3QoKSkpOworfQorCisvKiEKKyAgUmVuZGVyIHRoZSBmcmFtZSBpbnRvIFxhIHBhaW50ZXIgY2xp cHBpbmcgdG8gXGEgY2xpcC4KKyovCiB2b2lkIFFXZWJGcmFtZTo6cmVuZGVyKFFQYWludGVyICpw YWludGVyLCBjb25zdCBRUmVnaW9uICZjbGlwKQogewotICAgIGQtPnJlbmRlclByaXZhdGUocGFp bnRlciwgY2xpcCk7CisgICAgZC0+cmVuZGVyUHJpdmF0ZShwYWludGVyLCBBbGxMYXllcnMsIGNs aXApOwogfQogCiAvKiEKQEAgLTk2Myw3ICsxMDAyLDcgQEAgdm9pZCBRV2ViRnJhbWU6OnJlbmRl cihRUGFpbnRlciAqcGFpbnRlcikKICAgICBpZiAoIWQtPmZyYW1lLT52aWV3KCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIGQtPnJlbmRlclByaXZhdGUocGFpbnRlciwgUVJlZ2lvbihkLT5mcmFt ZS0+dmlldygpLT5mcmFtZVJlY3QoKSkpOworICAgIGQtPnJlbmRlclByaXZhdGUocGFpbnRlciwg QWxsTGF5ZXJzLCBRUmVnaW9uKGQtPmZyYW1lLT52aWV3KCktPmZyYW1lUmVjdCgpKSk7CiB9CiAK IC8qIQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmgKaW5kZXggNTVjNzNiNC4uZjMwMTlmMiAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC0x NjUsOCArMTY1LDE4IEBAIHB1YmxpYzoKICAgICBRUG9pbnQgc2Nyb2xsUG9zaXRpb24oKSBjb25z dDsKICAgICB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IFFQb2ludCAmcG9zKTsKIAotICAg IHZvaWQgcmVuZGVyKFFQYWludGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9uICZjbGlwKTsKLSAg ICB2b2lkIHJlbmRlcihRUGFpbnRlciAqcGFpbnRlcik7CisgICAgZW51bSBSZW5kZXJMYXllciB7 CisgICAgICAgIENvbnRlbnRzTGF5ZXIgPSAweDAxLAorICAgICAgICBTY3JvbGxCYXJMYXllciA9 IDB4MDIsCisgICAgICAgIFBhbkljb25MYXllciA9IDB4MDQsCisKKyAgICAgICAgQWxsTGF5ZXJz ID0gMHhmZgorICAgIH07CisKKyAgICB2b2lkIHJlbmRlcihRUGFpbnRlciopOworICAgIHZvaWQg cmVuZGVyKFFQYWludGVyKiwgY29uc3QgUVJlZ2lvbiYgY2xpcCk7CisgICAgdm9pZCByZW5kZXIo UVBhaW50ZXIqLCBSZW5kZXJMYXllciBsYXllciwgY29uc3QgUVJlZ2lvbiYgY2xpcCA9IFFSZWdp b24oKSk7CisKICAgICBib29sIGNsaXBSZW5kZXJUb1ZpZXdwb3J0KCkgY29uc3Q7CiAgICAgdm9p ZCBzZXRDbGlwUmVuZGVyVG9WaWV3cG9ydChib29sIGNsaXBSZW5kZXJUb1ZpZXdwb3J0KTsKIApk aWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oIGIvV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWVfcC5oCmluZGV4IDYzMmY4M2EuLjdkMzk2NzMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9x dC9BcGkvcXdlYmZyYW1lX3AuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmgKQEAg LTgyLDcgKzgyLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBXZWJDb3JlOjpGcmFtZSogY29yZShR V2ViRnJhbWUqKTsKICAgICBzdGF0aWMgUVdlYkZyYW1lKiBraXQoV2ViQ29yZTo6RnJhbWUqKTsK IAotICAgIHZvaWQgcmVuZGVyUHJpdmF0ZShRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVJlZ2lv biAmY2xpcCk7CisgICAgdm9pZCByZW5kZXJQcml2YXRlKFFQYWludGVyKiwgUVdlYkZyYW1lOjpS ZW5kZXJMYXllciwgY29uc3QgUVJlZ2lvbiYgY2xpcCk7CiAKICAgICBRV2ViRnJhbWUgKnE7CiAg ICAgUXQ6OlNjcm9sbEJhclBvbGljeSBob3Jpem9udGFsU2Nyb2xsQmFyUG9saWN5OwpkaWZmIC0t Z2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNDEw NmI5OS4uMDk3ZTBlYiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJL aXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMTAtMTkgIEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZSBuZXcgcGFpbnQgbWV0aG9k IG9uIFFXZWJGcmFtZSwgd2hpY2ggc3VwcG9ydHMgc3BlY2lmeWluZworICAgICAgICB3aGljaCBw YXJ0cyB0byBwYWludCAoc2Nyb2xsYmFycywgY29udGVudHMsIHBhbi1pY29uKS4KKworICAgICAg ICBEZXByZWNhdGUgcmVuZGVyKCkuCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAg ICAgICAgKFFXZWJGcmFtZVByaXZhdGU6OnJlbmRlclByaXZhdGUpOgorICAgICAgICAoUVdlYkZy YW1lOjpwYWludCk6CisgICAgICAgIChRV2ViRnJhbWU6OnJlbmRlcik6CisgICAgICAgICogQXBp L3F3ZWJmcmFtZS5oOgorICAgICAgICAqIEFwaS9xd2ViZnJhbWVfcC5oOgorCiAyMDA5LTEwLTE5 ICBWaWF0Y2hlc2xhdiBPc3RhcGVua28gIDxvc3RhcGVua28udmlhdGNoZXNsYXZAbm9raWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCi0tIAoxLjYuMC40Cgo=