110438 2013-02-21 01:14:15 -0800 [WK2][EFL] Clean up PageViewportControllerClientEfl class 2013-02-22 01:35:43 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107657 1 mikhail.pozdnyakov mikhail.pozdnyakov gyuyoung.kim kenneth kling laszlo.gombos lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 838205 0 mikhail.pozdnyakov 2013-02-21 01:14:15 -0800 PageViewportControllerClientEfl contains surprisingly a lot of methods and members which: 1) useless 2) accessing WK2 internals. 838238 1 189482 mikhail.pozdnyakov 2013-02-21 02:07:15 -0800 Created attachment 189482 patch 838309 2 189482 kenneth 2013-02-21 03:52:58 -0800 Comment on attachment 189482 patch View in context: https://bugs.webkit.org/attachment.cgi?id=189482&action=review LGTM > Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h:46 > + void setViewportPosition(const WebCore::FloatPoint&); OVERRIDE? is are they not? > Source/WebKit2/UIProcess/efl/WebView.cpp:159 > + FloatSize size = m_ewkView->size(); > + // The viewport controller expects sizes in UI units, and not raw device units. > + size.scale(1 / m_page->deviceScaleFactor()); cant that be one line? doesnt scale return a size? 838320 3 mikhail.pozdnyakov 2013-02-21 04:21:29 -0800 (In reply to comment #2) > (From update of attachment 189482 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189482&action=review > > LGTM > > > Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h:46 > > + void setViewportPosition(const WebCore::FloatPoint&); > > OVERRIDE? is are they not? yeah, I'll add it. > > > Source/WebKit2/UIProcess/efl/WebView.cpp:159 > > + FloatSize size = m_ewkView->size(); > > + // The viewport controller expects sizes in UI units, and not raw device units. > > + size.scale(1 / m_page->deviceScaleFactor()); > > cant that be one line? doesnt scale return a size? Unfortunately not :/ 838344 4 189510 mikhail.pozdnyakov 2013-02-21 04:51:51 -0800 Created attachment 189510 patch v2 Took comments from Kenneth into consideration. 839362 5 189510 kenneth 2013-02-22 01:25:28 -0800 Comment on attachment 189510 patch v2 LGTM 839373 6 189510 webkit.review.bot 2013-02-22 01:35:38 -0800 Comment on attachment 189510 patch v2 Clearing flags on attachment: 189510 Committed r143705: <http://trac.webkit.org/changeset/143705> 839374 7 webkit.review.bot 2013-02-22 01:35:43 -0800 All reviewed patches have been landed. Closing bug. 189482 2013-02-21 02:07:15 -0800 2013-02-21 04:51:51 -0800 patch bug110438 text/plain 7347 mikhail.pozdnyakov Y29tbWl0IDlkZDk3YThlN2QzNmNkMmIwZGQ5YjE0MmE2MTUxNjIwZTNkMmQ2YzAKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IEZlYiAyMSAxMjowMToyMCAyMDEzICswMjAwCgogICAgYnVnMTEwNDM4CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDcyMmI5YTYuLjM1MzJhOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMy0w Mi0yMSAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXVtFRkxdIENsZWFuIHVwIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRFZmwgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMDQzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIENsZWFuZWQgdXAgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCBjbGFzcyBmcm9t IHVudXNlZCBtZXRob2RzCisgICAgICAgIGFuZCBjbGFzcyBtZW1iZXJzLCBlbGltaW5hdGVkIGFj Y2VzcyB0byBXSzIgaW50ZXJuYWxzIGZyb20gdGhpcyBjbGFzcy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmRpZENoYW5nZUNvbnRlbnRz U2l6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmg6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRF Zmw6On5QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsKToKKyAgICAgICAgKFBhZ2VWaWV3 cG9ydENvbnRyb2xsZXJDbGllbnRFZmwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViVmll dy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OldlYlZpZXcpOgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUpOgorCiAyMDEzLTAyLTIwICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFByb3ZpZGUgV0tWaWV3 IFNQSSB0byBkZWZlciB0ZWxsaW5nIHRoZSBXZWJQYWdlUHJveHkgYW5kIFdlYlByb2Nlc3MgYWJv dXQgY2hhbmdlcyBpbiB0aGUgaG9zdGluZyB3aW5kb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRF ZmwuY3BwCmluZGV4IDRiN2NiODQ1Li5mNGRmYmU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVu dEVmbC5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEyIFNhbXN1 bmcgRWxlY3Ryb25pY3MuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIw MTMgSW50ZWwgQ29ycG9yYXRpb24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDExICsyNyw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgi CiAjaW5jbHVkZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5oIgogCi0jaW5jbHVk ZSAiQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHkuaCIKICNpbmNsdWRlICJFd2tWaWV3Lmgi CiAjaW5jbHVkZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIgotI2luY2x1ZGUgIlRyYW5zZm9y bWF0aW9uTWF0cml4LmgiCi0jaW5jbHVkZSA8V2ViQ29yZS9Db29yZGluYXRlZEdyYXBoaWNzU2Nl bmUuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTQzLDMyICs0MSw4IEBAIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRFZmwoRXdrVmlldyogdmlldykKICAgICBBU1NFUlQobV92aWV3KTsKIH0KIAotUGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudEVmbDo6flBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwo KQordm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpkaWRDaGFuZ2VDb250ZW50 c1NpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpCiB7Ci19Ci0KLURyYXdpbmdBcmVhUHJveHkq IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmRyYXdpbmdBcmVhKCkgY29uc3QKLXsK LSAgICByZXR1cm4gbV92aWV3LT5wYWdlKCktPmRyYXdpbmdBcmVhKCk7Ci19Ci0KLXZvaWQgUGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6c2V0UmVuZGVyZXJBY3RpdmUoYm9vbCBhY3Rp dmUpCi17Ci0gICAgZHJhd2luZ0FyZWEoKS0+Y29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHko KS0+Y29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lKCktPnNldEFjdGl2ZShhY3RpdmUpOwotfQotCi12 b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnVwZGF0ZVZpZXdwb3J0U2l6ZSgp Ci17Ci0gICAgQVNTRVJUKG1fY29udHJvbGxlcik7Ci0gICAgRmxvYXRTaXplIHNpemUgPSBtX3Zp ZXctPnNpemUoKTsKLSAgICAvLyBUaGUgdmlld3BvcnQgY29udHJvbGxlciBleHBlY3RzIHNpemVz IGluIFVJIHVuaXRzLCBhbmQgbm90IHJhdyBkZXZpY2UgdW5pdHMuCi0gICAgc2l6ZS5zY2FsZSgx IC8gbV9jb250cm9sbGVyLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKLSAgICBtX2NvbnRyb2xsZXIt PmRpZENoYW5nZVZpZXdwb3J0U2l6ZShzaXplKTsKLX0KLQotdm9pZCBQYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgV2ViQ29yZTo6SW50 U2l6ZSYgY29udGVudHNTaXplKQotewotICAgIFVOVVNFRF9QQVJBTShjb250ZW50c1NpemUpOwog ICAgIG1fdmlldy0+c2NoZWR1bGVVcGRhdGVEaXNwbGF5KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVm bC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50RWZsLmgKaW5kZXggNzBhMDBlZi4uODU2MTgzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmgKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEyIFNhbXN1 bmcgRWxlY3Ryb25pY3MuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIw MTMgSW50ZWwgQ29ycG9yYXRpb24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDEwICsyNywxMiBAQAogI2lmbmRlZiBQYWdlVmlld3Bv cnRDb250cm9sbGVyQ2xpZW50RWZsX2gKICNkZWZpbmUgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudEVmbF9oCiAKLSNpbmNsdWRlICJFd2tWaWV3LmgiCiAjaW5jbHVkZSAiUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudC5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRQb2ludC5oPgogI2lu Y2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAKK2NsYXNzIEV3a1ZpZXc7CisKIG5hbWVzcGFjZSBX ZWJLaXQgewogCiBjbGFzcyBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsIDogcHVibGlj IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQgewpAQCAtMzgsMzAgKzQxLDIyIEBAIHB1Ymxp YzoKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgUGFnZVZpZXdwb3J0Q29udHJv bGxlckNsaWVudEVmbCh2aWV3SW1wbCkpOwogICAgIH0KLSAgICB+UGFnZVZpZXdwb3J0Q29udHJv bGxlckNsaWVudEVmbCgpOwotCi0gICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEoKSBj b25zdDsKLSAgICBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCkgeyByZXR1cm4gbV92aWV3cG9y dFNpemU7IH0KLSAgICBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnRlbnRQb3NpdGlvbigpIGNvbnN0 IHsgcmV0dXJuIG1fY29udGVudFBvc2l0aW9uOyB9Ci0KLSAgICB2b2lkIHVwZGF0ZVZpZXdwb3J0 U2l6ZSgpOwotICAgIHZvaWQgc2V0UmVuZGVyZXJBY3RpdmUoYm9vbCk7CisgICAgflBhZ2VWaWV3 cG9ydENvbnRyb2xsZXJDbGllbnRFZmwoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBzZXRWaWV3 cG9ydFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGNvbnRlbnRzUG9pbnQpOwot ICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3IoZmxvYXQpOworICAgIHZvaWQgc2V0 Vmlld3BvcnRQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50Jik7CisgICAgdm9pZCBz ZXRQYWdlU2NhbGVGYWN0b3IoZmxvYXQpOwogCi0gICAgdmlydHVhbCB2b2lkIGRpZFJlc3VtZUNv bnRlbnQoKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFdl YkNvcmU6OkludFNpemUmKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlzaWJsZUNvbnRl bnRzKCk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlcygpOwor ICAgIHZvaWQgZGlkUmVzdW1lQ29udGVudCgpOworICAgIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNT aXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKKyAgICB2b2lkIGRpZENoYW5nZVZpc2libGVD b250ZW50cygpOworICAgIHZvaWQgZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKCk7CiAKLSAg ICB2aXJ0dWFsIHZvaWQgc2V0Q29udHJvbGxlcihQYWdlVmlld3BvcnRDb250cm9sbGVyKik7Cisg ICAgdm9pZCBzZXRDb250cm9sbGVyKFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIqKTsKIAogcHJpdmF0 ZToKICAgICBleHBsaWNpdCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsKEV3a1ZpZXcq KTsKIAogICAgIEV3a1ZpZXcqIG1fdmlldzsKLSAgICBXZWJDb3JlOjpJbnRTaXplIG1fdmlld3Bv cnRTaXplOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgbV9jb250ZW50UG9zaXRpb247CiAgICAg UGFnZVZpZXdwb3J0Q29udHJvbGxlciogbV9jb250cm9sbGVyOwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwCmluZGV4IDEwYTM4NTEuLmRlMWI2MDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJWaWV3LmNwcApAQCAtNTEsNiArNTEsOCBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKIFdlYlZpZXc6OldlYlZpZXcoV2ViQ29udGV4dCogY29udGV4dCwgV2Vi UGFnZUdyb3VwKiBwYWdlR3JvdXAsIEV3a1ZpZXcqIGV3a1ZpZXcpCiAgICAgOiBtX2V3a1ZpZXco ZXdrVmlldykKICAgICAsIG1fcGFnZShjb250ZXh0LT5jcmVhdGVXZWJQYWdlKHRoaXMsIHBhZ2VH cm91cCkpCisgICAgLCBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQoUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbDo6Y3JlYXRlKGV3a1ZpZXcpKQorICAgICwgbV9wYWdlVmlld3Bv cnRDb250cm9sbGVyKGFkb3B0UHRyKG5ldyBQYWdlVmlld3BvcnRDb250cm9sbGVyKHBhZ2UoKSwg bV9wYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50LmdldCgpKSkpCiB7CiAgICAgbV9wYWdlLT5w YWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJs ZWQodHJ1ZSk7CiAgICAgbV9wYWdlLT5wYWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+c2V0Rm9y Y2VDb21wb3NpdGluZ01vZGUodHJ1ZSk7CkBAIC0xNTIsMTEgKzE1NCwxMCBAQCB2b2lkIFdlYlZp ZXc6OmRpZENvbW1pdExvYWQoKQogdm9pZCBXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUoKQog ewogICAgIGlmIChtX3BhZ2UtPnVzZUZpeGVkTGF5b3V0KCkpIHsKLSAgICAgICAgaWYgKCFtX3Bh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQpIHsKLSAgICAgICAgICAgIG1fcGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudCA9IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmNyZWF0 ZShtX2V3a1ZpZXcpOwotICAgICAgICAgICAgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyID0gYWRv cHRQdHIobmV3IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIocGFnZSgpLCBtX3BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnQuZ2V0KCkpKTsKLSAgICAgICAgfQotICAgICAgICBtX3BhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnQtPnVwZGF0ZVZpZXdwb3J0U2l6ZSgpOworICAgICAgICBGbG9hdFNp emUgc2l6ZSA9IG1fZXdrVmlldy0+c2l6ZSgpOworICAgICAgICAvLyBUaGUgdmlld3BvcnQgY29u dHJvbGxlciBleHBlY3RzIHNpemVzIGluIFVJIHVuaXRzLCBhbmQgbm90IHJhdyBkZXZpY2UgdW5p dHMuCisgICAgICAgIHNpemUuc2NhbGUoMSAvIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7 CisgICAgICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci0+ZGlkQ2hhbmdlVmlld3BvcnRTaXpl KHNpemUpOwogICAgIH0gZWxzZQogICAgICAgICBtX3BhZ2UtPmRyYXdpbmdBcmVhKCktPnNldFZp c2libGVDb250ZW50c1JlY3QoSW50UmVjdChyb3VuZGVkSW50UG9pbnQobV9ld2tWaWV3LT5wYWdl UG9zaXRpb24oKSksIG1fZXdrVmlldy0+c2l6ZSgpKSwgRmxvYXRQb2ludCgpKTsKIH0K 189510 2013-02-21 04:51:51 -0800 2013-02-22 01:35:38 -0800 patch v2 bug110438_v2 text/plain 7415 mikhail.pozdnyakov Y29tbWl0IDVhZTRlMDJmMmU4NzdiMDM5NDhiMzIzMDZmODNiMzlkNmU4MDdmODUKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IEZlYiAyMSAxMjowMToyMCAyMDEzICswMjAwCgogICAgYnVnMTEwNDM4CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDU2NGE4MDkuLjFhMmEwYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAxMy0w Mi0yMSAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K IAorICAgICAgICBbV0syXVtFRkxdIENsZWFuIHVwIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRFZmwgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMDQzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIENsZWFuZWQgdXAgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCBjbGFzcyBmcm9t IHVudXNlZCBtZXRob2RzCisgICAgICAgIGFuZCBjbGFzcyBtZW1iZXJzLCBlbGltaW5hdGVkIGFj Y2VzcyB0byBXSzIgaW50ZXJuYWxzIGZyb20gdGhpcyBjbGFzcy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmRpZENoYW5nZUNvbnRlbnRz U2l6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmg6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRF Zmw6On5QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsKToKKyAgICAgICAgKFBhZ2VWaWV3 cG9ydENvbnRyb2xsZXJDbGllbnRFZmwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViVmll dy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OldlYlZpZXcpOgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUpOgorCisyMDEzLTAyLTIxICBNaWtoYWls IFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCiAgICAgICAgIFtX SzJdW0VGTF0gTW92ZSBQYWdlVmlld3BvcnRDb250cm9sbGVyIGFuZCBQYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsIG91dCBmcm9tIFdlYlZpZXcKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDM0NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9Fd2tWaWV3LmgKaW5kZXggMTcwNjNjZi4uNmI0YmRkOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaApAQCAtMTI0LDcgKzEyNCw2IEBAIHB1 YmxpYzoKICAgICBFd2tTZXR0aW5ncyogc2V0dGluZ3MoKSB7IHJldHVybiBtX3NldHRpbmdzLmdl dCgpOyB9CiAgICAgRXdrQmFja0ZvcndhcmRMaXN0KiBiYWNrRm9yd2FyZExpc3QoKSB7IHJldHVy biBtX2JhY2tGb3J3YXJkTGlzdC5nZXQoKTsgfQogICAgIEV3a1dpbmRvd0ZlYXR1cmVzKiB3aW5k b3dGZWF0dXJlcygpOwotICAgIFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVm bCogcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCgpIHsgcmV0dXJuIG1fcGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudC5nZXQoKTsgfQogICAgIFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJv bGxlciogcGFnZVZpZXdwb3J0Q29udHJvbGxlcigpIHsgcmV0dXJuIG1fcGFnZVZpZXdwb3J0Q29u dHJvbGxlci5nZXQoKTsgfQogCiAgICAgYm9vbCBpc0ZvY3VzZWQoKSBjb25zdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRFZmwuY3BwCmluZGV4IDRiN2NiODQ1Li5mNGRmYmU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbC5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0 IChDKSAyMDEyIFNhbXN1bmcgRWxlY3Ryb25pY3MuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMTMgSW50ZWwgQ29ycG9yYXRpb24uIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDExICsyNyw4IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVm bC5oIgogCi0jaW5jbHVkZSAiQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHkuaCIKICNpbmNs dWRlICJFd2tWaWV3LmgiCiAjaW5jbHVkZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIgotI2lu Y2x1ZGUgIlRyYW5zZm9ybWF0aW9uTWF0cml4LmgiCi0jaW5jbHVkZSA8V2ViQ29yZS9Db29yZGlu YXRlZEdyYXBoaWNzU2NlbmUuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTQz LDMyICs0MSw4IEBAIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OlBhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRFZmwoRXdrVmlldyogdmlldykKICAgICBBU1NFUlQobV92aWV3KTsK IH0KIAotUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6flBhZ2VWaWV3cG9ydENvbnRy b2xsZXJDbGllbnRFZmwoKQordm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpk aWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpCiB7Ci19Ci0KLURy YXdpbmdBcmVhUHJveHkqIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmRyYXdpbmdB cmVhKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV92aWV3LT5wYWdlKCktPmRyYXdpbmdBcmVhKCk7 Ci19Ci0KLXZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6c2V0UmVuZGVyZXJB Y3RpdmUoYm9vbCBhY3RpdmUpCi17Ci0gICAgZHJhd2luZ0FyZWEoKS0+Y29vcmRpbmF0ZWRMYXll clRyZWVIb3N0UHJveHkoKS0+Y29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lKCktPnNldEFjdGl2ZShh Y3RpdmUpOwotfQotCi12b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnVwZGF0 ZVZpZXdwb3J0U2l6ZSgpCi17Ci0gICAgQVNTRVJUKG1fY29udHJvbGxlcik7Ci0gICAgRmxvYXRT aXplIHNpemUgPSBtX3ZpZXctPnNpemUoKTsKLSAgICAvLyBUaGUgdmlld3BvcnQgY29udHJvbGxl ciBleHBlY3RzIHNpemVzIGluIFVJIHVuaXRzLCBhbmQgbm90IHJhdyBkZXZpY2UgdW5pdHMuCi0g ICAgc2l6ZS5zY2FsZSgxIC8gbV9jb250cm9sbGVyLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKLSAg ICBtX2NvbnRyb2xsZXItPmRpZENoYW5nZVZpZXdwb3J0U2l6ZShzaXplKTsKLX0KLQotdm9pZCBQ YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgY29udGVudHNTaXplKQotewotICAgIFVOVVNFRF9QQVJBTShj b250ZW50c1NpemUpOwogICAgIG1fdmlldy0+c2NoZWR1bGVVcGRhdGVEaXNwbGF5KCk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudEVmbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmll d3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmgKaW5kZXggNzBhMDBlZi4uNDUyNDhmNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50RWZsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3Bv cnRDb250cm9sbGVyQ2xpZW50RWZsLmgKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0 IChDKSAyMDEyIFNhbXN1bmcgRWxlY3Ryb25pY3MuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMTMgSW50ZWwgQ29ycG9yYXRpb24uIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDEwICsyNywxMiBAQAogI2lm bmRlZiBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsX2gKICNkZWZpbmUgUGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudEVmbF9oCiAKLSNpbmNsdWRlICJFd2tWaWV3LmgiCiAjaW5jbHVk ZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudC5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRmxv YXRQb2ludC5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAKK2NsYXNzIEV3a1ZpZXc7 CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsIDogcHVibGljIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQgewpAQCAtMzgsMzAg KzQxLDIyIEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgUGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCh2aWV3SW1wbCkpOwogICAgIH0KLSAgICB+UGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCgpOwotCi0gICAgRHJhd2luZ0FyZWFQcm94eSog ZHJhd2luZ0FyZWEoKSBjb25zdDsKLSAgICBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCkgeyBy ZXR1cm4gbV92aWV3cG9ydFNpemU7IH0KLSAgICBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnRlbnRQ b3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFBvc2l0aW9uOyB9Ci0KLSAgICB2b2lk IHVwZGF0ZVZpZXdwb3J0U2l6ZSgpOwotICAgIHZvaWQgc2V0UmVuZGVyZXJBY3RpdmUoYm9vbCk7 CisgICAgdmlydHVhbCB+UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCgpIHsgfQogCi0g ICAgdmlydHVhbCB2b2lkIHNldFZpZXdwb3J0UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQ b2ludCYgY29udGVudHNQb2ludCk7Ci0gICAgdmlydHVhbCB2b2lkIHNldFBhZ2VTY2FsZUZhY3Rv cihmbG9hdCk7CisgICAgdmlydHVhbCB2b2lkIHNldFZpZXdwb3J0UG9zaXRpb24oY29uc3QgV2Vi Q29yZTo6RmxvYXRQb2ludCYpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlU2Nh bGVGYWN0b3IoZmxvYXQpIE9WRVJSSURFOwogCi0gICAgdmlydHVhbCB2b2lkIGRpZFJlc3VtZUNv bnRlbnQoKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFdl YkNvcmU6OkludFNpemUmKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlzaWJsZUNvbnRl bnRzKCk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlcygpOwor ICAgIHZpcnR1YWwgdm9pZCBkaWRSZXN1bWVDb250ZW50KCkgT1ZFUlJJREU7CisgICAgdmlydHVh bCB2b2lkIGRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJikgT1ZF UlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVZpc2libGVDb250ZW50cygpIE9WRVJS SURFOworICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKSBPVkVS UklERTsKIAotICAgIHZpcnR1YWwgdm9pZCBzZXRDb250cm9sbGVyKFBhZ2VWaWV3cG9ydENvbnRy b2xsZXIqKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udHJvbGxlcihQYWdlVmlld3BvcnRDb250 cm9sbGVyKikgT1ZFUlJJREU7CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbChFd2tWaWV3Kik7CiAKICAgICBFd2tWaWV3KiBtX3ZpZXc7Ci0g ICAgV2ViQ29yZTo6SW50U2l6ZSBtX3ZpZXdwb3J0U2l6ZTsKICAgICBXZWJDb3JlOjpGbG9hdFBv aW50IG1fY29udGVudFBvc2l0aW9uOwogICAgIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIqIG1fY29u dHJvbGxlcjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dl YlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJWaWV3LmNwcAppbmRl eCA2YjQ5ZDg3Li5iNzY2NjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmll dy5jcHAKQEAgLTE1Miw3ICsxNTIsMTAgQEAgdm9pZCBXZWJWaWV3OjpkaWRDb21taXRMb2FkKCkK IHZvaWQgV2ViVmlldzo6dXBkYXRlVmlld3BvcnRTaXplKCkKIHsKICAgICBpZiAobV9wYWdlLT51 c2VGaXhlZExheW91dCgpKSB7Ci0gICAgICAgIG1fZXdrVmlldy0+cGFnZVZpZXdwb3J0Q29udHJv bGxlckNsaWVudCgpLT51cGRhdGVWaWV3cG9ydFNpemUoKTsKKyAgICAgICAgRmxvYXRTaXplIHNp emUgPSBtX2V3a1ZpZXctPnNpemUoKTsKKyAgICAgICAgLy8gVGhlIHZpZXdwb3J0IGNvbnRyb2xs ZXIgZXhwZWN0cyBzaXplcyBpbiBVSSB1bml0cywgYW5kIG5vdCByYXcgZGV2aWNlIHVuaXRzLgor ICAgICAgICBzaXplLnNjYWxlKDEgLyBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkpOworICAg ICAgICBtX2V3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hhbmdlVmlld3Bv cnRTaXplKHNpemUpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIG1fcGFnZS0+ZHJhd2lu Z0FyZWEoKS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChJbnRSZWN0KHJvdW5kZWRJbnRQb2ludCht X2V3a1ZpZXctPnBhZ2VQb3NpdGlvbigpKSwgbV9ld2tWaWV3LT5zaXplKCkpLCBGbG9hdFBvaW50 KCkpOwo=