108311 2013-01-30 01:38:07 -0800 [chromium] Add WebFrame::visibleContentRect() 2013-01-30 17:41:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 trchen webkit-unassigned abarth dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 819951 0 trchen 2013-01-30 01:38:07 -0800 [chromium] Add convenience functions for geometry query 819953 1 185435 trchen 2013-01-30 01:40:14 -0800 Created attachment 185435 Patch 819956 2 webkit.review.bot 2013-01-30 01:42:20 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 820351 3 abarth 2013-01-30 11:26:52 -0800 @jamesr: Would you be willing to review this patch? 820498 4 185435 jamesr 2013-01-30 13:40:23 -0800 Comment on attachment 185435 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185435&action=review > Source/WebKit/chromium/public/WebFrame.h:172 > + // Returns the visible content rect (minus scrollbars, in absolute coordinate) blank line before new functions how does this interact with contentsSize() + scrollOffset() ? > Source/WebKit/chromium/src/WebViewImpl.cpp:4378 > + physicalWindowRect.scale(deviceScaleFactor() * pageScaleFactor()); I don't understand this function. device and page scale factors are exposed through the WebKit API, why do we need another WebKit API entry point just to multiply them together? 820516 5 trchen 2013-01-30 14:03:26 -0800 (In reply to comment #4) > (From update of attachment 185435 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=185435&action=review > > > Source/WebKit/chromium/public/WebFrame.h:172 > > + // Returns the visible content rect (minus scrollbars, in absolute coordinate) > > blank line before new functions > > how does this interact with contentsSize() + scrollOffset() ? Nothing to do with contentsSize. It is the current visible area of the frame, in absolute coordinate. In current implementation it would be the same value as IntRect(scrollOffset, ceil(webView()->size() / pageScaleFactor)) > > Source/WebKit/chromium/src/WebViewImpl.cpp:4378 > > + physicalWindowRect.scale(deviceScaleFactor() * pageScaleFactor()); > > I don't understand this function. device and page scale factors are exposed through the WebKit API, why do we need another WebKit API entry point just to multiply them together? Because it is much less error-prone and easier to understand this way. Saying "foo = bar * deviceScaleFactor * pageScaleFactor;" can be understood by the compiler, but doesn't really translate well to English. While saying "foo = WebViewImpl->physicalWindowFromClient(bar);" even your grandmother can understand what are you trying to do here. Consider the more complex case, what if we need to convert between absolute and client coordinates? Inner and outer viewport coordinates? Should we add or substract the offset? Translate before scale or after? Doing this all the times kills lots of brain cells. 820741 6 185607 trchen 2013-01-30 16:01:31 -0800 Created attachment 185607 Patch 820744 7 trchen 2013-01-30 16:03:00 -0800 Per offline discussion, we decided not to over-grow WebView API with bunch of conversion functions, but there is probably no alternative for WebFrame::visibleContentRect(). 820876 8 185607 webkit.review.bot 2013-01-30 17:41:10 -0800 Comment on attachment 185607 Patch Clearing flags on attachment: 185607 Committed r141352: <http://trac.webkit.org/changeset/141352> 820877 9 webkit.review.bot 2013-01-30 17:41:14 -0800 All reviewed patches have been landed. Closing bug. 185435 2013-01-30 01:40:14 -0800 2013-01-30 16:01:28 -0800 Patch bug-108311-20130130013700.patch text/plain 5840 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDA1NDlhOWNlZTU3Y2JhNTllNTdlYTU5YzFmZmU1YzJlMTYyZTg3ODUuLmYwZjAyYzgyMmNiNmRj ZWQ1NjEwZDRjNzFhZDg4NzE3NmRhZjBjZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjggQEAKKzIwMTMtMDEtMzAgIFRpZW4tUmVuIENoZW4gIDx0cmNoZW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGNvbnZlbmllbmNlIGZ1bmN0aW9ucyBm b3IgZ2VvbWV0cnkgcXVlcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwODMxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGVkIFdlYkZyYW1lIGZ1bmN0aW9uIHRvIHF1ZXJ5IHZpc2libGUgY29udGVu dCByZWN0IGZyb20gRnJhbWVWaWV3LgorICAgICAgICBBZGRlZCBXZWJWaWV3IGZ1bmN0aW9uIHRv IGNvbnZlcnQgYmV0d2VlbiBjbGllbnQgY29vcmRpbmF0ZXMgYW5kCisgICAgICAgIHBoeXNpY2Fs IHdpbmRvdyBjb29yZGluYXRlcy4KKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZS5oOgorICAg ICAgICAqIHB1YmxpYy9XZWJWaWV3Lmg6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2Vi Vmlldyk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkZyYW1lSW1wbDo6dmlzaWJsZUNvbnRlbnRSZWN0KToKKyAgICAgICAgKFdlYktpdCk6Cisg ICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorICAgICAgICAoV2ViRnJhbWVJbXBsKToKKyAg ICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1w bDo6cGh5c2ljYWxXaW5kb3dSZWN0RnJvbUNsaWVudFJlY3QpOgorICAgICAgICAoV2ViS2l0KToK KyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMy0wMS0yOSAgQWxwaGEgTGFtICA8 aGNsYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gVW5yZXZpZXdlZCBERVBT IHJvbGwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFt ZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAppbmRleCA3OWM2 YjFkYzFiMGY4YzQzNzc4YTkzY2FhNWFjNjVmYTdmZmIxMDZkLi4zN2JkMTA0OTU5ZmQxZWJmZjky ZTUyOTY2NzA5ZmI0Y2Q2YmMxMjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJGcmFtZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YkZyYW1lLmgKQEAgLTE2OSw2ICsxNjksOCBAQCBwdWJsaWM6CiAKICAgICAvLyBSZXR1cm5zIHRy dWUgaWYgdGhlIGNvbnRlbnRzIChtaW51cyBzY3JvbGxiYXJzKSBoYXMgbm9uLXplcm8gYXJlYS4K ICAgICB2aXJ0dWFsIGJvb2wgaGFzVmlzaWJsZUNvbnRlbnQoKSBjb25zdCA9IDA7CisgICAgLy8g UmV0dXJucyB0aGUgdmlzaWJsZSBjb250ZW50IHJlY3QgKG1pbnVzIHNjcm9sbGJhcnMsIGluIGFi c29sdXRlIGNvb3JkaW5hdGUpCisgICAgdmlydHVhbCBXZWJSZWN0IHZpc2libGVDb250ZW50UmVj dCgpIGNvbnN0ID0gMDsKIAogICAgIHZpcnR1YWwgYm9vbCBoYXNIb3Jpem9udGFsU2Nyb2xsYmFy KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBoYXNWZXJ0aWNhbFNjcm9sbGJhcigpIGNv bnN0ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZp ZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCBkYzEw YmY1Y2JhN2FmYmViNTgwNWVhNDA4MGVlYTg5ODhjMDllN2UzLi4zMDhhNjM5ZTE2MmE2NjY3NTk2 MzZjZDAwYTBiNjk3YzNhN2M2YmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Vmlldy5oCkBAIC00NSw2ICs0NSw3IEBAIGNsYXNzIFdlYkJhdHRlcnlTdGF0dXM7CiBjbGFzcyBX ZWJEZXZUb29sc0FnZW50OwogY2xhc3MgV2ViRGV2VG9vbHNBZ2VudENsaWVudDsKIGNsYXNzIFdl YkRyYWdEYXRhOworY2xhc3MgV2ViRmxvYXRSZWN0OwogY2xhc3MgV2ViRnJhbWU7CiBjbGFzcyBX ZWJGcmFtZUNsaWVudDsKIGNsYXNzIFdlYkdyYXBoaWNzQ29udGV4dDNEOwpAQCAtNTA0LDYgKzUw NSw5IEBAIHB1YmxpYzoKICAgICAvLyBsZXZlbCBpcyBjaGFuZ2VkIGluIHRoaXMgdXBkYXRlIGZy b20gdGhlIHByZXZpb3VzIHVwZGF0ZSkuCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUJhdHRlcnlT dGF0dXMoY29uc3QgV2ViQmF0dGVyeVN0YXR1cyYpIHsgfQogCisgICAgLy8gQ29vcmRpbmF0ZSBj b252ZXJzaW9uCisgICAgdmlydHVhbCBXZWJGbG9hdFJlY3QgcGh5c2ljYWxXaW5kb3dSZWN0RnJv bUNsaWVudFJlY3QoY29uc3QgV2ViRmxvYXRSZWN0JiBjbGllbnRSZWN0KSA9IDA7CisKICAgICAv LyBUZXN0aW5nIGZ1bmN0aW9uYWxpdHkgZm9yIFRlc3RSdW5uZXIgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAKIHByb3RlY3RlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IDYwYzJlMGY0NjI3ODI3YmMxOGQ5ZTY2ZThmYWM0ZWMx NzhkNGQzN2UuLjA2ZDUzMDAyODA3YzNhZjliM2RjOTkzMjI3MTdiZjE3YTAyM2M0NzYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtNjQ1LDYgKzY0 NSwxMSBAQCBib29sIFdlYkZyYW1lSW1wbDo6aGFzVmlzaWJsZUNvbnRlbnQoKSBjb25zdAogICAg IHJldHVybiBmcmFtZSgpLT52aWV3KCktPnZpc2libGVXaWR0aCgpID4gMCAmJiBmcmFtZSgpLT52 aWV3KCktPnZpc2libGVIZWlnaHQoKSA+IDA7CiB9CiAKK1dlYlJlY3QgV2ViRnJhbWVJbXBsOjp2 aXNpYmxlQ29udGVudFJlY3QoKSBjb25zdAoreworICAgIHJldHVybiBmcmFtZSgpLT52aWV3KCkt PnZpc2libGVDb250ZW50UmVjdCgpOworfQorCiBib29sIFdlYkZyYW1lSW1wbDo6aGFzSG9yaXpv bnRhbFNjcm9sbGJhcigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGZyYW1lKCkgJiYgZnJhbWUoKS0+ dmlldygpICYmIGZyYW1lKCktPnZpZXcoKS0+aG9yaXpvbnRhbFNjcm9sbGJhcigpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmggYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAppbmRleCAwNDU0NWFhOWE5ZjlhMzg5 MDJjMmFkNGVkODMxMjQxYzRkNmVlODIzLi5hZDFmMDUzNGRkYmMwYzQ3M2Q5OGNlMjU0MTI2Y2I3 MjNmMjI2N2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFt ZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaApA QCAtODksNiArODksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBpbnQgY29udGVudHNQcmVmZXJy ZWRXaWR0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50IGRvY3VtZW50RWxlbWVudFNjcm9sbEhl aWdodCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBoYXNWaXNpYmxlQ29udGVudCgpIGNvbnN0 OworICAgIHZpcnR1YWwgV2ViUmVjdCB2aXNpYmxlQ29udGVudFJlY3QoKSBjb25zdDsKICAgICB2 aXJ0dWFsIGJvb2wgaGFzSG9yaXpvbnRhbFNjcm9sbGJhcigpIGNvbnN0OwogICAgIHZpcnR1YWwg Ym9vbCBoYXNWZXJ0aWNhbFNjcm9sbGJhcigpIGNvbnN0OwogICAgIHZpcnR1YWwgV2ViVmlldyog dmlldygpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CmluZGV4IGMzNTE3ZDFjZGUzZTZjMjYwM2FlOTRkMTQ2YjY1Y2M0MDY4N2E4YTMuLjNkMGMxMDU2 YWFmMGE1MmEwZDRhNDEyOWFkMTVmOWYyZmZhYTM2NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE1MCw2ICsxNTAsNyBAQAogI2luY2x1ZGUgPHB1 YmxpYy9XZWJDb21wb3NpdG9yU3VwcG9ydC5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJEcmFnRGF0 YS5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJGbG9hdFBvaW50Lmg+CisjaW5jbHVkZSA8cHVibGlj L1dlYkZsb2F0UmVjdC5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5o PgogI2luY2x1ZGUgPHB1YmxpYy9XZWJJbWFnZS5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJMYXll ci5oPgpAQCAtNDM3MSw0ICs0MzcyLDExIEBAIGJvb2wgV2ViVmlld0ltcGw6OnNob3VsZERpc2Fi bGVEZXNrdG9wV29ya2Fyb3VuZHMoKQogICAgICAgICB8fCAoYXJndW1lbnRzLm1pblpvb20gPT0g YXJndW1lbnRzLm1heFpvb20gJiYgYXJndW1lbnRzLm1pblpvb20gIT0gVmlld3BvcnRBcmd1bWVu dHM6OlZhbHVlQXV0byk7CiB9CiAKK1dlYkZsb2F0UmVjdCBXZWJWaWV3SW1wbDo6cGh5c2ljYWxX aW5kb3dSZWN0RnJvbUNsaWVudFJlY3QoY29uc3QgV2ViRmxvYXRSZWN0JiBjbGllbnRSZWN0KQor eworICAgIEZsb2F0UmVjdCBwaHlzaWNhbFdpbmRvd1JlY3QgPSBjbGllbnRSZWN0OworICAgIHBo eXNpY2FsV2luZG93UmVjdC5zY2FsZShkZXZpY2VTY2FsZUZhY3RvcigpICogcGFnZVNjYWxlRmFj dG9yKCkpOworICAgIHJldHVybiBwaHlzaWNhbFdpbmRvd1JlY3Q7Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXgg ZTdjZTBlN2E3YjY5MzEzNzVmMzVkMDc5Mjc4NDQ0MmE5MmIxYzM1OS4uYjUwYmJhY2RlYjkyOTM3 NGExYThmMTlkYTkyZWM1MTQ2MmZlMjI1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5oCkBAIC0zMTAsNiArMzEwLDcgQEAgcHVibGljOgogI2lmIEVOQUJMRShCQVRU RVJZX1NUQVRVUykKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQmF0dGVyeVN0YXR1cyhjb25zdCBX ZWJCYXR0ZXJ5U3RhdHVzJik7CiAjZW5kaWYKKyAgICB2aXJ0dWFsIFdlYkZsb2F0UmVjdCBwaHlz aWNhbFdpbmRvd1JlY3RGcm9tQ2xpZW50UmVjdChjb25zdCBXZWJGbG9hdFJlY3QmIGNsaWVudFJl Y3QpOwogICAgIHZpcnR1YWwgdm9pZCB0cmFuc2ZlckFjdGl2ZVdoZWVsRmxpbmdBbmltYXRpb24o Y29uc3QgV2ViQWN0aXZlV2hlZWxGbGluZ1BhcmFtZXRlcnMmKTsKICAgICB2aXJ0dWFsIFdlYlZp ZXdCZW5jaG1hcmtTdXBwb3J0KiBiZW5jaG1hcmtTdXBwb3J0KCk7CiAgICAgdmlydHVhbCB2b2lk IHNldFNob3dQYWludFJlY3RzKGJvb2wpOwo= 185607 2013-01-30 16:01:31 -0800 2013-01-30 17:41:09 -0800 Patch bug-108311-20130130155816.patch text/plain 2831 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDFmZjUzYWJhODc3MzYwOGFlZmY5ZGFiYjkwMzc4ZjFjNTk5OTk5MmIuLjgyMjNlZGE2Zjk4ZDA5 NmIyZmM5ZDYxYzMxYmFmOTIyMzAyZDE0ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTMtMDEtMzAgIFRpZW4tUmVuIENoZW4gIDx0cmNoZW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIFdlYkZyYW1lOjp2aXNpYmxlQ29udGVu dFJlY3QoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA4MzExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjp2aXNpYmxlQ29udGVudFJlY3QpOgorICAgICAg ICAoV2ViS2l0KToKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmg6CisgICAgICAgIChXZWJG cmFtZUltcGwpOgorCiAyMDEzLTAxLTMwICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBJbXBsZW1lbnQgV2hlZWxFdmVudCBjb25zdHJ1Y3RvcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKaW5kZXggNzljNmIxZGMxYjBmOGM0Mzc3 OGE5M2NhYTVhYzY1ZmE3ZmZiMTA2ZC4uN2Q5MjMwNzFlNjk5ZTBhMzMyZTNlOWVkNTUyOTgyMDA3 N2NkYTZiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJh bWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCkBAIC0x NzAsNiArMTcwLDkgQEAgcHVibGljOgogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgY29udGVu dHMgKG1pbnVzIHNjcm9sbGJhcnMpIGhhcyBub24temVybyBhcmVhLgogICAgIHZpcnR1YWwgYm9v bCBoYXNWaXNpYmxlQ29udGVudCgpIGNvbnN0ID0gMDsKIAorICAgIC8vIFJldHVybnMgdGhlIHZp c2libGUgY29udGVudCByZWN0IChtaW51cyBzY3JvbGxiYXJzLCBpbiBhYnNvbHV0ZSBjb29yZGlu YXRlKQorICAgIHZpcnR1YWwgV2ViUmVjdCB2aXNpYmxlQ29udGVudFJlY3QoKSBjb25zdCA9IDA7 CisKICAgICB2aXJ0dWFsIGJvb2wgaGFzSG9yaXpvbnRhbFNjcm9sbGJhcigpIGNvbnN0ID0gMDsK ICAgICB2aXJ0dWFsIGJvb2wgaGFzVmVydGljYWxTY3JvbGxiYXIoKSBjb25zdCA9IDA7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IDViYWYwOGVj Mjc3ZGZmMWRkYmQwZjVlYTJlMTRlZGJiYjc2N2U2NGMuLjc1ZDNhYzk2ODhlYTNkYmU2MmY0YmRm MmExOTcxNzdiMDJkNGFlMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJh bWVJbXBsLmNwcApAQCAtNjQ1LDYgKzY0NSwxMSBAQCBib29sIFdlYkZyYW1lSW1wbDo6aGFzVmlz aWJsZUNvbnRlbnQoKSBjb25zdAogICAgIHJldHVybiBmcmFtZSgpLT52aWV3KCktPnZpc2libGVX aWR0aCgpID4gMCAmJiBmcmFtZSgpLT52aWV3KCktPnZpc2libGVIZWlnaHQoKSA+IDA7CiB9CiAK K1dlYlJlY3QgV2ViRnJhbWVJbXBsOjp2aXNpYmxlQ29udGVudFJlY3QoKSBjb25zdAoreworICAg IHJldHVybiBmcmFtZSgpLT52aWV3KCktPnZpc2libGVDb250ZW50UmVjdCgpOworfQorCiBib29s IFdlYkZyYW1lSW1wbDo6aGFzSG9yaXpvbnRhbFNjcm9sbGJhcigpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIGZyYW1lKCkgJiYgZnJhbWUoKS0+dmlldygpICYmIGZyYW1lKCktPnZpZXcoKS0+aG9yaXpv bnRhbFNjcm9sbGJhcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViRnJhbWVJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu aAppbmRleCAwNDU0NWFhOWE5ZjlhMzg5MDJjMmFkNGVkODMxMjQxYzRkNmVlODIzLi5hZDFmMDUz NGRkYmMwYzQ3M2Q5OGNlMjU0MTI2Y2I3MjNmMjI2N2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGcmFtZUltcGwuaApAQCAtODksNiArODksNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCBpbnQgY29udGVudHNQcmVmZXJyZWRXaWR0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50 IGRvY3VtZW50RWxlbWVudFNjcm9sbEhlaWdodCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBo YXNWaXNpYmxlQ29udGVudCgpIGNvbnN0OworICAgIHZpcnR1YWwgV2ViUmVjdCB2aXNpYmxlQ29u dGVudFJlY3QoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaGFzSG9yaXpvbnRhbFNjcm9sbGJh cigpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBoYXNWZXJ0aWNhbFNjcm9sbGJhcigpIGNvbnN0 OwogICAgIHZpcnR1YWwgV2ViVmlldyogdmlldygpIGNvbnN0Owo=