103090 2012-11-22 13:57:51 -0800 [WK2] TiledBackingStore: page contents is scaled wrongly 2012-11-26 13:19:18 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 102922 1 mikhail.pozdnyakov mikhail.pozdnyakov abecsi kenneth laszlo.gombos ostap73 tmpsantos webkit.review.bot oldest_to_newest 774094 0 mikhail.pozdnyakov 2012-11-22 13:57:51 -0800 Currently the page scaling is defined by m_rawAttributes.initialScale in PageViewportController. If initial scale was not specified in the viewport meta tag it's set to m_minimumScaleToFit in PageViewportController::didChangeViewportAttributes(). Problem is that m_minimumScaleToFit can have wrong value as contents size might not be updated at the time PageViewportController::didChangeViewportAttributes() is invoked. Here is steps to reproduce wrong scaling: 1) open http://people.opera.com/andreasb/viewport/ex01.html 2) go to any site w/o viewport meta tag (for example google.com) 3) you will see it :) 774096 1 175710 mikhail.pozdnyakov 2012-11-22 14:13:40 -0800 Created attachment 175710 patch 774115 2 175710 kenneth 2012-11-22 15:13:06 -0800 Comment on attachment 175710 patch View in context: https://bugs.webkit.org/attachment.cgi?id=175710&action=review > Source/WebKit2/ChangeLog:16 > + > + Before this change the page contents scaling in PageViewportController was defined all the times > + by m_rawAttributes.initialScale. If initial scale had not been specified in the viewport meta tag > + it was set to m_minimumScaleToFit inside PageViewportController::didChangeViewportAttributes(). > + The problem was that m_minimumScaleToFit could have wrong value as contents size might have not be updated > + at the time PageViewportController::didChangeViewportAttributes() was invoked. > + The solution is to use m_minimumScaleToFit for contents scaling if initial scale is not specified in the viewport meta tag, > + as it is updated all the time. Also a flag m_initiallyFitToViewport is added to PageViewportController > + to detect whether m_minimumScaleToFit should be used for scaling. > + Could you use shorter lines, some newlines etc to make this easier to read? Also doesn't this affect css @viewport as well? Why don't we add a test? > Source/WebKit2/UIProcess/PageViewportController.cpp:111 > -{ > +{ That seems wrong 774971 3 175881 mikhail.pozdnyakov 2012-11-25 04:59:44 -0800 Created attachment 175881 patch v2 Took Kenneth feedback into consideration. Added test. 774976 4 175881 kenneth 2012-11-25 06:53:31 -0800 Comment on attachment 175881 patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=175881&action=review > LayoutTests/ChangeLog:13 > + * css3/device-adapt/resources/check-contents-width.html: Added. > + * css3/device-adapt/viewport-width-not-affecting-next-page-expected.txt: Added. > + * css3/device-adapt/viewport-width-not-affecting-next-page.html: Added. Great, now it would be good with tests for "fit to width" as well, especially pages setting a size, say width 980 and they grows beyond that. 775005 5 175881 webkit.review.bot 2012-11-25 10:30:59 -0800 Comment on attachment 175881 patch v2 Clearing flags on attachment: 175881 Committed r135669: <http://trac.webkit.org/changeset/135669> 775006 6 webkit.review.bot 2012-11-25 10:31:03 -0800 All reviewed patches have been landed. Closing bug. 775277 7 tmpsantos 2012-11-26 02:17:08 -0800 Funny that after this patch, css3/device-adapt/opera/constrain-006.xhtml and css3/device-adapt/opera/constrain-007.xhtml stopped passing. 775297 8 mikhail.pozdnyakov 2012-11-26 02:50:57 -0800 (In reply to comment #7) > Funny that after this patch, > > css3/device-adapt/opera/constrain-006.xhtml > > and > > css3/device-adapt/opera/constrain-007.xhtml > > stopped passing. Thanks for noticing! will take a look. 775755 9 tmpsantos 2012-11-26 12:08:06 -0800 (In reply to comment #8) > (In reply to comment #7) > > Funny that after this patch, > > > > css3/device-adapt/opera/constrain-006.xhtml > > > > and > > > > css3/device-adapt/opera/constrain-007.xhtml > > > > stopped passing. > > Thanks for noticing! will take a look. The patch bellow makes them flaky (but it is obviously not a fix): --- a/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp +++ b/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp @@ -59,7 +59,7 @@ PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, if (m_usingFixedLayout) { m_view = toImpl(WKViewCreateWithFixedLayout(evas, context, pageGroup)); - evas_object_resize(m_view, 800, 600); + evas_object_resize(m_view, 980, 600); } else m_view = toImpl(WKViewCreate(evas, context, pageGroup)); 775809 10 mikhail.pozdnyakov 2012-11-26 13:11:37 -0800 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > Funny that after this patch, > > > > > > css3/device-adapt/opera/constrain-006.xhtml > > > > > > and > > > > > > css3/device-adapt/opera/constrain-007.xhtml > > > > > > stopped passing. > > > > Thanks for noticing! will take a look. > > The patch bellow makes them flaky (but it is obviously not a fix): > > --- a/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp > +++ b/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp > @@ -59,7 +59,7 @@ PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, > > if (m_usingFixedLayout) { > m_view = toImpl(WKViewCreateWithFixedLayout(evas, context, pageGroup)); > - evas_object_resize(m_view, 800, 600); > + evas_object_resize(m_view, 980, 600); > } else > m_view = toImpl(WKViewCreate(evas, context, pageGroup)); nope, it shouldn't be a fix. Looks like we have same raise condition caused by IPC I've faced already making tests for this bug, note that given test works fine with mini browser. 175710 2012-11-22 14:13:40 -0800 2012-11-25 04:59:44 -0800 patch bug103090 text/plain 5265 mikhail.pozdnyakov Y29tbWl0IDMwOTJmNDU4NTgwOGY2YWRmZjIwYjFkZjA5MjMzNGViZDQ2ZWIwMmYKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg RnJpIE5vdiAyMyAwMDowOToxNyAyMDEyICswMjAwCgogICAgYnVnMTAzMDkwCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IGRkYTVjMDkuLjJjYzZlYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0x MS0yMiAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXSBUaWxlZEJhY2tpbmdTdG9yZTogcGFnZSBjb250ZW50cyBpcyBzY2Fs ZWQgd3JvbmdseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTAzMDkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQmVmb3JlIHRoaXMgY2hhbmdlIHRoZSBwYWdlIGNvbnRlbnRzIHNjYWxpbmcgaW4gUGFnZVZp ZXdwb3J0Q29udHJvbGxlciB3YXMgZGVmaW5lZCBhbGwgdGhlIHRpbWVzCisgICAgICAgIGJ5IG1f cmF3QXR0cmlidXRlcy5pbml0aWFsU2NhbGUuIElmIGluaXRpYWwgc2NhbGUgaGFkIG5vdCBiZWVu IHNwZWNpZmllZCBpbiB0aGUgdmlld3BvcnQgbWV0YSB0YWcKKyAgICAgICAgaXQgd2FzIHNldCB0 byBtX21pbmltdW1TY2FsZVRvRml0IGluc2lkZSBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRD aGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKS4KKyAgICAgICAgVGhlIHByb2JsZW0gd2FzIHRoYXQg bV9taW5pbXVtU2NhbGVUb0ZpdCBjb3VsZCBoYXZlIHdyb25nIHZhbHVlIGFzIGNvbnRlbnRzIHNp emUgbWlnaHQgaGF2ZSBub3QgYmUgdXBkYXRlZAorICAgICAgICBhdCB0aGUgdGltZSBQYWdlVmll d3BvcnRDb250cm9sbGVyOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKSB3YXMgaW52b2tl ZC4KKyAgICAgICAgVGhlIHNvbHV0aW9uIGlzIHRvIHVzZSBtX21pbmltdW1TY2FsZVRvRml0IGZv ciBjb250ZW50cyBzY2FsaW5nIGlmIGluaXRpYWwgc2NhbGUgaXMgbm90IHNwZWNpZmllZCBpbiB0 aGUgdmlld3BvcnQgbWV0YSB0YWcsCisgICAgICAgIGFzIGl0IGlzIHVwZGF0ZWQgYWxsIHRoZSB0 aW1lLiBBbHNvIGEgZmxhZyBtX2luaXRpYWxseUZpdFRvVmlld3BvcnQgaXMgYWRkZWQgdG8gUGFn ZVZpZXdwb3J0Q29udHJvbGxlcgorICAgICAgICB0byBkZXRlY3Qgd2hldGhlciBtX21pbmltdW1T Y2FsZVRvRml0IHNob3VsZCBiZSB1c2VkIGZvciBzY2FsaW5nLgorCisgICAgICAgICogVUlQcm9j ZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmll d3BvcnRDb250cm9sbGVyOjpQYWdlVmlld3BvcnRDb250cm9sbGVyKToKKyAgICAgICAgKFdlYktp dDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAgICAg ICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6cGFnZVRyYW5zaXRpb25WaWV3cG9y dFJlYWR5KToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hh bmdlVmlld3BvcnRBdHRyaWJ1dGVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZVZpZXdwb3J0 Q29udHJvbGxlci5oOgorICAgICAgICAoUGFnZVZpZXdwb3J0Q29udHJvbGxlcik6CisKIDIwMTIt MTEtMjIgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5AZGlnaWEuY29tPiwgUGllcnJl IFJvc3NpIDxwaWVycmUucm9zc2lAZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF0gU2VwYXJhdGUg UVdpZGdldCBkZXBlbmRhbnQgY29kZSBpbnRvIHNlcGFyYXRlIFdlYktpdFdpZGdldHMgc3RhdGlj IGxpYnJhcnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3Bv cnRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRD b250cm9sbGVyLmNwcAppbmRleCA1ZGU3OTE5Li40MDFhMzE5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCkBAIC00NCw2ICs0 NCw3IEBAIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoV2Vi S2l0OjpXZWJQYWdlUHJveHkqIHByb3h5LCBQYWdlCiAgICAgLCBtX2NsaWVudChjbGllbnQpCiAg ICAgLCBtX2FsbG93c1VzZXJTY2FsaW5nKGZhbHNlKQogICAgICwgbV9taW5pbXVtU2NhbGVUb0Zp dCgxKQorICAgICwgbV9pbml0aWFsbHlGaXRUb1ZpZXdwb3J0KHRydWUpCiAgICAgLCBtX2hhc1N1 c3BlbmRlZENvbnRlbnQoZmFsc2UpCiAgICAgLCBtX2hhZFVzZXJJbnRlcmFjdGlvbihmYWxzZSkK ICAgICAsIG1fZWZmZWN0aXZlU2NhbGUoMSkKQEAgLTEwNyw5ICsxMDgsMTkgQEAgdm9pZCBQYWdl Vmlld3BvcnRDb250cm9sbGVyOjpkaWRDb21taXRMb2FkKCkKIH0KIAogdm9pZCBQYWdlVmlld3Bv cnRDb250cm9sbGVyOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgSW50U2l6ZSYgbmV3U2l6 ZSkKLXsKK3sgICAgCiAgICAgbV9jb250ZW50c1NpemUgPSBuZXdTaXplOwotICAgIGlmICh1cGRh dGVNaW5pbXVtU2NhbGVUb0ZpdCgpKQorCisgICAgYm9vbCBtaW5pbXVtU2NhbGVVcGRhdGVkID0g dXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKTsKKworICAgIGlmIChtX2luaXRpYWxseUZpdFRvVmll d3BvcnQpIHsKKyAgICAgICAgLy8gUmVzdHJpY3Qgc2NhbGUgZmFjdG9ycyB0byBtX21pbmltdW1T Y2FsZVRvRml0LgorICAgICAgICBBU1NFUlQobV9taW5pbXVtU2NhbGVUb0ZpdCA+IDApOworICAg ICAgICBtX3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlID0gbV9taW5pbXVtU2NhbGVUb0ZpdDsK KyAgICAgICAgV2ViQ29yZTo6cmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNjYWxlSWZOb3RV c2VyU2NhbGFibGUobV9yYXdBdHRyaWJ1dGVzKTsKKyAgICB9CisKKyAgICBpZiAobWluaW11bVNj YWxlVXBkYXRlZCkKICAgICAgICAgbV9jbGllbnQtPmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRl cygpOwogfQogCkBAIC0xNDksOCArMTYwLDggQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVy OjpwYWdlVHJhbnNpdGlvblZpZXdwb3J0UmVhZHkoKQogewogICAgIGlmICghbV9yYXdBdHRyaWJ1 dGVzLmxheW91dFNpemUuaXNFbXB0eSgpKSB7CiAgICAgICAgIG1faGFkVXNlckludGVyYWN0aW9u ID0gZmFsc2U7Ci0gICAgICAgIEFTU0VSVChtX3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlID4g MCk7Ci0gICAgICAgIGFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRzKGlubmVyQm91bmRl ZFZpZXdwb3J0U2NhbGUodG9WaWV3cG9ydFNjYWxlKG1fcmF3QXR0cmlidXRlcy5pbml0aWFsU2Nh bGUpKSk7CisgICAgICAgIGZsb2F0IGluaXRpYWxTY2FsZSA9IG1faW5pdGlhbGx5Rml0VG9WaWV3 cG9ydCA/IG1fbWluaW11bVNjYWxlVG9GaXQgOiBtX3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxl OworICAgICAgICBhcHBseVNjYWxlQWZ0ZXJSZW5kZXJpbmdDb250ZW50cyhpbm5lckJvdW5kZWRW aWV3cG9ydFNjYWxlKHRvVmlld3BvcnRTY2FsZShpbml0aWFsU2NhbGUpKSk7CiAgICAgfQogCiAg ICAgLy8gQXQgdGhpcyBwb2ludCB3ZSBzaG91bGQgYWxyZWFkeSBoYXZlIHJlY2VpdmVkIHRoZSBm aXJzdCB2aWV3cG9ydCBhcmd1bWVudHMgYW5kIHRoZSByZXF1ZXN0ZWQgc2Nyb2xsCkBAIC0yMTgs MTggKzIyOSwxMiBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZVZpZXdw b3J0QXR0cmlidXRlcyhjb25zdCBXZWJDb3JlOjpWaWV3cG9ydAogCiAgICAgbV9yYXdBdHRyaWJ1 dGVzID0gbmV3QXR0cmlidXRlczsKICAgICBtX2FsbG93c1VzZXJTY2FsaW5nID0gISFtX3Jhd0F0 dHJpYnV0ZXMudXNlclNjYWxhYmxlOworICAgIG1faW5pdGlhbGx5Rml0VG9WaWV3cG9ydCA9ICht X3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlIDwgMCk7CiAKLSAgICBib29sIG1pbmltdW1TY2Fs ZVVwZGF0ZWQgPSB1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCgpOwotCi0gICAgQVNTRVJUKG1fbWlu aW11bVNjYWxlVG9GaXQgPiAwKTsKLQotICAgIC8vIFNldCB0aGUgaW5pdGlhbCBzY2FsZSBpZiBp dCB3YXMgbm90IHNwZWNpZmllZCBpbiB0aGUgdmlld3BvcnQgbWV0YSB0YWcuCi0gICAgaWYgKG1f cmF3QXR0cmlidXRlcy5pbml0aWFsU2NhbGUgPCAwKQotICAgICAgICBtX3Jhd0F0dHJpYnV0ZXMu aW5pdGlhbFNjYWxlID0gbV9taW5pbXVtU2NhbGVUb0ZpdDsKLQotICAgIFdlYkNvcmU6OnJlc3Ry aWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKG1fcmF3QXR0cmli dXRlcyk7CisgICAgaWYgKCFtX2luaXRpYWxseUZpdFRvVmlld3BvcnQpCisgICAgICAgIFdlYkNv cmU6OnJlc3RyaWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKG1f cmF3QXR0cmlidXRlcyk7CiAKLSAgICBpZiAobWluaW11bVNjYWxlVXBkYXRlZCkKKyAgICBpZiAo dXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKSkKICAgICAgICAgbV9jbGllbnQtPmRpZENoYW5nZVZp ZXdwb3J0QXR0cmlidXRlcygpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaAppbmRleCAzYmUzZDI3Li4wNTJlODlhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmgKQEAg LTk0LDYgKzk0LDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9hbGxvd3NVc2VyU2NhbGluZzsK ICAgICBmbG9hdCBtX21pbmltdW1TY2FsZVRvRml0OworICAgIGJvb2wgbV9pbml0aWFsbHlGaXRU b1ZpZXdwb3J0OwogCiAgICAgYm9vbCBtX2hhc1N1c3BlbmRlZENvbnRlbnQ7CiAgICAgYm9vbCBt X2hhZFVzZXJJbnRlcmFjdGlvbjsK 175881 2012-11-25 04:59:44 -0800 2012-11-25 10:30:59 -0800 patch v2 bug103090_v2 text/plain 8425 mikhail.pozdnyakov Y29tbWl0IGFmZGYxMDAxYzI1MTZjNGY1NTdlNDE5ODcxMTU3NjVkNjljZjY1NGUKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg U3VuIE5vdiAyNSAxNDo1NTowMiAyMDEyICswMjAwCgogICAgYnVnMTAzMDkwCgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDYz ZmM2ZTcuLjY4YmIzZWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0xMS0yNSAgTWlraGFp bCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KKworICAgICAgICBb V0syXSBUaWxlZEJhY2tpbmdTdG9yZTogcGFnZSBjb250ZW50cyBpcyBzY2FsZWQgd3JvbmdseQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMDkwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbmV3 IGxheW91dCB0ZXN0IHRvIHZlcmlmeSB0aGF0IHZpZXdwb3J0ICd3aWR0aCcgZGVzY3JpcHRvciBk b2VzIG5vdAorICAgICAgICBhZmZlY3QgY29udGVudHMgd2lkdGggb2YgbmV4dCBsb2FkZWQgcGFn ZS4gCisKKyAgICAgICAgKiBjc3MzL2RldmljZS1hZGFwdC9yZXNvdXJjZXMvY2hlY2stY29udGVu dHMtd2lkdGguaHRtbDogQWRkZWQuCisgICAgICAgICogY3NzMy9kZXZpY2UtYWRhcHQvdmlld3Bv cnQtd2lkdGgtbm90LWFmZmVjdGluZy1uZXh0LXBhZ2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBjc3MzL2RldmljZS1hZGFwdC92aWV3cG9ydC13aWR0aC1ub3QtYWZmZWN0aW5nLW5l eHQtcGFnZS5odG1sOiBBZGRlZC4KKwogMjAxMi0xMS0yNCAgUm9iZXJ0IEtyb2VnZXIgIDxyamty b2VnZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmc6IHVwZGF0 ZWQgZXhwZWN0YXRpb25zIGZvciBmYWlsdXJlcyBpbjoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2NzczMvZGV2aWNlLWFkYXB0L3Jlc291cmNlcy9jaGVjay1jb250ZW50cy13aWR0aC5odG1sIGIv TGF5b3V0VGVzdHMvY3NzMy9kZXZpY2UtYWRhcHQvcmVzb3VyY2VzL2NoZWNrLWNvbnRlbnRzLXdp ZHRoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODhkMjUyNQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0L3Jlc291cmNlcy9j aGVjay1jb250ZW50cy13aWR0aC5odG1sCkBAIC0wLDAgKzEsMjMgQEAKKzwhRE9DVFlQRSBodG1s PgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgYm9keSB7IG1hcmdpbjogMDsg fQorICAgICAgIGh0bWwsIGJvZHksICNyZXN1bHQgeyB3aWR0aDogMTAwJTsgaGVpZ2h0OiAxMDAl OyB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+Cisg ICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICB2YXIgcmVzdWx0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdCIpOworICAgICAgICAgICAgcmVzdWx0Lmlu bmVySFRNTCA9IChyZXN1bHQub2Zmc2V0V2lkdGggPT0gd2luZG93LmlubmVyV2lkdGgpID8gIlBB U1MiIDogIkZBSUwiOworCisgICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAg ICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgIH0sIDIwMCk7IC8v IEhhdmUgdG8gdXNlIHRpbWVvdXQgYmVjYXVzZSBvZiByYWlzZSBjb25kaXRpb24gY2F1c2VkIGJ5 IFdLMiBJUEMuCisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPSJy ZXN1bHQiPgorICAgICAgICA8L3A+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2RldmljZS1hZGFwdC92aWV3cG9ydC13aWR0aC1ub3Qt YWZmZWN0aW5nLW5leHQtcGFnZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jc3MzL2Rldmlj ZS1hZGFwdC92aWV3cG9ydC13aWR0aC1ub3QtYWZmZWN0aW5nLW5leHQtcGFnZS1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2VmMjJlOQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLW5v dC1hZmZlY3RpbmctbmV4dC1wYWdlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQQVNTCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2RldmljZS1hZGFwdC92aWV3cG9ydC13aWR0aC1u b3QtYWZmZWN0aW5nLW5leHQtcGFnZS5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9kZXZpY2UtYWRh cHQvdmlld3BvcnQtd2lkdGgtbm90LWFmZmVjdGluZy1uZXh0LXBhZ2UuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MjgwMDFmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvY3NzMy9kZXZpY2UtYWRhcHQvdmlld3BvcnQtd2lkdGgtbm90LWFmZmVjdGluZy1u ZXh0LXBhZ2UuaHRtbApAQCAtMCwwICsxLDIzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGhlYWQ+CisgICAgPHRpdGxlPkNTUyBUZXN0OiB2aWV3cG9ydCAnd2lkdGgnIGRlc2NyaXB0b3Ig ZG9lcyBub3QgYWZmZWN0IGNvbnRlbnRzIHdpZHRoIG9mIG5leHQgbG9hZGVkIHBhZ2UuPC90aXRs ZT4KKyAgICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1pa2hhaWwgUG96ZG55YWtvdiIgaHJl Zj0ibWFpbHRvOm1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20iIC8+CisgICAgPHN0eWxlIHR5 cGU9InRleHQvY3NzIj4KKyAgICAgICAgQC13ZWJraXQtdmlld3BvcnQgeworICAgICAgICAgICAg d2lkdGg6IDMwMHB4OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHR5cGU9 InRleHQvamF2YXNjcmlwdCI+CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAg ICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICB0ZXN0UnVubmVy LndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIG9uTG9hZCgp IHsKKyAgICAgICAgICAgIHdpbmRvdy5sb2NhdGlvbiA9ICJyZXNvdXJjZXMvY2hlY2stY29udGVu dHMtd2lkdGguaHRtbCI7CisgICAgICAgIH0KKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 IG9ubG9hZD0ib25Mb2FkKCkiLz4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBmMmE3ZTY4Li44Mjk4 YjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTItMTEtMjUgIE1pa2hhaWwgUG96 ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CisKKyAgICAgICAgW1dLMl0g VGlsZWRCYWNraW5nU3RvcmU6IHBhZ2UgY29udGVudHMgaXMgc2NhbGVkIHdyb25nbHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzA5MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJlZm9yZSB0aGlzIGNo YW5nZSB0aGUgcGFnZSBjb250ZW50cyBzY2FsaW5nIGluIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIg d2FzCisgICAgICAgIGRlZmluZWQgYWxsIHRoZSB0aW1lcyBieSBtX3Jhd0F0dHJpYnV0ZXMuaW5p dGlhbFNjYWxlLiBJZiBpbml0aWFsIHNjYWxlIGhhZCBub3QKKyAgICAgICAgYmVlbiBzcGVjaWZp ZWQgaW4gdGhlIHZpZXdwb3J0IG1ldGEgdGFnIGl0IHdhcyBzZXQgdG8gbV9taW5pbXVtU2NhbGVU b0ZpdCBpbnNpZGUKKyAgICAgICAgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmll d3BvcnRBdHRyaWJ1dGVzKCkuCisKKyAgICAgICAgVGhlIHByb2JsZW0gd2FzIHRoYXQgbV9taW5p bXVtU2NhbGVUb0ZpdCBjb3VsZCBoYXZlIHdyb25nIHZhbHVlIGFzIGNvbnRlbnRzIHNpemUKKyAg ICAgICAgbWlnaHQgaGF2ZSBub3QgYmUgdXBkYXRlZCBieSB0aGUgdGltZSBQYWdlVmlld3BvcnRD b250cm9sbGVyOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKQorICAgICAgICB3YXMgaW52 b2tlZC4KKworICAgICAgICBUaGUgc29sdXRpb24gaXMgdG8gdXNlIG1fbWluaW11bVNjYWxlVG9G aXQgZm9yIGNvbnRlbnRzIHNjYWxpbmcgaWYgaW5pdGlhbCBzY2FsZQorICAgICAgICBpcyBub3Qg c3BlY2lmaWVkIGluIHRoZSB2aWV3cG9ydCBtZXRhIHRhZywgYXMgaXQgaXMgdXBkYXRlZCBhbGwg dGhlIHRpbWUuIAorICAgICAgICBBbHNvIGEgZmxhZyBtX2luaXRpYWxseUZpdFRvVmlld3BvcnQg aXMgYWRkZWQgdG8gUGFnZVZpZXdwb3J0Q29udHJvbGxlciB0byBkZXRlY3QKKyAgICAgICAgd2hl dGhlciBtX21pbmltdW1TY2FsZVRvRml0IHNob3VsZCBiZSB1c2VkIGZvciBzY2FsaW5nLgorCisg ICAgICAgICogVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpQYWdlVmlld3BvcnRDb250cm9sbGVyKToK KyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlQ29udGVu dHNTaXplKToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6cGFnZVRy YW5zaXRpb25WaWV3cG9ydFJlYWR5KToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29u dHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKToKKyAgICAgICAgKiBVSVByb2Nl c3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oOgorICAgICAgICAoUGFnZVZpZXdwb3J0Q29udHJv bGxlcik6CisKIDIwMTItMTEtMjQgIE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55 YWtvdkBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF1bV0syXSBTdG9wIHRoZSBtZXNzIHdpdGgg REVDTEFSRV9FV0tfVklFV19DQUxMQkFDSyBhcmcgdHlwZSBkZWZpbml0aW9uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKaW5kZXgg NWRlNzkxOS4uN2M0M2E1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmNwcApAQCAtNDQsNiArNDQsNyBAQCBQYWdlVmlld3BvcnRD b250cm9sbGVyOjpQYWdlVmlld3BvcnRDb250cm9sbGVyKFdlYktpdDo6V2ViUGFnZVByb3h5KiBw cm94eSwgUGFnZQogICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9hbGxvd3NVc2VyU2Nh bGluZyhmYWxzZSkKICAgICAsIG1fbWluaW11bVNjYWxlVG9GaXQoMSkKKyAgICAsIG1faW5pdGlh bGx5Rml0VG9WaWV3cG9ydCh0cnVlKQogICAgICwgbV9oYXNTdXNwZW5kZWRDb250ZW50KGZhbHNl KQogICAgICwgbV9oYWRVc2VySW50ZXJhY3Rpb24oZmFsc2UpCiAgICAgLCBtX2VmZmVjdGl2ZVNj YWxlKDEpCkBAIC0xMDksNyArMTEwLDE3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6 ZGlkQ29tbWl0TG9hZCgpCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZUNv bnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJiBuZXdTaXplKQogewogICAgIG1fY29udGVudHNTaXpl ID0gbmV3U2l6ZTsKLSAgICBpZiAodXBkYXRlTWluaW11bVNjYWxlVG9GaXQoKSkKKworICAgIGJv b2wgbWluaW11bVNjYWxlVXBkYXRlZCA9IHVwZGF0ZU1pbmltdW1TY2FsZVRvRml0KCk7CisKKyAg ICBpZiAobV9pbml0aWFsbHlGaXRUb1ZpZXdwb3J0KSB7CisgICAgICAgIC8vIFJlc3RyaWN0IHNj YWxlIGZhY3RvcnMgdG8gbV9taW5pbXVtU2NhbGVUb0ZpdC4KKyAgICAgICAgQVNTRVJUKG1fbWlu aW11bVNjYWxlVG9GaXQgPiAwKTsKKyAgICAgICAgbV9yYXdBdHRyaWJ1dGVzLmluaXRpYWxTY2Fs ZSA9IG1fbWluaW11bVNjYWxlVG9GaXQ7CisgICAgICAgIFdlYkNvcmU6OnJlc3RyaWN0U2NhbGVG YWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKG1fcmF3QXR0cmlidXRlcyk7Cisg ICAgfQorCisgICAgaWYgKG1pbmltdW1TY2FsZVVwZGF0ZWQpCiAgICAgICAgIG1fY2xpZW50LT5k aWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKTsKIH0KIApAQCAtMTQ5LDggKzE2MCw4IEBAIHZv aWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6cGFnZVRyYW5zaXRpb25WaWV3cG9ydFJlYWR5KCkK IHsKICAgICBpZiAoIW1fcmF3QXR0cmlidXRlcy5sYXlvdXRTaXplLmlzRW1wdHkoKSkgewogICAg ICAgICBtX2hhZFVzZXJJbnRlcmFjdGlvbiA9IGZhbHNlOwotICAgICAgICBBU1NFUlQobV9yYXdB dHRyaWJ1dGVzLmluaXRpYWxTY2FsZSA+IDApOwotICAgICAgICBhcHBseVNjYWxlQWZ0ZXJSZW5k ZXJpbmdDb250ZW50cyhpbm5lckJvdW5kZWRWaWV3cG9ydFNjYWxlKHRvVmlld3BvcnRTY2FsZSht X3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlKSkpOworICAgICAgICBmbG9hdCBpbml0aWFsU2Nh bGUgPSBtX2luaXRpYWxseUZpdFRvVmlld3BvcnQgPyBtX21pbmltdW1TY2FsZVRvRml0IDogbV9y YXdBdHRyaWJ1dGVzLmluaXRpYWxTY2FsZTsKKyAgICAgICAgYXBwbHlTY2FsZUFmdGVyUmVuZGVy aW5nQ29udGVudHMoaW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZSh0b1ZpZXdwb3J0U2NhbGUoaW5p dGlhbFNjYWxlKSkpOwogICAgIH0KIAogICAgIC8vIEF0IHRoaXMgcG9pbnQgd2Ugc2hvdWxkIGFs cmVhZHkgaGF2ZSByZWNlaXZlZCB0aGUgZmlyc3Qgdmlld3BvcnQgYXJndW1lbnRzIGFuZCB0aGUg cmVxdWVzdGVkIHNjcm9sbApAQCAtMjE4LDE4ICsyMjksMTIgQEAgdm9pZCBQYWdlVmlld3BvcnRD b250cm9sbGVyOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoY29uc3QgV2ViQ29yZTo6Vmll d3BvcnQKIAogICAgIG1fcmF3QXR0cmlidXRlcyA9IG5ld0F0dHJpYnV0ZXM7CiAgICAgbV9hbGxv d3NVc2VyU2NhbGluZyA9ICEhbV9yYXdBdHRyaWJ1dGVzLnVzZXJTY2FsYWJsZTsKKyAgICBtX2lu aXRpYWxseUZpdFRvVmlld3BvcnQgPSAobV9yYXdBdHRyaWJ1dGVzLmluaXRpYWxTY2FsZSA8IDAp OwogCi0gICAgYm9vbCBtaW5pbXVtU2NhbGVVcGRhdGVkID0gdXBkYXRlTWluaW11bVNjYWxlVG9G aXQoKTsKLQotICAgIEFTU0VSVChtX21pbmltdW1TY2FsZVRvRml0ID4gMCk7Ci0KLSAgICAvLyBT ZXQgdGhlIGluaXRpYWwgc2NhbGUgaWYgaXQgd2FzIG5vdCBzcGVjaWZpZWQgaW4gdGhlIHZpZXdw b3J0IG1ldGEgdGFnLgotICAgIGlmIChtX3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlIDwgMCkK LSAgICAgICAgbV9yYXdBdHRyaWJ1dGVzLmluaXRpYWxTY2FsZSA9IG1fbWluaW11bVNjYWxlVG9G aXQ7CisgICAgaWYgKCFtX2luaXRpYWxseUZpdFRvVmlld3BvcnQpCisgICAgICAgIFdlYkNvcmU6 OnJlc3RyaWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKG1fcmF3 QXR0cmlidXRlcyk7CiAKLSAgICBXZWJDb3JlOjpyZXN0cmljdFNjYWxlRmFjdG9yVG9Jbml0aWFs U2NhbGVJZk5vdFVzZXJTY2FsYWJsZShtX3Jhd0F0dHJpYnV0ZXMpOwotCi0gICAgaWYgKG1pbmlt dW1TY2FsZVVwZGF0ZWQpCisgICAgaWYgKHVwZGF0ZU1pbmltdW1TY2FsZVRvRml0KCkpCiAgICAg ICAgIG1fY2xpZW50LT5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmgKaW5kZXgg M2JlM2QyNy4uMDUyZTg5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFn ZVZpZXdwb3J0Q29udHJvbGxlci5oCkBAIC05NCw2ICs5NCw3IEBAIHByaXZhdGU6CiAKICAgICBi b29sIG1fYWxsb3dzVXNlclNjYWxpbmc7CiAgICAgZmxvYXQgbV9taW5pbXVtU2NhbGVUb0ZpdDsK KyAgICBib29sIG1faW5pdGlhbGx5Rml0VG9WaWV3cG9ydDsKIAogICAgIGJvb2wgbV9oYXNTdXNw ZW5kZWRDb250ZW50OwogICAgIGJvb2wgbV9oYWRVc2VySW50ZXJhY3Rpb247Cg==