110847 2013-02-25 22:34:29 -0800 [EFL] EwkView should keep css position instead of scroll position in device pixel. 2013-03-07 23:32:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110197 110298 109033 110066 1 dongseong.hwang dongseong.hwang benjamin gyuyoung.kim kenneth mikhail.pozdnyakov rakuco webkit.review.bot oldest_to_newest 841646 0 dongseong.hwang 2013-02-25 22:34:29 -0800 There are bugs that some code expect that EwkView::pagePosition() returns css position while others expect that it returns scroll position in device pixel. In addition, some code call EwkView::setPagePosition() with css position while others call it with scroll position in device pixel. This patch makes all code use setPagePosition() and pagePosition() with css position. 841657 1 190211 dongseong.hwang 2013-02-25 22:49:08 -0800 Created attachment 190211 Patch 841679 2 dongseong.hwang 2013-02-25 23:30:55 -0800 I explain more detail to help review. Currently there are two clients to call setPagePosition 1. call setPagePosition with css position void WebView::pageDidRequestScroll(const IntPoint& position) { ... m_ewkView->setPagePosition(FloatPoint(position)); m_ewkView->scheduleUpdateDisplay(); } 2. call setPagePosition with scroll position in device pixel. void PageViewportControllerClientEfl::setViewportPosition(const WebCore::FloatPoint& contentsPoint) { m_contentPosition = contentsPoint; FloatPoint pos(contentsPoint); pos.scale(m_view->pageScaleFactor(), m_view->pageScaleFactor()); pos.scale(m_view->deviceScaleFactor(), m_view->deviceScaleFactor()); m_view->setPagePosition(pos); ... } pagePosition ditto. 841897 3 190211 mikhail.pozdnyakov 2013-02-26 05:02:33 -0800 Comment on attachment 190211 Patch The patch per se looks good and makes code cleaner. My question is: shouldn't we go further and convert view size to css units as well, otherwise it might not look consistent? 841911 4 190211 kenneth 2013-02-26 05:24:50 -0800 Comment on attachment 190211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190211&action=review > Source/WebKit2/ChangeLog:14 > + This patch makes all code use setPagePosition() and pagePosition() with css > + position. I am not sure that is the best solution, as when panning and going pinch etc all the values will be in user coordinates. I would prefer it the other way around. It seems more natural 846126 5 dongseong.hwang 2013-03-03 17:30:23 -0800 Thank you for review! :) (In reply to comment #3) > (From update of attachment 190211 [details]) > The patch per se looks good and makes code cleaner. My question is: shouldn't we go further and convert view size to css units as well, otherwise it might not look consistent? Your concern is very reasonable. I agree. I decided that EwkView stores css position because of following reasons: 1. There is no code that stores DIP scroll position (= css position * page scale factor) or device scroll position (= css position * page scale factor * device scale factor). IMHO, scroll position in DIP or device pixel units is a bit weird. 2. css position is a little bit effective for clients. There are only three clients that use EwkView::pagePosition(). Two clients can be checked in this patch. and last one is WebView::updateViewportSize(). We don't need to compute float multiplication. void WebView::updateViewportSize() { ... m_page->drawingArea()->setVisibleContentsRect(FloatRect(m_ewkView->pagePosition(), m_ewkView->size()), FloatPoint()); } However, I agree that it is not consistent with size. Do you think which unit we should use for scroll position: css, DIP, or device pixel units? (In reply to comment #4) > (From update of attachment 190211 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190211&action=review > > > Source/WebKit2/ChangeLog:14 > > + This patch makes all code use setPagePosition() and pagePosition() with css > > + position. > > I am not sure that is the best solution, as when panning and going pinch etc all the values will be in user coordinates. I would prefer it the other way around. It seems more natural I don'y fully catch up what you mean. Do you think EwkView should store scroll position in user coordinates? and user coordinates may be device pixel units? 846202 6 kenneth 2013-03-04 00:59:18 -0800 > Your concern is very reasonable. I agree. It is very simple, The user interacts with the contents (moves the finger, does a pinch gesture) using UI units. Having to convert that to CSS units and making sure things are pixel aligned etc, seems complex and easy to go wrong 846277 7 dongseong.hwang 2013-03-04 02:55:01 -0800 (In reply to comment #6) > > Your concern is very reasonable. I agree. > > It is very simple, The user interacts with the contents (moves the finger, does a pinch gesture) using UI units. Having to convert that to CSS units and making sure things are pixel aligned etc, seems complex and easy to go wrong Yes, you and Mikhail are right! I'll change EwkView to keep scroll position in UI units. :) 846869 8 191314 dongseong.hwang 2013-03-04 14:40:40 -0800 Created attachment 191314 Patch 846875 9 191316 dongseong.hwang 2013-03-04 14:44:45 -0800 Created attachment 191316 Patch 847407 10 191316 kenneth 2013-03-05 01:10:23 -0800 Comment on attachment 191316 Patch LGTM 847448 11 dongseong.hwang 2013-03-05 01:45:51 -0800 (In reply to comment #10) > (From update of attachment 191316 [details]) > LGTM Thanks for review :) benjamin, could you review? 848230 12 191316 benjamin 2013-03-05 16:30:39 -0800 Comment on attachment 191316 Patch What about the tests? I don't really mind this. Okay for WebKit2. 850892 13 192150 dongseong.hwang 2013-03-07 22:56:12 -0800 Created attachment 192150 Patch for Landing 850922 14 192150 webkit.review.bot 2013-03-07 23:32:10 -0800 Comment on attachment 192150 Patch for Landing Clearing flags on attachment: 192150 Committed r145185: <http://trac.webkit.org/changeset/145185> 850923 15 webkit.review.bot 2013-03-07 23:32:15 -0800 All reviewed patches have been landed. Closing bug. 190211 2013-02-25 22:49:08 -0800 2013-03-04 14:40:35 -0800 Patch bug-110847-20130226154511.patch text/plain 3768 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODM5MDEzMDY0MjhiYmJh NjQ1YTk3MmYyNzNhMzQzZWMwZTk1N2FlMC4uOTg3OWE2NjQ0MWQxOTUyMjA1NGM4MGQyOWY4YmQz YWE1M2IzMjYwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEzLTAyLTI1ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCisgICAgICAgIFtFRkxdIEV3 a1ZpZXcgc2hvdWxkIGtlZXAgY3NzIHBvc2l0aW9uIGluc3RlYWQgb2Ygc2Nyb2xsIHBvc2l0aW9u IGluIGRldmljZSBwaXhlbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDg0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZXJlIGFyZSBidWdzIHRoYXQgc29tZSBjb2RlIGV4cGVjdCB0aGF0IEV3a1Zp ZXc6OnBhZ2VQb3NpdGlvbigpIHJldHVybnMgY3NzCisgICAgICAgIHBvc2l0aW9uIHdoaWxlIG90 aGVycyBleHBlY3QgdGhhdCBpdCByZXR1cm5zIHNjcm9sbCBwb3NpdGlvbiBpbiBkZXZpY2UgcGl4 ZWwuCisgICAgICAgIEluIGFkZGl0aW9uLCBzb21lIGNvZGUgY2FsbCBFd2tWaWV3OjpzZXRQYWdl UG9zaXRpb24oKSB3aXRoIGNzcyBwb3NpdGlvbiB3aGlsZQorICAgICAgICBvdGhlcnMgY2FsbCBp dCB3aXRoIHNjcm9sbCBwb3NpdGlvbiBpbiBkZXZpY2UgcGl4ZWwuCisKKyAgICAgICAgVGhpcyBw YXRjaCBtYWtlcyBhbGwgY29kZSB1c2Ugc2V0UGFnZVBvc2l0aW9uKCkgYW5kIHBhZ2VQb3NpdGlv bigpIHdpdGggY3NzCisgICAgICAgIHBvc2l0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL2Vm bC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6c2V0Vmlld3BvcnRQb3NpdGlvbik6Cisg ICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlldzo6cGFpbnRUb0NhaXJvU3VyZmFjZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnRy YW5zZm9ybVRvU2NlbmUpOgorCisyMDEzLTAyLTI1ICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxh QGNvbXBhbnkxMDAubmV0PgorCiAgICAgICAgIFtFRkxdW1dLMl0gQ29udmVydCBmcm9tIG5hdGl2 ZSB2aWV3IHNpemUgdG8gZGlwIHZpZXcgc2l6ZSBvbmx5IGluIEV3a1ZpZXcuCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAxOTcKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudEVmbC5jcHAKaW5kZXggNjljZGUwM2NmMGM3YjA3MmUwODE5NjdjMmQyYzgz ZTgwZDIyOWYwZC4uN2EwNTU4Y2Q1NmMwZWYzOGE2MjAyNzY3MTFkOTRmMGUwMDA0NDY3ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9s bGVyQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCkBAIC00OSwxMiArNDksNyBAQCB2b2lkIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25z dCBXZWJDb3JlOjpJbnRTaQogdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpz ZXRWaWV3cG9ydFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGNvbnRlbnRzUG9p bnQpCiB7CiAgICAgbV9jb250ZW50UG9zaXRpb24gPSBjb250ZW50c1BvaW50OwotCi0gICAgRmxv YXRQb2ludCBwb3MoY29udGVudHNQb2ludCk7Ci0gICAgcG9zLnNjYWxlKG1fdmlldy0+cGFnZVNj YWxlRmFjdG9yKCksIG1fdmlldy0+cGFnZVNjYWxlRmFjdG9yKCkpOwotICAgIHBvcy5zY2FsZSht X3ZpZXctPmRldmljZVNjYWxlRmFjdG9yKCksIG1fdmlldy0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7 Ci0gICAgbV92aWV3LT5zZXRQYWdlUG9zaXRpb24ocG9zKTsKLQorICAgIG1fdmlldy0+c2V0UGFn ZVBvc2l0aW9uKG1fY29udGVudFBvc2l0aW9uKTsKICAgICBtX2NvbnRyb2xsZXItPmRpZENoYW5n ZUNvbnRlbnRzVmlzaWJpbGl0eShtX2NvbnRlbnRQb3NpdGlvbiwgbV92aWV3LT5wYWdlU2NhbGVG YWN0b3IoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwCmlu ZGV4IDE1OGQ1MTZkODlkZjEwNmQxYTUxMDA3ZDM3NzJmOTliZGJiZWI0NTcuLjJlNTM1YjZlOGUw MzhjMzFjODc1ZjVjY2QzMDRlZmNkM2ViYWVjN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9XZWJWaWV3LmNwcApAQCAtMTE3LDcgKzExNyw3IEBAIHZvaWQgV2ViVmlldzo6cGFpbnRU b0NhaXJvU3VyZmFjZShjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UpCiAgICAgY29uc3QgRmxvYXRQ b2ludCYgcGFnZVBvc2l0aW9uID0gbV9ld2tWaWV3LT5wYWdlUG9zaXRpb24oKTsKICAgICBkb3Vi bGUgZWZmZWN0aXZlU2NhbGUgPSBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkgKiBtX2V3a1Zp ZXctPnBhZ2VTY2FsZUZhY3RvcigpOwogCi0gICAgY2Fpcm9fbWF0cml4X3QgdHJhbnNmb3JtID0g eyBlZmZlY3RpdmVTY2FsZSwgMCwgMCwgZWZmZWN0aXZlU2NhbGUsIC0gcGFnZVBvc2l0aW9uLngo KSwgLSBwYWdlUG9zaXRpb24ueSgpIH07CisgICAgY2Fpcm9fbWF0cml4X3QgdHJhbnNmb3JtID0g eyBlZmZlY3RpdmVTY2FsZSwgMCwgMCwgZWZmZWN0aXZlU2NhbGUsIC1wYWdlUG9zaXRpb24ueCgp ICogZWZmZWN0aXZlU2NhbGUsIC1wYWdlUG9zaXRpb24ueSgpICogZWZmZWN0aXZlU2NhbGUgfTsK ICAgICBjYWlyb19zZXRfbWF0cml4KGNvbnRleHQuY3IoKSwgJnRyYW5zZm9ybSk7CiAKICAgICBz Y2VuZS0+cGFpbnRUb0dyYXBoaWNzQ29udGV4dCgmY29udGV4dCk7CkBAIC0yMjIsOSArMjIyLDkg QEAgQWZmaW5lVHJhbnNmb3JtIFdlYlZpZXc6OnRyYW5zZm9ybVRvU2NlbmUoKSBjb25zdAogICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybSA9IG1fdXNlclZpZXdwb3J0VHJhbnNmb3Jt OwogCiAgICAgY29uc3QgRmxvYXRQb2ludCYgcGFnZVBvc2l0aW9uID0gbV9ld2tWaWV3LT5wYWdl UG9zaXRpb24oKTsKLSAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKC1wYWdlUG9zaXRpb24ueCgpLCAt cGFnZVBvc2l0aW9uLnkoKSk7CiAgICAgdHJhbnNmb3JtLnNjYWxlKG1fcGFnZS0+ZGV2aWNlU2Nh bGVGYWN0b3IoKSk7CiAgICAgdHJhbnNmb3JtLnNjYWxlKG1fZXdrVmlldy0+cGFnZVNjYWxlRmFj dG9yKCkpOworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUoLXBhZ2VQb3NpdGlvbi54KCksIC1wYWdl UG9zaXRpb24ueSgpKTsKIAogICAgIHJldHVybiB0cmFuc2Zvcm0udG9BZmZpbmVUcmFuc2Zvcm0o KTsKIH0K 191314 2013-03-04 14:40:40 -0800 2013-03-04 14:44:41 -0800 Patch bug-110847-20130305073616.patch text/plain 4711 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjE2ZGIyNDU2OGEyMTBk NTA2NDUyY2JjMjQwZGUzNjUzMGU0NjRlZS4uYTQ5YTQ3ZTkyMThlMzgwNDk3YzNmYTU3NGU3YmRl ODdlZTUzMTFiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAzLTA0ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIFtFRkxdIEV3 a1ZpZXcgc2hvdWxkIGtlZXAgY3NzIHBvc2l0aW9uIGluc3RlYWQgb2Ygc2Nyb2xsIHBvc2l0aW9u IGluIGRldmljZSBwaXhlbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDg0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZXJlIGFyZSBidWdzIHRoYXQgc29tZSBjb2RlIGV4cGVjdCB0aGF0IEV3a1Zp ZXc6OnBhZ2VQb3NpdGlvbigpIHJldHVybnMgY3NzCisgICAgICAgIHBvc2l0aW9uIHdoaWxlIG90 aGVycyBleHBlY3QgdGhhdCBpdCByZXR1cm5zIHNjcm9sbCBwb3NpdGlvbiBpbiBkZXZpY2UgcGl4 ZWwuCisgICAgICAgIEluIGFkZGl0aW9uLCBzb21lIGNvZGUgY2FsbCBFd2tWaWV3OjpzZXRQYWdl UG9zaXRpb24oKSB3aXRoIGNzcyBwb3NpdGlvbiB3aGlsZQorICAgICAgICBvdGhlcnMgY2FsbCBp dCB3aXRoIHNjcm9sbCBwb3NpdGlvbiBpbiBkZXZpY2UgcGl4ZWwuCisKKyAgICAgICAgVGhpcyBw YXRjaCBtYWtlcyBhbGwgY29kZSB1c2Ugc2V0UGFnZVBvc2l0aW9uKCkgYW5kIHBhZ2VQb3NpdGlv bigpIHdpdGgKKyAgICAgICAgVUkgcGl4ZWxzIChhLmsuYSBEZW5zaXR5IEluZGVwZW5kZW50IFBp eGVsKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRFZmw6OnNldFZpZXdwb3J0UG9zaXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2Vi Vmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnBhaW50VG9DYWlyb1N1cmZhY2Up OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3Ojp0cmFuc2Zvcm1Ub1NjZW5lKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlldzo6cGFnZURpZFJlcXVlc3RTY3JvbGwpOgorCiAyMDEzLTAyLTI1ICBIdWFuZyBEb25n c3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFtFRkxdW1dLMl0gQ29u dmVydCBmcm9tIG5hdGl2ZSB2aWV3IHNpemUgdG8gZGlwIHZpZXcgc2l6ZSBvbmx5IGluIEV3a1Zp ZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Q YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcAppbmRleCA2OWNkZTAzY2YwYzdiMDcy ZTA4MTk2N2MyZDJjODNlODBkMjI5ZjBkLi44MWUwYTE5NTNhYTAzNWJiOWM2MjdlNWEwNmVhNjIx OWJhMGYzZWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAKQEAgLTUyLDcgKzUy LDYgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBv c2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG8KIAogICAgIEZsb2F0UG9pbnQgcG9zKGNvbnRl bnRzUG9pbnQpOwogICAgIHBvcy5zY2FsZShtX3ZpZXctPnBhZ2VTY2FsZUZhY3RvcigpLCBtX3Zp ZXctPnBhZ2VTY2FsZUZhY3RvcigpKTsKLSAgICBwb3Muc2NhbGUobV92aWV3LT5kZXZpY2VTY2Fs ZUZhY3RvcigpLCBtX3ZpZXctPmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgIG1fdmlldy0+c2V0 UGFnZVBvc2l0aW9uKHBvcyk7CiAKICAgICBtX2NvbnRyb2xsZXItPmRpZENoYW5nZUNvbnRlbnRz VmlzaWJpbGl0eShtX2NvbnRlbnRQb3NpdGlvbiwgbV92aWV3LT5wYWdlU2NhbGVGYWN0b3IoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJWaWV3LmNwcAppbmRleCAxNThkNTE2ZDg5 ZGYxMDZkMWE1MTAwN2QzNzcyZjk5YmRiYmViNDU3Li4wMzM3ZGRkNTFkZWEyZDQzYTE1ZTU3YmQ1 NGRiZjkyNmQ0ZDhjNzU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5j cHAKQEAgLTExNyw3ICsxMTcsNyBAQCB2b2lkIFdlYlZpZXc6OnBhaW50VG9DYWlyb1N1cmZhY2Uo Y2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlKQogICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBhZ2VQb3Np dGlvbiA9IG1fZXdrVmlldy0+cGFnZVBvc2l0aW9uKCk7CiAgICAgZG91YmxlIGVmZmVjdGl2ZVNj YWxlID0gbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpICogbV9ld2tWaWV3LT5wYWdlU2NhbGVG YWN0b3IoKTsKIAotICAgIGNhaXJvX21hdHJpeF90IHRyYW5zZm9ybSA9IHsgZWZmZWN0aXZlU2Nh bGUsIDAsIDAsIGVmZmVjdGl2ZVNjYWxlLCAtIHBhZ2VQb3NpdGlvbi54KCksIC0gcGFnZVBvc2l0 aW9uLnkoKSB9OworICAgIGNhaXJvX21hdHJpeF90IHRyYW5zZm9ybSA9IHsgZWZmZWN0aXZlU2Nh bGUsIDAsIDAsIGVmZmVjdGl2ZVNjYWxlLCAtcGFnZVBvc2l0aW9uLngoKSAqIG1fcGFnZS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKSwgLXBhZ2VQb3NpdGlvbi55KCkgKiBtX3BhZ2UtPmRldmljZVNjYWxl RmFjdG9yKCkgfTsKICAgICBjYWlyb19zZXRfbWF0cml4KGNvbnRleHQuY3IoKSwgJnRyYW5zZm9y bSk7CiAKICAgICBzY2VuZS0+cGFpbnRUb0dyYXBoaWNzQ29udGV4dCgmY29udGV4dCk7CkBAIC0y MDAsNyArMjAwLDkgQEAgdm9pZCBXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUoKQogICAgICAg ICBtX2V3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hhbmdlVmlld3BvcnRT aXplKG1fZXdrVmlldy0+c2l6ZSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBtX3Bh Z2UtPmRyYXdpbmdBcmVhKCktPnNldFZpc2libGVDb250ZW50c1JlY3QoRmxvYXRSZWN0KG1fZXdr Vmlldy0+cGFnZVBvc2l0aW9uKCksIG1fZXdrVmlldy0+c2l6ZSgpKSwgRmxvYXRQb2ludCgpKTsK KyAgICBGbG9hdFBvaW50IGNzc1Bvc2l0aW9uKG1fZXdrVmlldy0+cGFnZVBvc2l0aW9uKCkpOwor ICAgIGNzc1Bvc2l0aW9uLnNjYWxlKDEgLyBtX2V3a1ZpZXctPnBhZ2VTY2FsZUZhY3RvcigpLCAx IC8gbV9ld2tWaWV3LT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgbV9wYWdlLT5kcmF3aW5nQXJl YSgpLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KEZsb2F0UmVjdChjc3NQb3NpdGlvbiwgbV9ld2tW aWV3LT5zaXplKCkpLCBGbG9hdFBvaW50KCkpOwogfQogCiB2b2lkIFdlYlZpZXc6OmRpZENoYW5n ZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKQpAQCAtMjIyLDggKzIy NCw4IEBAIEFmZmluZVRyYW5zZm9ybSBXZWJWaWV3Ojp0cmFuc2Zvcm1Ub1NjZW5lKCkgY29uc3QK ICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCB0cmFuc2Zvcm0gPSBtX3VzZXJWaWV3cG9ydFRyYW5z Zm9ybTsKIAogICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBhZ2VQb3NpdGlvbiA9IG1fZXdrVmlldy0+ cGFnZVBvc2l0aW9uKCk7Ci0gICAgdHJhbnNmb3JtLnRyYW5zbGF0ZSgtcGFnZVBvc2l0aW9uLngo KSwgLXBhZ2VQb3NpdGlvbi55KCkpOwogICAgIHRyYW5zZm9ybS5zY2FsZShtX3BhZ2UtPmRldmlj ZVNjYWxlRmFjdG9yKCkpOworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUoLXBhZ2VQb3NpdGlvbi54 KCksIC1wYWdlUG9zaXRpb24ueSgpKTsKICAgICB0cmFuc2Zvcm0uc2NhbGUobV9ld2tWaWV3LT5w YWdlU2NhbGVGYWN0b3IoKSk7CiAKICAgICByZXR1cm4gdHJhbnNmb3JtLnRvQWZmaW5lVHJhbnNm b3JtKCk7CkBAIC01MTcsNyArNTE5LDkgQEAgdm9pZCBXZWJWaWV3OjpwYWdlRGlkUmVxdWVzdFNj cm9sbChjb25zdCBJbnRQb2ludCYgcG9zaXRpb24pCiAgICAgICAgIG1fZXdrVmlldy0+cGFnZVZp ZXdwb3J0Q29udHJvbGxlcigpLT5wYWdlRGlkUmVxdWVzdFNjcm9sbChwb3NpdGlvbik7CiAgICAg ICAgIHJldHVybjsKICAgICB9Ci0gICAgbV9ld2tWaWV3LT5zZXRQYWdlUG9zaXRpb24oRmxvYXRQ b2ludChwb3NpdGlvbikpOworICAgIEZsb2F0UG9pbnQgcG9zKHBvc2l0aW9uKTsKKyAgICBwb3Mu c2NhbGUobV9ld2tWaWV3LT5wYWdlU2NhbGVGYWN0b3IoKSwgbV9ld2tWaWV3LT5wYWdlU2NhbGVG YWN0b3IoKSk7CisgICAgbV9ld2tWaWV3LT5zZXRQYWdlUG9zaXRpb24ocG9zKTsKICAgICBtX2V3 a1ZpZXctPnNjaGVkdWxlVXBkYXRlRGlzcGxheSgpOwogfQogCg== 191316 2013-03-04 14:44:45 -0800 2013-03-07 22:55:26 -0800 Patch bug-110847-20130305074021.patch text/plain 4729 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjE2ZGIyNDU2OGEyMTBk NTA2NDUyY2JjMjQwZGUzNjUzMGU0NjRlZS4uYTQ5YTQ3ZTkyMThlMzgwNDk3YzNmYTU3NGU3YmRl ODdlZTUzMTFiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAzLTA0ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIFtFRkxdIEV3 a1ZpZXcgc2hvdWxkIGtlZXAgY3NzIHBvc2l0aW9uIGluc3RlYWQgb2Ygc2Nyb2xsIHBvc2l0aW9u IGluIGRldmljZSBwaXhlbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDg0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZXJlIGFyZSBidWdzIHRoYXQgc29tZSBjb2RlIGV4cGVjdCB0aGF0IEV3a1Zp ZXc6OnBhZ2VQb3NpdGlvbigpIHJldHVybnMgY3NzCisgICAgICAgIHBvc2l0aW9uIHdoaWxlIG90 aGVycyBleHBlY3QgdGhhdCBpdCByZXR1cm5zIHNjcm9sbCBwb3NpdGlvbiBpbiBkZXZpY2UgcGl4 ZWwuCisgICAgICAgIEluIGFkZGl0aW9uLCBzb21lIGNvZGUgY2FsbCBFd2tWaWV3OjpzZXRQYWdl UG9zaXRpb24oKSB3aXRoIGNzcyBwb3NpdGlvbiB3aGlsZQorICAgICAgICBvdGhlcnMgY2FsbCBp dCB3aXRoIHNjcm9sbCBwb3NpdGlvbiBpbiBkZXZpY2UgcGl4ZWwuCisKKyAgICAgICAgVGhpcyBw YXRjaCBtYWtlcyBhbGwgY29kZSB1c2Ugc2V0UGFnZVBvc2l0aW9uKCkgYW5kIHBhZ2VQb3NpdGlv bigpIHdpdGgKKyAgICAgICAgVUkgcGl4ZWxzIChhLmsuYSBEZW5zaXR5IEluZGVwZW5kZW50IFBp eGVsKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRFZmw6OnNldFZpZXdwb3J0UG9zaXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2Vi Vmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnBhaW50VG9DYWlyb1N1cmZhY2Up OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3Ojp0cmFuc2Zvcm1Ub1NjZW5lKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlldzo6cGFnZURpZFJlcXVlc3RTY3JvbGwpOgorCiAyMDEzLTAyLTI1ICBIdWFuZyBEb25n c3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFtFRkxdW1dLMl0gQ29u dmVydCBmcm9tIG5hdGl2ZSB2aWV3IHNpemUgdG8gZGlwIHZpZXcgc2l6ZSBvbmx5IGluIEV3a1Zp ZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Q YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcAppbmRleCA2OWNkZTAzY2YwYzdiMDcy ZTA4MTk2N2MyZDJjODNlODBkMjI5ZjBkLi44MWUwYTE5NTNhYTAzNWJiOWM2MjdlNWEwNmVhNjIx OWJhMGYzZWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAKQEAgLTUyLDcgKzUy LDYgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBv c2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG8KIAogICAgIEZsb2F0UG9pbnQgcG9zKGNvbnRl bnRzUG9pbnQpOwogICAgIHBvcy5zY2FsZShtX3ZpZXctPnBhZ2VTY2FsZUZhY3RvcigpLCBtX3Zp ZXctPnBhZ2VTY2FsZUZhY3RvcigpKTsKLSAgICBwb3Muc2NhbGUobV92aWV3LT5kZXZpY2VTY2Fs ZUZhY3RvcigpLCBtX3ZpZXctPmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgIG1fdmlldy0+c2V0 UGFnZVBvc2l0aW9uKHBvcyk7CiAKICAgICBtX2NvbnRyb2xsZXItPmRpZENoYW5nZUNvbnRlbnRz VmlzaWJpbGl0eShtX2NvbnRlbnRQb3NpdGlvbiwgbV92aWV3LT5wYWdlU2NhbGVGYWN0b3IoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJWaWV3LmNwcAppbmRleCAxNThkNTE2ZDg5 ZGYxMDZkMWE1MTAwN2QzNzcyZjk5YmRiYmViNDU3Li5kMmY0ZjZhYWEzYWRlMzQyMGQ1Y2IyYzg5 NWM0MDUwZmYyNzA0MWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5j cHAKQEAgLTExNyw3ICsxMTcsNyBAQCB2b2lkIFdlYlZpZXc6OnBhaW50VG9DYWlyb1N1cmZhY2Uo Y2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlKQogICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBhZ2VQb3Np dGlvbiA9IG1fZXdrVmlldy0+cGFnZVBvc2l0aW9uKCk7CiAgICAgZG91YmxlIGVmZmVjdGl2ZVNj YWxlID0gbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpICogbV9ld2tWaWV3LT5wYWdlU2NhbGVG YWN0b3IoKTsKIAotICAgIGNhaXJvX21hdHJpeF90IHRyYW5zZm9ybSA9IHsgZWZmZWN0aXZlU2Nh bGUsIDAsIDAsIGVmZmVjdGl2ZVNjYWxlLCAtIHBhZ2VQb3NpdGlvbi54KCksIC0gcGFnZVBvc2l0 aW9uLnkoKSB9OworICAgIGNhaXJvX21hdHJpeF90IHRyYW5zZm9ybSA9IHsgZWZmZWN0aXZlU2Nh bGUsIDAsIDAsIGVmZmVjdGl2ZVNjYWxlLCAtcGFnZVBvc2l0aW9uLngoKSAqIG1fcGFnZS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKSwgLXBhZ2VQb3NpdGlvbi55KCkgKiBtX3BhZ2UtPmRldmljZVNjYWxl RmFjdG9yKCkgfTsKICAgICBjYWlyb19zZXRfbWF0cml4KGNvbnRleHQuY3IoKSwgJnRyYW5zZm9y bSk7CiAKICAgICBzY2VuZS0+cGFpbnRUb0dyYXBoaWNzQ29udGV4dCgmY29udGV4dCk7CkBAIC0y MDAsNyArMjAwLDkgQEAgdm9pZCBXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUoKQogICAgICAg ICBtX2V3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hhbmdlVmlld3BvcnRT aXplKG1fZXdrVmlldy0+c2l6ZSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBtX3Bh Z2UtPmRyYXdpbmdBcmVhKCktPnNldFZpc2libGVDb250ZW50c1JlY3QoRmxvYXRSZWN0KG1fZXdr Vmlldy0+cGFnZVBvc2l0aW9uKCksIG1fZXdrVmlldy0+c2l6ZSgpKSwgRmxvYXRQb2ludCgpKTsK KyAgICBGbG9hdFBvaW50IHVpUG9zaXRpb24obV9ld2tWaWV3LT5wYWdlUG9zaXRpb24oKSk7Cisg ICAgdWlQb3NpdGlvbi5zY2FsZSgxIC8gbV9ld2tWaWV3LT5wYWdlU2NhbGVGYWN0b3IoKSwgMSAv IG1fZXdrVmlldy0+cGFnZVNjYWxlRmFjdG9yKCkpOworICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEo KS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChGbG9hdFJlY3QodWlQb3NpdGlvbiwgbV9ld2tWaWV3 LT5zaXplKCkpLCBGbG9hdFBvaW50KCkpOwogfQogCiB2b2lkIFdlYlZpZXc6OmRpZENoYW5nZUNv bnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKQpAQCAtMjIyLDggKzIyNCw4 IEBAIEFmZmluZVRyYW5zZm9ybSBXZWJWaWV3Ojp0cmFuc2Zvcm1Ub1NjZW5lKCkgY29uc3QKICAg ICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCB0cmFuc2Zvcm0gPSBtX3VzZXJWaWV3cG9ydFRyYW5zZm9y bTsKIAogICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBhZ2VQb3NpdGlvbiA9IG1fZXdrVmlldy0+cGFn ZVBvc2l0aW9uKCk7Ci0gICAgdHJhbnNmb3JtLnRyYW5zbGF0ZSgtcGFnZVBvc2l0aW9uLngoKSwg LXBhZ2VQb3NpdGlvbi55KCkpOwogICAgIHRyYW5zZm9ybS5zY2FsZShtX3BhZ2UtPmRldmljZVNj YWxlRmFjdG9yKCkpOworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUoLXBhZ2VQb3NpdGlvbi54KCks IC1wYWdlUG9zaXRpb24ueSgpKTsKICAgICB0cmFuc2Zvcm0uc2NhbGUobV9ld2tWaWV3LT5wYWdl U2NhbGVGYWN0b3IoKSk7CiAKICAgICByZXR1cm4gdHJhbnNmb3JtLnRvQWZmaW5lVHJhbnNmb3Jt KCk7CkBAIC01MTcsNyArNTE5LDkgQEAgdm9pZCBXZWJWaWV3OjpwYWdlRGlkUmVxdWVzdFNjcm9s bChjb25zdCBJbnRQb2ludCYgcG9zaXRpb24pCiAgICAgICAgIG1fZXdrVmlldy0+cGFnZVZpZXdw b3J0Q29udHJvbGxlcigpLT5wYWdlRGlkUmVxdWVzdFNjcm9sbChwb3NpdGlvbik7CiAgICAgICAg IHJldHVybjsKICAgICB9Ci0gICAgbV9ld2tWaWV3LT5zZXRQYWdlUG9zaXRpb24oRmxvYXRQb2lu dChwb3NpdGlvbikpOworICAgIEZsb2F0UG9pbnQgdWlQb3NpdGlvbihwb3NpdGlvbik7CisgICAg dWlQb3NpdGlvbi5zY2FsZShtX2V3a1ZpZXctPnBhZ2VTY2FsZUZhY3RvcigpLCBtX2V3a1ZpZXct PnBhZ2VTY2FsZUZhY3RvcigpKTsKKyAgICBtX2V3a1ZpZXctPnNldFBhZ2VQb3NpdGlvbih1aVBv c2l0aW9uKTsKICAgICBtX2V3a1ZpZXctPnNjaGVkdWxlVXBkYXRlRGlzcGxheSgpOwogfQogCg== 192150 2013-03-07 22:56:12 -0800 2013-03-07 23:32:10 -0800 Patch for Landing bug-110847-20130308155134.patch text/plain 4785 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTc0NDAzYzZlMjNhMDBi NzdlOWMxODAyZjE4OThjZjA5ZmJmODBkZC4uZWEyYjhmYzI3YTkzZTgwNjYxNzYwYzFjMDdmOGU3 ZTI2ZDMyZjZjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAzLTA3ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIFtFRkxdIEV3 a1ZpZXcgc2hvdWxkIGtlZXAgY3NzIHBvc2l0aW9uIGluc3RlYWQgb2Ygc2Nyb2xsIHBvc2l0aW9u IGluIGRldmljZSBwaXhlbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDg0NworCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hy aXN0aWFuc2VuLgorCisgICAgICAgIFNpZ25lZCBvZmYgZm9yIFdlYktpdDIgYnkgQmVuamFtaW4g UG91bGFpbi4KKworICAgICAgICBUaGVyZSBhcmUgYnVncyB0aGF0IHNvbWUgY29kZSBleHBlY3Qg dGhhdCBFd2tWaWV3OjpwYWdlUG9zaXRpb24oKSByZXR1cm5zIGNzcworICAgICAgICBwb3NpdGlv biB3aGlsZSBvdGhlcnMgZXhwZWN0IHRoYXQgaXQgcmV0dXJucyBzY3JvbGwgcG9zaXRpb24gaW4g ZGV2aWNlIHBpeGVsLgorICAgICAgICBJbiBhZGRpdGlvbiwgc29tZSBjb2RlIGNhbGwgRXdrVmll dzo6c2V0UGFnZVBvc2l0aW9uKCkgd2l0aCBjc3MgcG9zaXRpb24gd2hpbGUKKyAgICAgICAgb3Ro ZXJzIGNhbGwgaXQgd2l0aCBzY3JvbGwgcG9zaXRpb24gaW4gZGV2aWNlIHBpeGVsLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggbWFrZXMgYWxsIGNvZGUgdXNlIHNldFBhZ2VQb3NpdGlvbigpIGFuZCBw YWdlUG9zaXRpb24oKSB3aXRoCisgICAgICAgIFVJIHBpeGVscyAoYS5rLmEgRGVuc2l0eSBJbmRl cGVuZGVudCBQaXhlbCkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBvc2l0aW9uKToKKyAgICAgICAgKiBVSVByb2Nl c3MvZWZsL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpwYWludFRvQ2Fp cm9TdXJmYWNlKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6dXBkYXRlVmlld3BvcnRTaXpl KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6dHJhbnNmb3JtVG9TY2VuZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXc6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKToKKwogMjAxMy0wMy0wMyAg SHVhbmcgRG9uZ3N1bmcgIDxsdXh0ZWxsYUBjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBbRUZM XVtRVF1bV0syXSBUdXJuIG9uIEFwcGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yIGFsd2F5 cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCmluZGV4IDY5Y2RlMDNjZjBjN2IwNzJl MDgxOTY3YzJkMmM4M2U4MGQyMjlmMGQuLjgxZTBhMTk1M2FhMDM1YmI5YzYyN2U1YTA2ZWE2MjE5 YmEwZjNlZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcApAQCAtNTIsNyArNTIs NiBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnNldFZpZXdwb3J0UG9z aXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQbwogCiAgICAgRmxvYXRQb2ludCBwb3MoY29udGVu dHNQb2ludCk7CiAgICAgcG9zLnNjYWxlKG1fdmlldy0+cGFnZVNjYWxlRmFjdG9yKCksIG1fdmll dy0+cGFnZVNjYWxlRmFjdG9yKCkpOwotICAgIHBvcy5zY2FsZShtX3ZpZXctPmRldmljZVNjYWxl RmFjdG9yKCksIG1fdmlldy0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgbV92aWV3LT5zZXRQ YWdlUG9zaXRpb24ocG9zKTsKIAogICAgIG1fY29udHJvbGxlci0+ZGlkQ2hhbmdlQ29udGVudHNW aXNpYmlsaXR5KG1fY29udGVudFBvc2l0aW9uLCBtX3ZpZXctPnBhZ2VTY2FsZUZhY3RvcigpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwCmluZGV4IDExY2ZjOTgwMzFj YmNlZGE2ODIzNzhiZjczYWZiYjA3YzM4YmQ0ZGYuLjVjMmIzYmE0M2ZhNWY1MjhiNzExYzE1MmM1 YWRlYzk3OWQyMWQ0MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJWaWV3LmNw cApAQCAtMTE3LDcgKzExNyw3IEBAIHZvaWQgV2ViVmlldzo6cGFpbnRUb0NhaXJvU3VyZmFjZShj YWlyb19zdXJmYWNlX3QqIHN1cmZhY2UpCiAgICAgY29uc3QgRmxvYXRQb2ludCYgcGFnZVBvc2l0 aW9uID0gbV9ld2tWaWV3LT5wYWdlUG9zaXRpb24oKTsKICAgICBkb3VibGUgZWZmZWN0aXZlU2Nh bGUgPSBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkgKiBtX2V3a1ZpZXctPnBhZ2VTY2FsZUZh Y3RvcigpOwogCi0gICAgY2Fpcm9fbWF0cml4X3QgdHJhbnNmb3JtID0geyBlZmZlY3RpdmVTY2Fs ZSwgMCwgMCwgZWZmZWN0aXZlU2NhbGUsIC0gcGFnZVBvc2l0aW9uLngoKSwgLSBwYWdlUG9zaXRp b24ueSgpIH07CisgICAgY2Fpcm9fbWF0cml4X3QgdHJhbnNmb3JtID0geyBlZmZlY3RpdmVTY2Fs ZSwgMCwgMCwgZWZmZWN0aXZlU2NhbGUsIC1wYWdlUG9zaXRpb24ueCgpICogbV9wYWdlLT5kZXZp Y2VTY2FsZUZhY3RvcigpLCAtcGFnZVBvc2l0aW9uLnkoKSAqIG1fcGFnZS0+ZGV2aWNlU2NhbGVG YWN0b3IoKSB9OwogICAgIGNhaXJvX3NldF9tYXRyaXgoY29udGV4dC5jcigpLCAmdHJhbnNmb3Jt KTsKIAogICAgIHNjZW5lLT5wYWludFRvR3JhcGhpY3NDb250ZXh0KCZjb250ZXh0KTsKQEAgLTIw MCw3ICsyMDAsOSBAQCB2b2lkIFdlYlZpZXc6OnVwZGF0ZVZpZXdwb3J0U2l6ZSgpCiAgICAgICAg IG1fZXdrVmlldy0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VWaWV3cG9ydFNp emUobV9ld2tWaWV3LT5zaXplKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIG1fcGFn ZS0+ZHJhd2luZ0FyZWEoKS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChGbG9hdFJlY3QobV9ld2tW aWV3LT5wYWdlUG9zaXRpb24oKSwgbV9ld2tWaWV3LT5zaXplKCkpLCBGbG9hdFBvaW50KCkpOwor ICAgIEZsb2F0UG9pbnQgdWlQb3NpdGlvbihtX2V3a1ZpZXctPnBhZ2VQb3NpdGlvbigpKTsKKyAg ICB1aVBvc2l0aW9uLnNjYWxlKDEgLyBtX2V3a1ZpZXctPnBhZ2VTY2FsZUZhY3RvcigpLCAxIC8g bV9ld2tWaWV3LT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgbV9wYWdlLT5kcmF3aW5nQXJlYSgp LT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KEZsb2F0UmVjdCh1aVBvc2l0aW9uLCBtX2V3a1ZpZXct PnNpemUoKSksIEZsb2F0UG9pbnQoKSk7CiB9CiAKIHZvaWQgV2ViVmlldzo6ZGlkQ2hhbmdlQ29u dGVudHNTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNpemUpCkBAIC0yMTgsOCArMjIwLDgg QEAgQWZmaW5lVHJhbnNmb3JtIFdlYlZpZXc6OnRyYW5zZm9ybVRvU2NlbmUoKSBjb25zdAogICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybSA9IG1fdXNlclZpZXdwb3J0VHJhbnNmb3Jt OwogCiAgICAgY29uc3QgRmxvYXRQb2ludCYgcGFnZVBvc2l0aW9uID0gbV9ld2tWaWV3LT5wYWdl UG9zaXRpb24oKTsKLSAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKC1wYWdlUG9zaXRpb24ueCgpLCAt cGFnZVBvc2l0aW9uLnkoKSk7CiAgICAgdHJhbnNmb3JtLnNjYWxlKG1fcGFnZS0+ZGV2aWNlU2Nh bGVGYWN0b3IoKSk7CisgICAgdHJhbnNmb3JtLnRyYW5zbGF0ZSgtcGFnZVBvc2l0aW9uLngoKSwg LXBhZ2VQb3NpdGlvbi55KCkpOwogICAgIHRyYW5zZm9ybS5zY2FsZShtX2V3a1ZpZXctPnBhZ2VT Y2FsZUZhY3RvcigpKTsKIAogICAgIHJldHVybiB0cmFuc2Zvcm0udG9BZmZpbmVUcmFuc2Zvcm0o KTsKQEAgLTQ5Myw3ICs0OTUsOSBAQCB2b2lkIFdlYlZpZXc6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xs KGNvbnN0IEludFBvaW50JiBwb3NpdGlvbikKICAgICAgICAgbV9ld2tWaWV3LT5wYWdlVmlld3Bv cnRDb250cm9sbGVyKCktPnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKHBvc2l0aW9uKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KLSAgICBtX2V3a1ZpZXctPnNldFBhZ2VQb3NpdGlvbihGbG9hdFBvaW50 KHBvc2l0aW9uKSk7CisgICAgRmxvYXRQb2ludCB1aVBvc2l0aW9uKHBvc2l0aW9uKTsKKyAgICB1 aVBvc2l0aW9uLnNjYWxlKG1fZXdrVmlldy0+cGFnZVNjYWxlRmFjdG9yKCksIG1fZXdrVmlldy0+ cGFnZVNjYWxlRmFjdG9yKCkpOworICAgIG1fZXdrVmlldy0+c2V0UGFnZVBvc2l0aW9uKHVpUG9z aXRpb24pOwogICAgIG1fZXdrVmlldy0+c2NoZWR1bGVVcGRhdGVEaXNwbGF5KCk7CiB9CiAK