54826 2011-02-20 08:45:17 -0800 [GTK] Add a setting to change the pixels per line used for scrolling 2014-04-08 18:45:07 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED LATER P2 Normal --- 1 alex webkit-unassigned eric mathstuf mrobinson phatina xan.lopez oldest_to_newest 354280 0 alex 2011-02-20 08:45:17 -0800 This will allow to change the scrolling distance per event. We have to add the setting and use it in PlatformMouseEvent and WebEventFactory. 354281 1 alex 2011-02-20 08:48:51 -0800 (In reply to comment #0) > This will allow to change the scrolling distance per event. We have to add the setting and use it in PlatformMouseEvent and WebEventFactory. Actually the list of files using it is: - WheelEventGtk.cpp - ScrollViewGtk.cpp - WebEventFactory.cpp 395248 2 91675 phatina 2011-04-29 07:00:05 -0700 Created attachment 91675 Setting to change the pixels per line added. The setting should be now available. I suggest to have one global object of the Settings class, as the Qt does, which gives us the ability to have application-wide settings accessible at any point. The default setting uses the value of Scrollbar::pixelsPerLineStep(), which is now free to change by void setScrollPixelCount(float count). 398636 3 92395 phatina 2011-05-05 02:18:26 -0700 Created attachment 92395 Setting to change the pixels per line added. I forgot to append the ChangeLogs into the patch, now it should be fine. 411054 4 eric 2011-05-26 18:01:06 -0700 Seems like a relatively simple patch which hasn't been touched in 3 weeks. Bueller? 411527 5 92395 mrobinson 2011-05-27 10:37:57 -0700 Comment on attachment 92395 Setting to change the pixels per line added. View in context: https://bugs.webkit.org/attachment.cgi?id=92395&action=review > Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp:75 > - // FIXME: retrieve the user setting for the number of lines to scroll on each wheel event > - m_deltaX *= static_cast<float>(Scrollbar::pixelsPerLineStep()); > - m_deltaY *= static_cast<float>(Scrollbar::pixelsPerLineStep()); > + Settings* settings = Settings::globalSettings(); > + m_deltaX *= settings->scrollPixelCount(); > + m_deltaY *= settings->scrollPixelCount(); I think this comment actually refers to retrieving the setting from GTK+. I do not think it is worth exposing this kind of low-level option through the API. If there is a default GTK+ value for this though, we should be sure to use it so that scrollbars move in a more native way. Personally I do not find anything wrong with the current scrollbar behavior and feel we can probably just remove the comments and close the bug. I could be wrong though and perhaps our scrollbars could move more natively during wheel events. 421816 6 phatina 2011-06-16 00:06:42 -0700 As far as I know, Gtk does not provide a way, how to determine the default value for scrolling step. But in my opinion, the ability to set the scrolling pixel count can be useful. In comparision with other browsers, some of them allow to do this. 999002 7 mrobinson 2014-04-08 18:45:07 -0700 Let's skip this feature for now and determine if we need it later. 91675 2011-04-29 07:00:05 -0700 2011-05-27 10:38:12 -0700 Setting to change the pixels per line added. scroll.patch text/plain 8139 phatina ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKaW5kZXggZGQ3ZWQ4OS4uYzA0NzVjNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9TZXR0aW5ncy5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAy MDA2LCAyMDA3LCAyMDA4LCAyMDA5LCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSwgUmVkIEhhdCwgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zOCw2ICszOSw3IEBACiAj aW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBhZ2VDYWNoZS5oIgogI2luY2x1ZGUgIlJlc291 cmNlSGFuZGxlLmgiCisjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiU3RvcmFnZU1h cC5oIgogI2luY2x1ZGUgPGxpbWl0cz4KIApAQCAtNTksNiArNjEsOCBAQCBib29sIFNldHRpbmdz OjpnU2hvdWxkUGFpbnROYXRpdmVDb250cm9scyA9IHRydWU7CiBib29sIFNldHRpbmdzOjpnU2hv dWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMgPSB0cnVlOwogI2VuZGlmCiAKK093blB0cjxTZXR0 aW5ncz4gU2V0dGluZ3M6OnNfc2V0dGluZ3M7CisKIC8vIE5PVEVzCiAvLyAgMSkgRWRpdGluZ01h Y0JlaGF2aW9yIGNvbXByaXNlcyBUaWdlciwgTGVvcGFyZCwgU25vd0xlb3BhcmQgYW5kIGlPUyBi dWlsZHMsIGFzIHdlbGwgUXRXZWJLaXQgYW5kIENocm9taXVtIHdoZW4gYnVpbHQgb24gTWFjOwog Ly8gIDIpIEVkaXRpbmdXaW5kb3dzQmVoYXZpb3IgY29tcHJpc2VzIFdpbjMyIGFuZCBXaW5DRSBi dWlsZHMsIGFzIHdlbGwgYXMgUXRXZWJLaXQgYW5kIENocm9taXVtIHdoZW4gYnVpbHQgb24gV2lu ZG93czsKQEAgLTE3NCw2ICsxNzgsNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkK ICAgICAsIG1fdXNlUXVpY2tMb29rUmVzb3VyY2VDYWNoaW5nUXVpcmtzKGZhbHNlKQogICAgICwg bV9mb3JjZUNvbXBvc2l0aW5nTW9kZShmYWxzZSkKICAgICAsIG1fc2hvdWxkSW5qZWN0VXNlclNj cmlwdHNJbkluaXRpYWxFbXB0eURvY3VtZW50KGZhbHNlKQorICAgICwgbV9zY3JvbGxQaXhlbENv dW50KHN0YXRpY19jYXN0PGZsb2F0PihTY3JvbGxiYXI6OnBpeGVsc1BlckxpbmVTdGVwKCkpKQog ewogICAgIC8vIEEgRnJhbWUgbWF5IG5vdCBoYXZlIGJlZW4gY3JlYXRlZCB5ZXQsIHNvIHdlIGlu aXRpYWxpemUgdGhlIEF0b21pY1N0cmluZyAKICAgICAvLyBoYXNoIGJlZm9yZSB0cnlpbmcgdG8g dXNlIGl0LgpAQCAtNzI5LDQgKzczNCwxMiBAQCB2b2lkIFNldHRpbmdzOjpzZXRUaWxlZEJhY2tp bmdTdG9yZUVuYWJsZWQoYm9vbCBlbmFibGVkKQogI2VuZGlmCiB9CiAKK1NldHRpbmdzKiBTZXR0 aW5nczo6Z2xvYmFsU2V0dGluZ3MoKQoreworICAgIGlmICghU2V0dGluZ3M6OnNfc2V0dGluZ3Mp CisgICAgICAgIFNldHRpbmdzOjpzX3NldHRpbmdzID0gYWRvcHRQdHIobmV3IFNldHRpbmdzKDAp KTsKKyAgICAKKyAgICByZXR1cm4gU2V0dGluZ3M6OnNfc2V0dGluZ3MuZ2V0KCk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAppbmRleCA1ZDY5NDUyLi4x ZjY4ZDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCkBAIC0xLDYgKzEsNyBAQAogLyoKICAqIENv cHlyaWdodCAoQykgMjAwMywgMjAwNiwgMjAwNywgMjAwOCwgMjAwOSwgMjAxMSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiAgICAgICAgICAgKEMpIDIwMDYgR3JhaGFtIERlbm5p cyAoZ3JhaGFtLmRlbm5pc0BnbWFpbC5jb20pCisgKiAgICAgICAgICAgKEMpIDIwMTEgUmVkIEhh dCwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0zMCw2ICszMSw3IEBACiAjaW5jbHVkZSAiRWRpdGluZ0JlaGF2aW9yVHlwZXMuaCIK ICNpbmNsdWRlICJGb250UmVuZGVyaW5nTW9kZS5oIgogI2luY2x1ZGUgIktVUkwuaCIKKyNpbmNs dWRlIDx3dGYvT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQXRvbWljU3RyaW5nLmg+CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTM5Myw5ICszOTUsMTUgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICAKICAgICAgICAgdm9pZCBzZXRTaG91bGRJbmplY3RVc2VyU2NyaXB0c0lu SW5pdGlhbEVtcHR5RG9jdW1lbnQoYm9vbCBmbGFnKSB7IG1fc2hvdWxkSW5qZWN0VXNlclNjcmlw dHNJbkluaXRpYWxFbXB0eURvY3VtZW50ID0gZmxhZzsgfQogICAgICAgICBib29sIHNob3VsZElu amVjdFVzZXJTY3JpcHRzSW5Jbml0aWFsRW1wdHlEb2N1bWVudCgpIHsgcmV0dXJuIG1fc2hvdWxk SW5qZWN0VXNlclNjcmlwdHNJbkluaXRpYWxFbXB0eURvY3VtZW50OyB9CisgICAgICAgIAorICAg ICAgICB2b2lkIHNldFNjcm9sbFBpeGVsQ291bnQoZmxvYXQgY291bnQpIHsgbV9zY3JvbGxQaXhl bENvdW50ID0gY291bnQ7IH0KKyAgICAgICAgZmxvYXQgc2Nyb2xsUGl4ZWxDb3VudCgpIGNvbnN0 IHsgcmV0dXJuIG1fc2Nyb2xsUGl4ZWxDb3VudDsgfQorICAgICAgICAKKyAgICAgICAgc3RhdGlj IFNldHRpbmdzICpnbG9iYWxTZXR0aW5ncygpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgUGFn ZSogbV9wYWdlOworICAgICAgICBzdGF0aWMgV1RGOjpPd25QdHI8U2V0dGluZ3M+IHNfc2V0dGlu Z3M7CiAKICAgICAgICAgU3RyaW5nIG1fZGVmYXVsdFRleHRFbmNvZGluZ05hbWU7CiAgICAgICAg IFN0cmluZyBtX2Z0cERpcmVjdG9yeVRlbXBsYXRlUGF0aDsKQEAgLTQ5Nyw2ICs1MDUsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgbV91c2VRdWlja0xvb2tSZXNvdXJjZUNh Y2hpbmdRdWlya3MgOiAxOwogICAgICAgICBib29sIG1fZm9yY2VDb21wb3NpdGluZ01vZGUgOiAx OwogICAgICAgICBib29sIG1fc2hvdWxkSW5qZWN0VXNlclNjcmlwdHNJbkluaXRpYWxFbXB0eURv Y3VtZW50IDogMTsKKyAgICAgICAgZmxvYXQgbV9zY3JvbGxQaXhlbENvdW50OwogCiAjaWYgVVNF KFNBRkFSSV9USEVNRSkKICAgICAgICAgc3RhdGljIGJvb2wgZ1Nob3VsZFBhaW50TmF0aXZlQ29u dHJvbHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1X aGVlbEV2ZW50R3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVdo ZWVsRXZlbnRHdGsuY3BwCmluZGV4IGZjNjIwNmYuLjRiOGY3ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVdoZWVsRXZlbnRHdGsuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVdoZWVsRXZlbnRHdGsuY3BwCkBAIC0x LDYgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBDb21wdXRlciwgSW5j LiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwNiBNaWNoYWVsIEVt bWVsIG1pa2UuZW1tZWxAZ21haWwuY29tCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgUmVkIEhhdCwg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKQEAgLTI4LDYgKzI5LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJTY3JvbGxiYXIuaCIKKyNpbmNs dWRlICJTZXR0aW5ncy5oIgogCiAjaW5jbHVkZSA8Z2RrL2dkay5oPgogCkBAIC02OCw5ICs3MCw5 IEBAIFBsYXRmb3JtV2hlZWxFdmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50KEdka0V2ZW50U2Nyb2xs KiBldmVudCkKICAgICBtX2FsdEtleSA9IGV2ZW50LT5zdGF0ZSAmIEdES19NT0QxX01BU0s7CiAg ICAgbV9tZXRhS2V5ID0gZXZlbnQtPnN0YXRlICYgR0RLX01FVEFfTUFTSzsKIAotICAgIC8vIEZJ WE1FOiByZXRyaWV2ZSB0aGUgdXNlciBzZXR0aW5nIGZvciB0aGUgbnVtYmVyIG9mIGxpbmVzIHRv IHNjcm9sbCBvbiBlYWNoIHdoZWVsIGV2ZW50Ci0gICAgbV9kZWx0YVggKj0gc3RhdGljX2Nhc3Q8 ZmxvYXQ+KFNjcm9sbGJhcjo6cGl4ZWxzUGVyTGluZVN0ZXAoKSk7Ci0gICAgbV9kZWx0YVkgKj0g c3RhdGljX2Nhc3Q8ZmxvYXQ+KFNjcm9sbGJhcjo6cGl4ZWxzUGVyTGluZVN0ZXAoKSk7CisgICAg U2V0dGluZ3MqIHNldHRpbmdzID0gU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCk7CisgICAgbV9k ZWx0YVggKj0gc2V0dGluZ3MtPnNjcm9sbFBpeGVsQ291bnQoKTsKKyAgICBtX2RlbHRhWSAqPSBz ZXR0aW5ncy0+c2Nyb2xsUGl4ZWxDb3VudCgpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAKaW5kZXggNTNjYWNmNy4uODcxMjk5MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbFZpZXdHdGsuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNwcApAQCAtMyw2 ICszLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNiBNaWNoYWVsIEVtbWVsIG1pa2UuZW1tZWxA Z21haWwuY29tCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDkgSG9sZ2VyIEhhbnMgUGV0ZXIg RnJleXRoZXIKICAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAxMCBDb2xsYWJvcmEgTHRkLgorICog Q29weXJpZ2h0IChDKSAyMDExLCBSZWQgSGF0LCBJbmMuIEFsbCByaWdodCByZXNlcnZlZC4KICAq CiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKQEAgLTQ2LDYgKzQ3LDcgQEAKICNpbmNsdWRl ICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIK ICNpbmNsdWRlICJTY3JvbGxiYXJUaGVtZS5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5j bHVkZSA8Z3RrL2d0ay5oPgogCiB1c2luZyBuYW1lc3BhY2Ugc3RkOwpAQCAtMTEzLDcgKzExNSw3 IEBAIHZvaWQgU2Nyb2xsVmlldzo6c2V0SG9yaXpvbnRhbEFkanVzdG1lbnQoR3RrQWRqdXN0bWVu dCogaGFkaiwgYm9vbCByZXNldFZhbHVlcykKICAgICBndGtfYWRqdXN0bWVudF9jb25maWd1cmUo bV9ob3Jpem9udGFsQWRqdXN0bWVudC5nZXQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmVzZXRWYWx1ZXMgPyAwIDogc2Nyb2xsT2Zmc2V0KCkud2lkdGgoKSwgMCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogY29udGVudHNTaXplKCkud2lk dGgoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogU2Ny b2xsYmFyOjpwaXhlbHNQZXJMaW5lU3RlcCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZXNldFZhbHVlcyA/IDAgOiBTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2Nyb2xsUGl4 ZWxDb3VudCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNldFZhbHVlcyA/IDAg OiBob3Jpem9udGFsUGFnZVN0ZXAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc2V0 VmFsdWVzID8gMCA6IGZyYW1lUmVjdCgpLndpZHRoKCkpOwogfQpAQCAtMTUyLDcgKzE1NCw3IEBA IHZvaWQgU2Nyb2xsVmlldzo6c2V0VmVydGljYWxBZGp1c3RtZW50KEd0a0FkanVzdG1lbnQqIHZh ZGosIGJvb2wgcmVzZXRWYWx1ZXMpCiAgICAgZ3RrX2FkanVzdG1lbnRfY29uZmlndXJlKG1fdmVy dGljYWxBZGp1c3RtZW50LmdldCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNl dFZhbHVlcyA/IDAgOiBzY3JvbGxPZmZzZXQoKS5oZWlnaHQoKSwgMCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogY29udGVudHNTaXplKCkuaGVpZ2h0KCks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc2V0VmFsdWVzID8gMCA6IFNjcm9sbGJh cjo6cGl4ZWxzUGVyTGluZVN0ZXAoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVz ZXRWYWx1ZXMgPyAwIDogU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNjcm9sbFBpeGVsQ291 bnQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogdmVy dGljYWxQYWdlU3RlcCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMg PyAwIDogZnJhbWVSZWN0KCkuaGVpZ2h0KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCmluZGV4IGQ4ZjhiNDYuLjA5ZjhhY2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5jcHAKQEAgLTIsNiArMiw3 IEBACiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogICogUG9ydGlvbnMgQ29weXJpZ2h0IChjKSAyMDEwIE1vdG9yb2xhIE1vYmlsaXR5LCBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBTLkwu CisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgUmVkIEhhdCwgSW5jLiBBbGwgcmlnaHQgcmVzZXJ2ZWQu CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTMwLDcgKzMxLDcgQEAKIAogI2lu Y2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJkRXZlbnQu aCIKLSNpbmNsdWRlICJTY3JvbGxiYXIuaCIKKyNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1 ZGUgIldpbmRvd3NLZXlib2FyZENvZGVzLmgiCiAjaW5jbHVkZSA8Z2RrL2dkay5oPgogI2luY2x1 ZGUgPGdkay9nZGtrZXlzeW1zLmg+CkBAIC0xNTYsOSArMTU3LDcgQEAgV2ViV2hlZWxFdmVudCBX ZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoR2RrRXZlbnRTY3JvbGwqIHNjcm9s bEV2ZW50KQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAKLSAgICAvLyBG SVhNRTogW0dUS10gQWRkIGEgc2V0dGluZyB0byBjaGFuZ2UgdGhlIHBpeGVscyBwZXIgbGluZSB1 c2VkIGZvciBzY3JvbGxpbmcKLSAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTQ4MjYKLSAgICBmbG9hdCBzdGVwID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KFNjcm9s bGJhcjo6cGl4ZWxzUGVyTGluZVN0ZXAoKSk7CisgICAgZmxvYXQgc3RlcCA9IFNldHRpbmdzOjpn bG9iYWxTZXR0aW5ncygpLT5zY3JvbGxQaXhlbENvdW50KCk7CiAgICAgRmxvYXRTaXplIGRlbHRh KHdoZWVsVGlja3Mud2lkdGgoKSAqIHN0ZXAsIHdoZWVsVGlja3MuaGVpZ2h0KCkgKiBzdGVwKTsK IAogICAgIHJldHVybiBXZWJXaGVlbEV2ZW50KFdlYkV2ZW50OjpXaGVlbCwK 92395 2011-05-05 02:18:26 -0700 2011-05-27 10:37:57 -0700 Setting to change the pixels per line added. 54826-scroll-setting.patch text/plain 10964 phatina SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1NzM2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDUtMDUgIFBldGVyIEhh dGluYSAgPHBoYXRpbmFAcmVkaGF0LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQaXhlbCBjb3VudCB1c2VkIGZvciBzY3JvbGwgZXZlbnQgYWRk ZWQgaW50byB0aGUgcGFnZSBzZXR0aW5ncy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU0ODI2CisKKyAgICAgICAgR2xvYmFsIHNldHRpbmdzIG9iamVj dCBjYW4gYmUgYWNjZXNzZWQgdGhyb3VnaCBzdGF0aXMgU2V0dGluZ3MqIFNldHRpbmdzOjpnbG9i YWxTZXR0aW5ncygpLAorICAgICAgICB3aGljaCBhbHNvIGhvbGRzIGEgdmFsdWUgZm9yIHRoZSBu dW1iZXIgb2YgcGl4ZWxzIHRvIHNjcm9sbCwgd2hlbiBhIHNjcm9sbCBldmVudCBvY2N1cnMuCisg ICAgICAgIEFzIHdlbGwgYXMgdGhlIFNldHRpbmdzIGNsYXNzIGRvZXMgbm90IGhvbGQgcGxhdGZv cm0gc3BlY2lmaWMgdmFsdWVzLCB0aGVyZSBjYW4gbGl2ZQorICAgICAgICBvbmUgZ2xvYmFsIG9i amVjdCwgd2hpY2ggaXMgbm90IHJlbGF0ZWQgdG8gYW55IFBhZ2UuCisKKyAgICAgICAgKiBwYWdl L1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6Cisg ICAgICAgIERlZmF1bHQgdmFsdWUgZm9yIHBpeGVsIGNvdW50IHRvIHNjcm9sbCBpcyBkZXJpdmVk IGZyb20gdGhlIG9sZCBjb2RlLCBmcm9tCisgICAgICAgIHRoZSBzdGF0aWMgaW50IFNjcm9sbGJh cjo6cGl4ZWxzUGVyTGluZVN0ZXAoKS4KKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpnbG9i YWxTZXR0aW5ncyk6CisgICAgICAgIFRoaXMgc3RhdGljIG1ldGhvZCByZXR1cm5zIGEgcG9pbnRl ciB0byB0aGUgZ2xvYmFsIFNldHRpbmdzIG9iamVjdC4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdz Lmg6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6c2V0U2Nyb2xsUGl4ZWxDb3VudCk6Cisg ICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6c2Nyb2xsUGl4ZWxDb3VudCk6CisgICAgICAgIEdl dHRlciBhbmQgc2V0dGVyIGZvciB0aGUgc2Nyb2xsaW5nIHBpeGVsIGNvdW50LgorICAgICAgICAq IHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVdoZWVsRXZlbnRHdGsuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQpOgorICAgICAgICBXaGVl bCBldmVudCBzZXRzIHRoZSBYLCBZIGRlbHRhIGZyb20gZ2xvYmFsIFNldHRpbmdzIG9iamVjdC4K KyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxWaWV3OjpzZXRIb3Jpem9udGFsQWRqdXN0bWVudCk6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxWaWV3OjpzZXRWZXJ0aWNhbEFkanVzdG1lbnQpOgorICAgICAgICBCb3RoIG1l dGhvZHMgdXNlIGdsb2JhbCBTZXR0aW5ncyBvYmplY3QgdG8gZGV0ZXJtaW5lIG5lY2Vzc2FyeSBw aXhlbCBjb3VudCB0byBhZGp1c3Qgc2Nyb2xsaW5nLgorCiAyMDExLTA1LTA0ICBMdWtlIE1hY3Bo ZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAkocmV2aXNpb24gODU3 MjUpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDgsIDIw MDksIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChD KSAyMDExLCBSZWQgSGF0LCBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTM5LDYgKzQwLDcgQEAKICNpbmNsdWRlICJQYWdlLmgiCiAj aW5jbHVkZSAiUGFnZUNhY2hlLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGUuaCIKKyNpbmNs dWRlICJTY3JvbGxiYXIuaCIKICNpbmNsdWRlICJTdG9yYWdlTWFwLmgiCiAjaW5jbHVkZSA8bGlt aXRzPgogCkBAIC02NCw2ICs2Niw4IEBAIGJvb2wgU2V0dGluZ3M6OmdBVkZvdW5kYXRpb25FbmFi bGVkKGZhbHMKIGJvb2wgU2V0dGluZ3M6OmdTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyA9 IHRydWU7CiAjZW5kaWYKIAorT3duUHRyPFNldHRpbmdzPiBTZXR0aW5nczo6c19zZXR0aW5nczsK KwogLy8gTk9URXMKIC8vICAxKSBFZGl0aW5nTWFjQmVoYXZpb3IgY29tcHJpc2VzIFRpZ2VyLCBM ZW9wYXJkLCBTbm93TGVvcGFyZCBhbmQgaU9TIGJ1aWxkcywgYXMgd2VsbCBRdFdlYktpdCBhbmQg Q2hyb21pdW0gd2hlbiBidWlsdCBvbiBNYWM7CiAvLyAgMikgRWRpdGluZ1dpbmRvd3NCZWhhdmlv ciBjb21wcmlzZXMgV2luMzIgYW5kIFdpbkNFIGJ1aWxkcywgYXMgd2VsbCBhcyBRdFdlYktpdCBh bmQgQ2hyb21pdW0gd2hlbiBidWlsdCBvbiBXaW5kb3dzOwpAQCAtMTAwLDYgKzEwNCw3IEBAIFNl dHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogI2VuZGlmCiAgICAgLCBtX3BsdWdpbkFsbG93 ZWRSdW5UaW1lKG51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpCiAgICAgLCBtX2VkaXRp bmdCZWhhdmlvclR5cGUoZWRpdGluZ0JlaGF2aW9yVHlwZUZvclBsYXRmb3JtKCkpCisgICAgLCBt X3Njcm9sbFBpeGVsQ291bnQoc3RhdGljX2Nhc3Q8ZmxvYXQ+KFNjcm9sbGJhcjo6cGl4ZWxzUGVy TGluZVN0ZXAoKSkpCiAgICAgLCBtX2lzU3BhdGlhbE5hdmlnYXRpb25FbmFibGVkKGZhbHNlKQog ICAgICwgbV9pc0phdmFFbmFibGVkKGZhbHNlKQogICAgICwgbV9sb2Fkc0ltYWdlc0F1dG9tYXRp Y2FsbHkoZmFsc2UpCkBAIC03NDIsNCArNzQ3LDEyIEBAIHZvaWQgU2V0dGluZ3M6OnNldFRpbGVk QmFja2luZ1N0b3JlRW5hYmwKICNlbmRpZgogfQogCitTZXR0aW5ncyogU2V0dGluZ3M6Omdsb2Jh bFNldHRpbmdzKCkKK3sKKyAgICBpZiAoIVNldHRpbmdzOjpzX3NldHRpbmdzKQorICAgICAgICBT ZXR0aW5nczo6c19zZXR0aW5ncyA9IGFkb3B0UHRyKG5ldyBTZXR0aW5ncygwKSk7CisgICAgCisg ICAgcmV0dXJuIFNldHRpbmdzOjpzX3NldHRpbmdzLmdldCgpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCShyZXZpc2lvbiA4NTcyNSkKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsx LDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDMsIDIwMDYsIDIwMDcsIDIwMDgsIDIwMDks IDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogICAgICAgICAgIChDKSAy MDA2IEdyYWhhbSBEZW5uaXMgKGdyYWhhbS5kZW5uaXNAZ21haWwuY29tKQorICogICAgICAgICAg IChDKSAyMDExIFJlZCBIYXQsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzAsNiArMzEsNyBAQAogI2luY2x1ZGUgIkVkaXRpbmdC ZWhhdmlvclR5cGVzLmgiCiAjaW5jbHVkZSAiRm9udFJlbmRlcmluZ01vZGUuaCIKICNpbmNsdWRl ICJLVVJMLmgiCisjaW5jbHVkZSA8d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0 b21pY1N0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00MDYsOSArNDA4LDE1IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBhbGxvd0Rpc3BsYXlPZkluc2VjdXJl Q29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dEaXNwbGF5T2ZJbnNlY3VyZUNvbnRlbnQ7 IH0KICAgICAgICAgdm9pZCBzZXRBbGxvd1J1bm5pbmdPZkluc2VjdXJlQ29udGVudChib29sIGZs YWcpIHsgbV9hbGxvd1J1bm5pbmdPZkluc2VjdXJlQ29udGVudCA9IGZsYWc7IH0KICAgICAgICAg Ym9vbCBhbGxvd1J1bm5pbmdPZkluc2VjdXJlQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fYWxs b3dSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnQ7IH0KKyAgICAgICAgCisgICAgICAgICB2b2lkIHNl dFNjcm9sbFBpeGVsQ291bnQoZmxvYXQgY291bnQpIHsgbV9zY3JvbGxQaXhlbENvdW50ID0gY291 bnQ7IH0KKyAgICAgICAgIGZsb2F0IHNjcm9sbFBpeGVsQ291bnQoKSBjb25zdCB7IHJldHVybiBt X3Njcm9sbFBpeGVsQ291bnQ7IH0KKworICAgICAgICAgc3RhdGljIFNldHRpbmdzKiBnbG9iYWxT ZXR0aW5ncygpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgUGFnZSogbV9wYWdlOworICAgICAg ICBzdGF0aWMgV1RGOjpPd25QdHI8U2V0dGluZ3M+IHNfc2V0dGluZ3M7CiAKICAgICAgICAgU3Ry aW5nIG1fZGVmYXVsdFRleHRFbmNvZGluZ05hbWU7CiAgICAgICAgIFN0cmluZyBtX2Z0cERpcmVj dG9yeVRlbXBsYXRlUGF0aDsKQEAgLTQzMyw2ICs0NDEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAjZW5kaWYKICAgICAgICAgdW5zaWduZWQgbV9wbHVnaW5BbGxvd2VkUnVuVGltZTsKICAgICAg ICAgdW5zaWduZWQgbV9lZGl0aW5nQmVoYXZpb3JUeXBlOworICAgICAgICBmbG9hdCBtX3Njcm9s bFBpeGVsQ291bnQ7CiAgICAgICAgIGJvb2wgbV9pc1NwYXRpYWxOYXZpZ2F0aW9uRW5hYmxlZCA6 IDE7CiAgICAgICAgIGJvb2wgbV9pc0phdmFFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX2xv YWRzSW1hZ2VzQXV0b21hdGljYWxseSA6IDE7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3RrLmNwcAkocmV2aXNpb24gODU3 MjUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3Rr LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDYgQXBwbGUgQ29tcHV0ZXIsIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMDYgTWljaGFlbCBFbW1lbCBtaWtlLmVtbWVsQGdtYWlsLmNvbQorICogQ29w eXJpZ2h0IChDKSAyMDExIFJlZCBIYXQsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0yOCw2ICsyOSw3IEBACiAj aW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50LmgiCiAjaW5j bHVkZSAiU2Nyb2xsYmFyLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKIAogI2luY2x1ZGUgPGdk ay9nZGsuaD4KIApAQCAtNjgsOSArNzAsOSBAQCBQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3Jt V2hlZWxFdmVudChHCiAgICAgbV9hbHRLZXkgPSBldmVudC0+c3RhdGUgJiBHREtfTU9EMV9NQVNL OwogICAgIG1fbWV0YUtleSA9IGV2ZW50LT5zdGF0ZSAmIEdES19NRVRBX01BU0s7CiAKLSAgICAv LyBGSVhNRTogcmV0cmlldmUgdGhlIHVzZXIgc2V0dGluZyBmb3IgdGhlIG51bWJlciBvZiBsaW5l cyB0byBzY3JvbGwgb24gZWFjaCB3aGVlbCBldmVudAotICAgIG1fZGVsdGFYICo9IHN0YXRpY19j YXN0PGZsb2F0PihTY3JvbGxiYXI6OnBpeGVsc1BlckxpbmVTdGVwKCkpOwotICAgIG1fZGVsdGFZ ICo9IHN0YXRpY19jYXN0PGZsb2F0PihTY3JvbGxiYXI6OnBpeGVsc1BlckxpbmVTdGVwKCkpOwor ICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IFNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpOworICAg IG1fZGVsdGFYICo9IHNldHRpbmdzLT5zY3JvbGxQaXhlbENvdW50KCk7CisgICAgbV9kZWx0YVkg Kj0gc2V0dGluZ3MtPnNjcm9sbFBpeGVsQ291bnQoKTsKIH0KIAogfQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbFZpZXdHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNwcAkocmV2aXNpb24gODU3MjUp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMsNiArMyw3IEBACiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYgTWljaGFlbCBF bW1lbCBtaWtlLmVtbWVsQGdtYWlsLmNvbQogICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA5IEhv bGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMTAgQ29s bGFib3JhIEx0ZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSwgUmVkIEhhdCwgSW5jLiBBbGwgcmln aHQgcmVzZXJ2ZWQuCiAgKgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCkBAIC00NCw2ICs0 NSw3IEBACiAjaW5jbHVkZSAiUGxhdGZvcm1Nb3VzZUV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhdGZv cm1XaGVlbEV2ZW50LmgiCiAjaW5jbHVkZSAiU2Nyb2xsYmFyVGhlbWUuaCIKKyNpbmNsdWRlICJT ZXR0aW5ncy5oIgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsK QEAgLTExMSw3ICsxMTMsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OnNldEhvcml6b250YWxBZGp1c3Rt ZW50CiAgICAgZ3RrX2FkanVzdG1lbnRfY29uZmlndXJlKG1faG9yaXpvbnRhbEFkanVzdG1lbnQu Z2V0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc2V0VmFsdWVzID8gMCA6IHNj cm9sbE9mZnNldCgpLndpZHRoKCksIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJl c2V0VmFsdWVzID8gMCA6IGNvbnRlbnRzU2l6ZSgpLndpZHRoKCksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHJlc2V0VmFsdWVzID8gMCA6IFNjcm9sbGJhcjo6cGl4ZWxzUGVyTGluZVN0 ZXAoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogU2V0 dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNjcm9sbFBpeGVsQ291bnQoKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogaG9yaXpvbnRhbFBhZ2VTdGVwLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNldFZhbHVlcyA/IDAgOiBmcmFtZVJlY3Qo KS53aWR0aCgpKTsKIH0KQEAgLTE1MCw3ICsxNTIsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OnNldFZl cnRpY2FsQWRqdXN0bWVudChHCiAgICAgZ3RrX2FkanVzdG1lbnRfY29uZmlndXJlKG1fdmVydGlj YWxBZGp1c3RtZW50LmdldCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNldFZh bHVlcyA/IDAgOiBzY3JvbGxPZmZzZXQoKS5oZWlnaHQoKSwgMCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogY29udGVudHNTaXplKCkuaGVpZ2h0KCksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc2V0VmFsdWVzID8gMCA6IFNjcm9sbGJhcjo6 cGl4ZWxzUGVyTGluZVN0ZXAoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRW YWx1ZXMgPyAwIDogU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNjcm9sbFBpeGVsQ291bnQo KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogdmVydGlj YWxQYWdlU3RlcCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAw IDogZnJhbWVSZWN0KCkuaGVpZ2h0KCkpOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gODU3 MjUpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwyMCBAQAorMjAxMS0wNS0wNSAgUGV0ZXIgSGF0aW5hICA8cGhhdGluYUByZWRoYXQuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBpeGVsIGNv dW50IHVzZWQgZm9yIHNjcm9sbCBldmVudCBhZGRlZCBpbnRvIHRoZSBwYWdlIHNldHRpbmdzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ4MjYKKwor ICAgICAgICBHbG9iYWwgc2V0dGluZ3Mgb2JqZWN0IGNhbiBiZSBhY2Nlc3NlZCB0aHJvdWdoIHN0 YXRpcyBTZXR0aW5ncyogU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCksCisgICAgICAgIHdoaWNo IGFsc28gaG9sZHMgYSB2YWx1ZSBmb3IgdGhlIG51bWJlciBvZiBwaXhlbHMgdG8gc2Nyb2xsLCB3 aGVuIGEgc2Nyb2xsIGV2ZW50IG9jY3Vycy4KKyAgICAgICAgQXMgd2VsbCBhcyB0aGUgU2V0dGlu Z3MgY2xhc3MgZG9lcyBub3QgaG9sZCBwbGF0Zm9ybSBzcGVjaWZpYyB2YWx1ZXMsIHRoZXJlIGNh biBsaXZlCisgICAgICAgIG9uZSBnbG9iYWwgb2JqZWN0LCB3aGljaCBpcyBub3QgcmVsYXRlZCB0 byBhbnkgUGFnZS4KKworICAgICAgICAqIFNoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KToK KyAgICAgICAgV2hlbiBjcmVhdGluZyBXZWJXaGVlbEV2ZW50LCB0aGUgZ2xvYmFsIFNldHRpbmdz IG9iamVjdCBpcyB1c2VkIHRvIGRldGVybWluZSBzY3JvbAorICAgICAgICBwaXhlbCBjb3VudC4K KwogMjAxMS0wNS0wMyAgUHJhdGlrIFNvbGFua2kgIDxwc29sYW5raUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCShyZXZpc2lvbiA4NTcyNSkKKysrIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMiw2ICsyLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTAgTW90b3JvbGEg TW9iaWxpdHksIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MTEgSWdhbGlhIFMuTC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBSZWQgSGF0LCBJbmMuIEFsbCBy aWdodCByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzAsNyAr MzEsNyBAQAogCiAjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUgIlBsYXRmb3Jt S2V5Ym9hcmRFdmVudC5oIgotI2luY2x1ZGUgIlNjcm9sbGJhci5oIgorI2luY2x1ZGUgIlNldHRp bmdzLmgiCiAjaW5jbHVkZSAiV2luZG93c0tleWJvYXJkQ29kZXMuaCIKICNpbmNsdWRlIDxnZGsv Z2RrLmg+CiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMuaD4KQEAgLTE1Niw5ICsxNTcsNyBAQCBX ZWJXaGVlbEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViCiAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBbR1RLXSBBZGQgYSBzZXR0aW5n IHRvIGNoYW5nZSB0aGUgcGl4ZWxzIHBlciBsaW5lIHVzZWQgZm9yIHNjcm9sbGluZwotICAgIC8v IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDgyNgotICAgIGZsb2F0 IHN0ZXAgPSBzdGF0aWNfY2FzdDxmbG9hdD4oU2Nyb2xsYmFyOjpwaXhlbHNQZXJMaW5lU3RlcCgp KTsKKyAgICBmbG9hdCBzdGVwID0gU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNjcm9sbFBp eGVsQ291bnQoKTsKICAgICBGbG9hdFNpemUgZGVsdGEod2hlZWxUaWNrcy53aWR0aCgpICogc3Rl cCwgd2hlZWxUaWNrcy5oZWlnaHQoKSAqIHN0ZXApOwogCiAgICAgcmV0dXJuIFdlYldoZWVsRXZl bnQoV2ViRXZlbnQ6OldoZWVsLAo=