106499 2013-01-09 16:21:35 -0800 [QT][EFL][WK2] Rename scale members in PageViewportController. 2013-01-10 01:03:12 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106355 106504 106512 106537 1 dongseong.hwang dongseong.hwang abecsi benjamin cmarcelo gyuyoung.kim kenneth menard rakuco webkit-ews webkit.review.bot oldest_to_newest 803802 0 dongseong.hwang 2013-01-09 16:21:35 -0800 Rename from m_contentsScale to m_pageScaleFactor and from devicePixelRatio() to deviceScaleFactor() to match terms of WebCore. 803804 1 182005 dongseong.hwang 2013-01-09 16:22:53 -0800 Created attachment 182005 Patch 803810 2 182005 webkit-ews 2013-01-09 16:33:17 -0800 Comment on attachment 182005 Patch Attachment 182005 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/15756790 803819 3 182010 dongseong.hwang 2013-01-09 16:40:17 -0800 Created attachment 182010 Patch 803824 4 182014 dongseong.hwang 2013-01-09 16:44:44 -0800 Created attachment 182014 Patch 803949 5 182014 webkit.review.bot 2013-01-09 19:12:57 -0800 Comment on attachment 182014 Patch Clearing flags on attachment: 182014 Committed r139274: <http://trac.webkit.org/changeset/139274> 803950 6 webkit.review.bot 2013-01-09 19:13:02 -0800 All reviewed patches have been landed. Closing bug. 803956 7 182014 benjamin 2013-01-09 19:19:26 -0800 Comment on attachment 182014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182014&action=review > Source/WebKit2/UIProcess/PageViewportController.h:71 > float minimumContentsScale() const { return m_minimumScaleToFit; } > float maximumContentsScale() const { return m_rawAttributes.maximumScale; } > - float currentContentsScale() const { return m_contentsScale; } > + float currentContentsScale() const { return m_pageScaleFactor; } Wait what? Why do you keep names mixed here? 803977 8 dongseong.hwang 2013-01-09 19:42:37 -0800 (In reply to comment #7) > (From update of attachment 182014 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182014&action=review > > > Source/WebKit2/UIProcess/PageViewportController.h:71 > > float minimumContentsScale() const { return m_minimumScaleToFit; } > > float maximumContentsScale() const { return m_rawAttributes.maximumScale; } > > - float currentContentsScale() const { return m_contentsScale; } > > + float currentContentsScale() const { return m_pageScaleFactor; } > > Wait what? > Why do you keep names mixed here? Good point. Those methods are used by qt test code. I'll change xxxScale instead of xxxContentsScale. 804147 9 dongseong.hwang 2013-01-10 01:03:12 -0800 (In reply to comment #7) > (From update of attachment 182014 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182014&action=review > > > Source/WebKit2/UIProcess/PageViewportController.h:71 > > float minimumContentsScale() const { return m_minimumScaleToFit; } > > float maximumContentsScale() const { return m_rawAttributes.maximumScale; } > > - float currentContentsScale() const { return m_contentsScale; } > > + float currentContentsScale() const { return m_pageScaleFactor; } > > Wait what? > Why do you keep names mixed here? I fixed in Bug 106537. 182005 2013-01-09 16:22:53 -0800 2013-01-09 16:40:12 -0800 Patch bug-106499-20130110091936.patch text/plain 10174 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWNmNzg0N2JkYWFlNmM0 NjRlMmNlYmYxMDQ5NjdlZWYxNWVkZDQ0OC4uMDBjZDM0NWZmOWEyYjNiNGU3YjczN2M0MzBiMTUz YmQ4MWMzOGJmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAxLTA5ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIFtRVF1bRUZM XVtXSzJdIFJlbmFtZSBzY2FsZSBtZW1iZXJzIGluIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY0OTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgZnJv bSBtX2NvbnRlbnRzU2NhbGUgdG8gbV9wYWdlU2NhbGVGYWN0b3IgYW5kIGZyb20gZGV2aWNlUGl4 ZWxSYXRpbygpIHRvCisgICAgICAgIGRldmljZVNjYWxlRmFjdG9yKCkgdG8gbWF0Y2ggdGVybXMg b2YgV2ViQ29yZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3QuY3Bw OgorICAgICAgICAoUVdlYktpdFRlc3Q6OmRldmljZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBV SVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIpOgorICAgICAgICAo V2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkZXZpY2VTY2FsZUZhY3Rvcik6CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnBpeGVsQWxpZ25lZEZsb2F0UG9p bnQpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpib3VuZENvbnRl bnRzUG9zaXRpb24pOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpk aWRSZW5kZXJGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6 OmRpZENoYW5nZUNvbnRlbnRzVmlzaWJpbGl0eSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3 cG9ydENvbnRyb2xsZXI6OnN5bmNWaXNpYmxlQ29udGVudHMpOgorICAgICAgICAoV2ViS2l0OjpQ YWdlVmlld3BvcnRDb250cm9sbGVyOjp2aXNpYmxlQ29udGVudHNTaXplKToKKyAgICAgICAgKFdl YktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6YXBwbHlTY2FsZUFmdGVyUmVuZGVyaW5nQ29u dGVudHMpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjp1cGRhdGVN aW5pbXVtU2NhbGVUb0ZpdCk6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRy b2xsZXIuaDoKKyAgICAgICAgKFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIpOgorICAgICAgICAoV2Vi S2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpjdXJyZW50Q29udGVudHNTY2FsZSk6CisgICAg ICAgICogVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6dXBkYXRl Vmlld3BvcnRTaXplKToKKwogMjAxMy0wMS0wOSAgS2lyYW4gTXVwcGFsYSAgPGNtdXBwYWxhQGFw cGxlLmNvbT4KIAogICAgICAgICBBZGQgdXNlciBkZWZhdWx0cyB0byBvdmVycmlkZSBzeXN0ZW0g cHJveHkgc2V0dGluZ3MgZm9yIE5ldHdvcmtQcm9jZXNzIG9uIE1hYwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0LmNwcAppbmRleCBhOGE5YzY4NmI3YWQ1 ZTgxZGE1YmFhNjFjNzBhODQ4OTcxMzU0NTEyLi4xY2JlNmIzNGE1NzFlMmU1OWJlNWFmZTEyYTZj M2QyZTdkNzM1ODQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3F3ZWJraXR0ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJraXR0ZXN0LmNwcApAQCAtMTYzLDEwICsxNjMsMTAgQEAgUUpzb25PYmplY3QgUVdlYktpdFRl c3Q6OnZpZXdwb3J0KCkgY29uc3QKICAgICByZXR1cm4gdmlld3BvcnREYXRhOwogfQogCi1RVmFy aWFudCBRV2ViS2l0VGVzdDo6ZGV2aWNlUGl4ZWxSYXRpbygpIGNvbnN0CitRVmFyaWFudCBRV2Vi S2l0VGVzdDo6ZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdAogewogICAgIGlmIChjb25zdCBQYWdl Vmlld3BvcnRDb250cm9sbGVyKiBjb25zdCB2aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZp ZXdwb3J0Q29udHJvbGxlcigpKQotICAgICAgICByZXR1cm4gdmlld3BvcnQtPmRldmljZVBpeGVs UmF0aW8oKTsKKyAgICAgICAgcmV0dXJuIHZpZXdwb3J0LT5kZXZpY2VTY2FsZUZhY3RvcigpOwog ICAgIHJldHVybiAxLjA7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmNwcAppbmRleCAxMjcxYjk4YWFmNjgzM2RmMzkwOGQyMmVj Y2RmYzAyOWJjMWJlMjMwLi4yNWUzYmY0MWE0NGI2N2NjOWYwZGI4YjM5ODYxMDE3NzljZDUwMThm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJv bGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRy b2xsZXIuY3BwCkBAIC00Nyw3ICs0Nyw3IEBAIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OlBhZ2VW aWV3cG9ydENvbnRyb2xsZXIoV2ViS2l0OjpXZWJQYWdlUHJveHkqIHByb3h5LCBQYWdlCiAgICAg LCBtX2luaXRpYWxseUZpdFRvVmlld3BvcnQodHJ1ZSkKICAgICAsIG1faGFzU3VzcGVuZGVkQ29u dGVudChmYWxzZSkKICAgICAsIG1faGFkVXNlckludGVyYWN0aW9uKGZhbHNlKQotICAgICwgbV9j b250ZW50c1NjYWxlKDEpCisgICAgLCBtX3BhZ2VTY2FsZUZhY3RvcigxKQogICAgICwgbV9wZW5k aW5nUG9zaXRpb25DaGFuZ2UoZmFsc2UpCiAgICAgLCBtX3BlbmRpbmdTY2FsZUNoYW5nZShmYWxz ZSkKIHsKQEAgLTgyLDcgKzgyLDcgQEAgZmxvYXQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6b3V0 ZXJCb3VuZGVkVmlld3BvcnRTY2FsZShmbG9hdCB2aWV3cG9ydFNjYWxlKSBjb24KICAgICByZXR1 cm4gaW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZSh2aWV3cG9ydFNjYWxlKTsKIH0KIAotZmxvYXQg UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGV2aWNlUGl4ZWxSYXRpbygpIGNvbnN0CitmbG9hdCBQ YWdlVmlld3BvcnRDb250cm9sbGVyOjpkZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0CiB7CiAgICAg cmV0dXJuIG1fd2ViUGFnZVByb3h5LT5kZXZpY2VTY2FsZUZhY3RvcigpOwogfQpAQCAtOTUsMTgg Kzk1LDE4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0ludGVncmFsKGZsb2F0IHZhbHVlKQogRmxv YXRQb2ludCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpwaXhlbEFsaWduZWRGbG9hdFBvaW50KGNv bnN0IEZsb2F0UG9pbnQmIGZyYW1lUG9zaXRpb24pCiB7CiAjaWYgUExBVEZPUk0oRUZMKQotICAg IGlmICghaXNJbnRlZ3JhbChtX2NvbnRlbnRzU2NhbGUpKSB7CisgICAgaWYgKCFpc0ludGVncmFs KG1fcGFnZVNjYWxlRmFjdG9yKSkgewogICAgICAgICAvLyBUbyBhdm9pZCBibHVycnluZXNzLCBt b2RpZnkgdGhlIHBvc2l0aW9uIHNvIHRoYXQgaXQgbWFwcyBpbnRvIGEgZGlzY3JldGUgZGV2aWNl IHBvc2l0aW9uLgogICAgICAgICBGbG9hdFBvaW50IHNjYWxlZFBvcyhmcmFtZVBvc2l0aW9uKTsK IAogICAgICAgICAvLyBTY2FsZSBieSB0aGUgZWZmZWN0aXZlIHNjYWxlIGZhY3RvciB0byBjb21w dXRlIHRoZSBzY3JlZW4tcmVsYXRpdmUgcG9zaXRpb24uCi0gICAgICAgIHNjYWxlZFBvcy5zY2Fs ZShtX2NvbnRlbnRzU2NhbGUsIG1fY29udGVudHNTY2FsZSk7CisgICAgICAgIHNjYWxlZFBvcy5z Y2FsZShtX3BhZ2VTY2FsZUZhY3RvciwgbV9wYWdlU2NhbGVGYWN0b3IpOwogCiAgICAgICAgIC8v IFJvdW5kIHRvIGludGVnZXIgYm91bmRhcmllcy4KICAgICAgICAgRmxvYXRQb2ludCBhbGlnbmVk UG9zID0gcm91bmRlZEludFBvaW50KHNjYWxlZFBvcyk7CiAKICAgICAgICAgLy8gQ29udmVydCBi YWNrIHRvIENTUyBjb29yZGluYXRlcy4KLSAgICAgICAgYWxpZ25lZFBvcy5zY2FsZSgxIC8gbV9j b250ZW50c1NjYWxlLCAxIC8gbV9jb250ZW50c1NjYWxlKTsKKyAgICAgICAgYWxpZ25lZFBvcy5z Y2FsZSgxIC8gbV9wYWdlU2NhbGVGYWN0b3IsIDEgLyBtX3BhZ2VTY2FsZUZhY3Rvcik7CiAKICAg ICAgICAgcmV0dXJuIGFsaWduZWRQb3M7CiAgICAgfQpAQCAtMTMzLDcgKzEzMyw3IEBAIEZsb2F0 UG9pbnQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6Ym91bmRDb250ZW50c1Bvc2l0aW9uQXRTY2Fs ZShjb25zdCBXZWJDb3JlOjpGCiAKIEZsb2F0UG9pbnQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6 Ym91bmRDb250ZW50c1Bvc2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGZyYW1lUG9z aXRpb24pCiB7Ci0gICAgcmV0dXJuIGJvdW5kQ29udGVudHNQb3NpdGlvbkF0U2NhbGUoZnJhbWVQ b3NpdGlvbiwgbV9jb250ZW50c1NjYWxlKTsKKyAgICByZXR1cm4gYm91bmRDb250ZW50c1Bvc2l0 aW9uQXRTY2FsZShmcmFtZVBvc2l0aW9uLCBtX3BhZ2VTY2FsZUZhY3Rvcik7CiB9CiAKIHZvaWQg UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ29tbWl0TG9hZCgpCkBAIC0xODksNyArMTg5LDcg QEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRSZW5kZXJGcmFtZShjb25zdCBJbnRT aXplJiBjb250ZW50c1NpemUsIGNvbnN0IEkKIAogICAgIGlmIChtX3BlbmRpbmdTY2FsZUNoYW5n ZSkgewogICAgICAgICBtX3BlbmRpbmdTY2FsZUNoYW5nZSA9IGZhbHNlOwotICAgICAgICBtX2Ns aWVudC0+c2V0Q29udGVudHNTY2FsZShtX2NvbnRlbnRzU2NhbGUpOworICAgICAgICBtX2NsaWVu dC0+c2V0Q29udGVudHNTY2FsZShtX3BhZ2VTY2FsZUZhY3Rvcik7CiAKICAgICAgICAgLy8gVGhl IHNjYWxlIGNoYW5nZWQsIHdlIGhhdmUgdG8gcmUtcGl4ZWwgYWxpZ24uCiAgICAgICAgIG1fcGVu ZGluZ1Bvc2l0aW9uQ2hhbmdlID0gdHJ1ZTsKQEAgLTI1Niw3ICsyNTYsNyBAQCB2b2lkIFBhZ2VW aWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZUNvbnRlbnRzVmlzaWJpbGl0eShjb25zdCBGbG9h dFBvaW50JiBwb3NpdAogICAgIGlmICghbV9wZW5kaW5nUG9zaXRpb25DaGFuZ2UpCiAgICAgICAg IG1fY29udGVudHNQb3NpdGlvbiA9IHBvc2l0aW9uOwogICAgIGlmICghbV9wZW5kaW5nU2NhbGVD aGFuZ2UpCi0gICAgICAgIG1fY29udGVudHNTY2FsZSA9IHNjYWxlOworICAgICAgICBtX3BhZ2VT Y2FsZUZhY3RvciA9IHNjYWxlOwogCiAgICAgc3luY1Zpc2libGVDb250ZW50cyh0cmFqZWN0b3J5 VmVjdG9yKTsKIH0KQEAgLTI2OSw3ICsyNjksNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXI6OnN5bmNWaXNpYmxlQ29udGVudHMoY29uc3QgRmxvYXRQb2ludCYgdHJhamVjdG9yeVZlYwog CiAgICAgRmxvYXRSZWN0IHZpc2libGVDb250ZW50c1JlY3QoYm91bmRDb250ZW50c1Bvc2l0aW9u KG1fY29udGVudHNQb3NpdGlvbiksIHZpc2libGVDb250ZW50c1NpemUoKSk7CiAgICAgdmlzaWJs ZUNvbnRlbnRzUmVjdC5pbnRlcnNlY3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQ6Onplcm8oKSwgbV9j b250ZW50c1NpemUpKTsKLSAgICBkcmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2 aXNpYmxlQ29udGVudHNSZWN0LCBtX2NvbnRlbnRzU2NhbGUsIHRyYWplY3RvcnlWZWN0b3IpOwor ICAgIGRyYXdpbmdBcmVhLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KHZpc2libGVDb250ZW50c1Jl Y3QsIG1fcGFnZVNjYWxlRmFjdG9yLCB0cmFqZWN0b3J5VmVjdG9yKTsKIAogICAgIG1fY2xpZW50 LT5kaWRDaGFuZ2VWaXNpYmxlQ29udGVudHMoKTsKIH0KQEAgLTI5OSw3ICsyOTksNyBAQCB2b2lk IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlcyhjb25z dCBXZWJDb3JlOjpWaWV3cG9ydAogCiBGbG9hdFNpemUgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6 dmlzaWJsZUNvbnRlbnRzU2l6ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIEZsb2F0U2l6ZShtX3Zp ZXdwb3J0U2l6ZS53aWR0aCgpIC8gbV9jb250ZW50c1NjYWxlLCBtX3ZpZXdwb3J0U2l6ZS5oZWln aHQoKSAvIG1fY29udGVudHNTY2FsZSk7CisgICAgcmV0dXJuIEZsb2F0U2l6ZShtX3ZpZXdwb3J0 U2l6ZS53aWR0aCgpIC8gbV9wYWdlU2NhbGVGYWN0b3IsIG1fdmlld3BvcnRTaXplLmhlaWdodCgp IC8gbV9wYWdlU2NhbGVGYWN0b3IpOwogfQogCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6 OnN1c3BlbmRDb250ZW50KCkKQEAgLTMyNCw3ICszMjQsNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENv bnRyb2xsZXI6OnJlc3VtZUNvbnRlbnQoKQogCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6 OmFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRzKGZsb2F0IHNjYWxlKQogewotICAgIG1f Y29udGVudHNTY2FsZSA9IHNjYWxlOworICAgIG1fcGFnZVNjYWxlRmFjdG9yID0gc2NhbGU7CiAg ICAgbV9wZW5kaW5nU2NhbGVDaGFuZ2UgPSB0cnVlOwogICAgIHN5bmNWaXNpYmxlQ29udGVudHMo KTsKIH0KQEAgLTM0MSw3ICszNDEsNyBAQCBib29sIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnVw ZGF0ZU1pbmltdW1TY2FsZVRvRml0KGJvb2wgdXNlckluaXRpYXRlZFVwZGF0ZSkKICAgICBpZiAo bV92aWV3cG9ydFNpemUuaXNFbXB0eSgpIHx8IG1fY29udGVudHNTaXplLmlzRW1wdHkoKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgYm9vbCBjdXJyZW50bHlTY2FsZWRUb0ZpdCA9IGZ1 enp5Q29tcGFyZShtX2NvbnRlbnRzU2NhbGUsIG1fbWluaW11bVNjYWxlVG9GaXQsIDAuMDAwMSk7 CisgICAgYm9vbCBjdXJyZW50bHlTY2FsZWRUb0ZpdCA9IGZ1enp5Q29tcGFyZShtX3BhZ2VTY2Fs ZUZhY3RvciwgbV9taW5pbXVtU2NhbGVUb0ZpdCwgMC4wMDAxKTsKIAogICAgIGZsb2F0IG1pbmlt dW1TY2FsZSA9IFdlYkNvcmU6OmNvbXB1dGVNaW5pbXVtU2NhbGVGYWN0b3JGb3JDb250ZW50Q29u dGFpbmVkKG1fcmF3QXR0cmlidXRlcywgV2ViQ29yZTo6cm91bmRlZEludFNpemUobV92aWV3cG9y dFNpemUpLCBXZWJDb3JlOjpyb3VuZGVkSW50U2l6ZShtX2NvbnRlbnRzU2l6ZSksIDEpOwogCkBA IC0zNTYsOCArMzU2LDggQEAgYm9vbCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjp1cGRhdGVNaW5p bXVtU2NhbGVUb0ZpdChib29sIHVzZXJJbml0aWF0ZWRVcGRhdGUpCiAgICAgICAgICAgICAgICAg YXBwbHlTY2FsZUFmdGVyUmVuZGVyaW5nQ29udGVudHMobV9taW5pbXVtU2NhbGVUb0ZpdCk7CiAg ICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBFbnN1cmUgdGhlIGVmZmVjdGl2 ZSBzY2FsZSBzdGF5cyB3aXRoaW4gYm91bmRzLgotICAgICAgICAgICAgICAgIGZsb2F0IGJvdW5k ZWRTY2FsZSA9IGlubmVyQm91bmRlZFZpZXdwb3J0U2NhbGUobV9jb250ZW50c1NjYWxlKTsKLSAg ICAgICAgICAgICAgICBpZiAoIWZ1enp5Q29tcGFyZShib3VuZGVkU2NhbGUsIG1fY29udGVudHNT Y2FsZSwgMC4wMDAxKSkKKyAgICAgICAgICAgICAgICBmbG9hdCBib3VuZGVkU2NhbGUgPSBpbm5l ckJvdW5kZWRWaWV3cG9ydFNjYWxlKG1fcGFnZVNjYWxlRmFjdG9yKTsKKyAgICAgICAgICAgICAg ICBpZiAoIWZ1enp5Q29tcGFyZShib3VuZGVkU2NhbGUsIG1fcGFnZVNjYWxlRmFjdG9yLCAwLjAw MDEpKQogICAgICAgICAgICAgICAgICAgICBhcHBseVNjYWxlQWZ0ZXJSZW5kZXJpbmdDb250ZW50 cyhib3VuZGVkU2NhbGUpOwogICAgICAgICAgICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaAppbmRleCBmMzgzMTEx ZGZjZTM0NDQwM2NjMjUxMTA2NDk5MTI2ZjQ3MWVjZGE0Li4yYjU5NjE4ZWY3N2Q4MTJlMjNjNmZi MWFhNjQ2ZjRhZmJhYmFjMTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmgKQEAgLTY1LDEwICs2NSwxMCBAQCBwdWJsaWM6CiAgICAg Ym9vbCBhbGxvd3NVc2VyU2NhbGluZygpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dzVXNlclNjYWxp bmc7IH0KIAogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBjb250ZW50c0xheW91dFNpemUoKSBjb25z dCB7IHJldHVybiBtX3Jhd0F0dHJpYnV0ZXMubGF5b3V0U2l6ZTsgfQotICAgIGZsb2F0IGRldmlj ZVBpeGVsUmF0aW8oKSBjb25zdDsKKyAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0 OwogICAgIGZsb2F0IG1pbmltdW1Db250ZW50c1NjYWxlKCkgY29uc3QgeyByZXR1cm4gbV9taW5p bXVtU2NhbGVUb0ZpdDsgfQogICAgIGZsb2F0IG1heGltdW1Db250ZW50c1NjYWxlKCkgY29uc3Qg eyByZXR1cm4gbV9yYXdBdHRyaWJ1dGVzLm1heGltdW1TY2FsZTsgfQotICAgIGZsb2F0IGN1cnJl bnRDb250ZW50c1NjYWxlKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50c1NjYWxlOyB9CisgICAg ZmxvYXQgY3VycmVudENvbnRlbnRzU2NhbGUoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VTY2FsZUZh Y3RvcjsgfQogCiAgICAgdm9pZCBzZXRIYWRVc2VySW50ZXJhY3Rpb24oYm9vbCBkaWRVc2VySW50 ZXJhY3QpIHsgbV9oYWRVc2VySW50ZXJhY3Rpb24gPSBkaWRVc2VySW50ZXJhY3Q7IH0KIApAQCAt MTA2LDcgKzEwNiw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIG1fY29udGVu dHNTaXplOwogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX3ZpZXdwb3J0U2l6ZTsKICAgICBXZWJD b3JlOjpJbnRTaXplIG1fY2xpZW50Q29udGVudHNTaXplOwotICAgIGZsb2F0IG1fY29udGVudHNT Y2FsZTsKKyAgICBmbG9hdCBtX3BhZ2VTY2FsZUZhY3RvcjsKIAogICAgIGJvb2wgbV9wZW5kaW5n UG9zaXRpb25DaGFuZ2U7CiAgICAgYm9vbCBtX3BlbmRpbmdTY2FsZUNoYW5nZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRFZmwuY3BwCmluZGV4IDcxOTUxY2E5ZDgwNWU3NDAwM2U3MmUzNTFkMzRj ZmE0YmUyMWE5YmIuLmJjMTQxNzY3ZjcxOTlmNjFjYzc2ZTNjZGJhN2IzMzc5M2FmYzljNGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJv bGxlckNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcApAQCAtNjQsNyArNjQsNyBAQCB2b2lkIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnVwZGF0ZVZpZXdwb3J0U2l6ZSgpCiAgICAg QVNTRVJUKG1fY29udHJvbGxlcik7CiAgICAgRmxvYXRTaXplIHNpemUgPSBtX3ZpZXdJbXBsLT5z aXplKCk7CiAgICAgLy8gVGhlIHZpZXdwb3J0IGNvbnRyb2xsZXIgZXhwZWN0cyBzaXplcyBpbiBV SSB1bml0cywgYW5kIG5vdCByYXcgZGV2aWNlIHVuaXRzLgotICAgIHNpemUuc2NhbGUoMSAvIG1f Y29udHJvbGxlci0+ZGV2aWNlUGl4ZWxSYXRpbygpKTsKKyAgICBzaXplLnNjYWxlKDEgLyBtX2Nv bnRyb2xsZXItPmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgIG1fY29udHJvbGxlci0+ZGlkQ2hh bmdlVmlld3BvcnRTaXplKHNpemUpOwogfQogCg== 182010 2013-01-09 16:40:17 -0800 2013-01-09 16:41:56 -0800 Patch bug-106499-20130110093700.patch text/plain 16293 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWNmNzg0N2JkYWFlNmM0 NjRlMmNlYmYxMDQ5NjdlZWYxNWVkZDQ0OC4uZDJmZDJhZDhlMzU0MWJiY2YyZDQxNDcyYTMwZmVj ODAyZDQ2ZDRlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEzLTAxLTA5ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIFtRVF1bRUZM XVtXSzJdIFJlbmFtZSBzY2FsZSBtZW1iZXJzIGluIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY0OTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgZnJv bSBtX2NvbnRlbnRzU2NhbGUgdG8gbV9wYWdlU2NhbGVGYWN0b3IgYW5kIGZyb20gZGV2aWNlUGl4 ZWxSYXRpbygpIHRvCisgICAgICAgIGRldmljZVNjYWxlRmFjdG9yKCkgdG8gbWF0Y2ggdGVybXMg b2YgV2ViQ29yZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5j cHA6CisgICAgICAgIChRUXVpY2tXZWJQYWdlOjp1cGRhdGVQYWludE5vZGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3QuY3BwOgorICAgICAgICAoUVdlYktpdFRlc3Q6 OmRldmljZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0 ZXN0X3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OlBhZ2VWaWV3cG9ydENv bnRyb2xsZXIpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkZXZp Y2VTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6 OnBpeGVsQWxpZ25lZEZsb2F0UG9pbnQpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRD b250cm9sbGVyOjpib3VuZENvbnRlbnRzUG9zaXRpb24pOgorICAgICAgICAoV2ViS2l0OjpQYWdl Vmlld3BvcnRDb250cm9sbGVyOjpkaWRSZW5kZXJGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZUNvbnRlbnRzVmlzaWJpbGl0eSk6CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnN5bmNWaXNpYmxlQ29udGVudHMp OgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjp2aXNpYmxlQ29udGVu dHNTaXplKToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6YXBwbHlT Y2FsZUFmdGVyUmVuZGVyaW5nQ29udGVudHMpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3Bv cnRDb250cm9sbGVyOjp1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCk6CisgICAgICAgICogVUlQcm9j ZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaDoKKyAgICAgICAgKFBhZ2VWaWV3cG9ydENvbnRy b2xsZXIpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpjdXJyZW50 Q29udGVudHNTY2FsZSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJv bGxlckNsaWVudEVmbDo6dXBkYXRlVmlld3BvcnRTaXplKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv cXQvUXRXZWJQYWdlU0dOb2RlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29udGVudHNTR05vZGU6 OnJlbmRlcik6CisgICAgICAgIChXZWJLaXQ6OkNvbnRlbnRzU0dOb2RlOjpjbGlwUmVjdCk6Cisg ICAgICAgIChXZWJLaXQ6OlF0V2ViUGFnZVNHTm9kZTo6UXRXZWJQYWdlU0dOb2RlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlU0dOb2RlLmg6CisgICAgICAgIChXZWJLaXQ6OlF0 V2ViUGFnZVNHTm9kZTo6ZGV2aWNlU2NhbGVGYWN0b3IpOgorICAgICAgICAoV2ViS2l0OjpRdFdl YlBhZ2VTR05vZGU6OnNldERldmljZVBpeGVsUmF0aW8pOgorICAgICAgICAoUXRXZWJQYWdlU0dO b2RlKToKKwogMjAxMy0wMS0wOSAgS2lyYW4gTXVwcGFsYSAgPGNtdXBwYWxhQGFwcGxlLmNvbT4K IAogICAgICAgICBBZGQgdXNlciBkZWZhdWx0cyB0byBvdmVycmlkZSBzeXN0ZW0gcHJveHkgc2V0 dGluZ3MgZm9yIE5ldHdvcmtQcm9jZXNzIG9uIE1hYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKaW5kZXggZmEwMTNhZjUzNzY4MGE0MmIz OTM5ZjdjMjhlZjcwOGE2ZWZkYTBjZC4uNzNlNDY2YTliN2UzZWY0YjNlNTBmNGNkNzllZTZhMzM0 N2I1OGJjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVp Y2t3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnBhZ2UuY3BwCkBAIC05NSwxMSArOTUsMTEgQEAgUVNHTm9kZSogUVF1aWNrV2ViUGFnZTo6 dXBkYXRlUGFpbnROb2RlKFFTR05vZGUqIG9sZE5vZGUsIFVwZGF0ZVBhaW50Tm9kZURhdGEqKQog ICAgIGNvbnN0IFFXaW5kb3cqIHdpbmRvdyA9IHRoaXMtPndpbmRvdygpOwogICAgIEFTU0VSVCh3 aW5kb3cpOwogCi0gICAgaWYgKHdpbmRvdyAmJiBkLT53ZWJQYWdlUHJveHktPmRldmljZVNjYWxl RmFjdG9yKCkgIT0gd2luZG93LT5kZXZpY2VQaXhlbFJhdGlvKCkpIHsKLSAgICAgICAgZC0+d2Vi UGFnZVByb3h5LT5zZXRJbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3Rvcih3aW5kb3ctPmRldmljZVBp eGVsUmF0aW8oKSk7CisgICAgaWYgKHdpbmRvdyAmJiBkLT53ZWJQYWdlUHJveHktPmRldmljZVNj YWxlRmFjdG9yKCkgIT0gd2luZG93LT5kZXZpY2VTY2FsZUZhY3RvcigpKSB7CisgICAgICAgIGQt PndlYlBhZ2VQcm94eS0+c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3Iod2luZG93LT5kZXZp Y2VTY2FsZUZhY3RvcigpKTsKICAgICAgICAgLy8gVGhpcyBzaWduYWwgaXMgcXVldWVkIHNpbmNl IGlmIHdlIGFyZSBydW5uaW5nIGEgdGhyZWFkZWQgcmVuZGVyZXIuIFRoaXMgbWlnaHQgY2F1c2Ug ZmFpbHVyZXMKICAgICAgICAgLy8gaWYgdGVzdHMgYXJlIHJlYWRpbmcgdGhlIG5ldyB2YWx1ZSBi ZXR3ZWVuIHRoZSBwcm9wZXJ0eSBjaGFuZ2UgYW5kIHRoZSBzaWduYWwgZW1pc3Npb24uCi0gICAg ICAgIGVtaXQgZC0+dmlld3BvcnRJdGVtLT5leHBlcmltZW50YWwoKS0+dGVzdCgpLT5kZXZpY2VQ aXhlbFJhdGlvQ2hhbmdlZCgpOworICAgICAgICBlbWl0IGQtPnZpZXdwb3J0SXRlbS0+ZXhwZXJp bWVudGFsKCktPnRlc3QoKS0+ZGV2aWNlU2NhbGVGYWN0b3JDaGFuZ2VkKCk7CiAgICAgfQogCiAg ICAgaWYgKCFub2RlKQpAQCAtMTA4LDcgKzEwOCw3IEBAIFFTR05vZGUqIFFRdWlja1dlYlBhZ2U6 OnVwZGF0ZVBhaW50Tm9kZShRU0dOb2RlKiBvbGROb2RlLCBVcGRhdGVQYWludE5vZGVEYXRhKikK ICAgICBub2RlLT5zZXRSZW5kZXJlcihyZW5kZXJlcik7CiAKICAgICBub2RlLT5zZXRTY2FsZShk LT5jb250ZW50c1NjYWxlKTsKLSAgICBub2RlLT5zZXREZXZpY2VQaXhlbFJhdGlvKHdpbmRvdy0+ ZGV2aWNlUGl4ZWxSYXRpbygpKTsKKyAgICBub2RlLT5zZXREZXZpY2VQaXhlbFJhdGlvKHdpbmRv dy0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgUUNvbG9yIGJhY2tncm91bmRDb2xvciA9IGQt PndlYlBhZ2VQcm94eS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSA/IFF0Ojp0cmFuc3Bh cmVudCA6IFF0Ojp3aGl0ZTsKICAgICBRUmVjdEYgYmFja2dyb3VuZFJlY3QoUVBvaW50RigwLCAw KSwgZC0+Y29udGVudHNTaXplKTsKICAgICBub2RlLT5zZXRCYWNrZ3JvdW5kKGJhY2tncm91bmRS ZWN0LCBiYWNrZ3JvdW5kQ29sb3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3F3ZWJraXR0ZXN0LmNwcAppbmRleCBhOGE5YzY4NmI3YWQ1ZTgxZGE1YmFhNjFjNzBhODQ4 OTcxMzU0NTEyLi4xY2JlNmIzNGE1NzFlMmU1OWJlNWFmZTEyYTZjM2QyZTdkNzM1ODQwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0LmNwcApAQCAt MTYzLDEwICsxNjMsMTAgQEAgUUpzb25PYmplY3QgUVdlYktpdFRlc3Q6OnZpZXdwb3J0KCkgY29u c3QKICAgICByZXR1cm4gdmlld3BvcnREYXRhOwogfQogCi1RVmFyaWFudCBRV2ViS2l0VGVzdDo6 ZGV2aWNlUGl4ZWxSYXRpbygpIGNvbnN0CitRVmFyaWFudCBRV2ViS2l0VGVzdDo6ZGV2aWNlU2Nh bGVGYWN0b3IoKSBjb25zdAogewogICAgIGlmIChjb25zdCBQYWdlVmlld3BvcnRDb250cm9sbGVy KiBjb25zdCB2aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0Q29udHJvbGxlcigp KQotICAgICAgICByZXR1cm4gdmlld3BvcnQtPmRldmljZVBpeGVsUmF0aW8oKTsKKyAgICAgICAg cmV0dXJuIHZpZXdwb3J0LT5kZXZpY2VTY2FsZUZhY3RvcigpOwogICAgIHJldHVybiAxLjA7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRl c3RfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmgK aW5kZXggNWNiZGRkZDU0NDhmZGFkZDRhZGQzMDkyMjI3OTJjNmQ3NTkyMGU1OS4uZjMzNjJmNmY4 OWJkNmZjMTk1ZDc2MjY2NmFlNDdmNWRmYjNiNDBjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmgKQEAgLTQwLDE0ICs0MCwxNCBAQCBjbGFz cyBRV0VCS0lUX0VYUE9SVCBRV2ViS2l0VGVzdCA6IHB1YmxpYyBRT2JqZWN0IHsKIAogICAgIFFf UFJPUEVSVFkoUVZhcmlhbnQgY29udGVudHNTY2FsZSBSRUFEIGNvbnRlbnRzU2NhbGUgTk9USUZZ IGNvbnRlbnRzU2NhbGVDaGFuZ2VkKQogCi0gICAgUV9QUk9QRVJUWShRVmFyaWFudCBkZXZpY2VQ aXhlbFJhdGlvIFJFQUQgZGV2aWNlUGl4ZWxSYXRpbyBOT1RJRlkgZGV2aWNlUGl4ZWxSYXRpb0No YW5nZWQpCisgICAgUV9QUk9QRVJUWShRVmFyaWFudCBkZXZpY2VTY2FsZUZhY3RvciBSRUFEIGRl dmljZVNjYWxlRmFjdG9yIE5PVElGWSBkZXZpY2VTY2FsZUZhY3RvckNoYW5nZWQpCiAgICAgUV9Q Uk9QRVJUWShRSnNvbk9iamVjdCB2aWV3cG9ydCBSRUFEIHZpZXdwb3J0IE5PVElGWSB2aWV3cG9y dENoYW5nZWQpCiAKIFFfU0lHTkFMUzoKICAgICB2b2lkIGNvbnRlbnRzU2l6ZUNoYW5nZWQoKTsK ICAgICB2b2lkIGNvbnRlbnRzU2NhbGVDaGFuZ2VkKCk7CiAgICAgdm9pZCBjb250ZW50c1NjYWxl Q29tbWl0dGVkKCk7Ci0gICAgdm9pZCBkZXZpY2VQaXhlbFJhdGlvQ2hhbmdlZCgpOworICAgIHZv aWQgZGV2aWNlU2NhbGVGYWN0b3JDaGFuZ2VkKCk7CiAgICAgdm9pZCB2aWV3cG9ydENoYW5nZWQo KTsKIAogcHVibGljIFFfU0xPVFM6CkBAIC02NCw3ICs2NCw3IEBAIHB1YmxpYzoKICAgICBRU2l6 ZSBjb250ZW50c1NpemUoKSBjb25zdDsKICAgICBRVmFyaWFudCBjb250ZW50c1NjYWxlKCkgY29u c3Q7CiAKLSAgICBRVmFyaWFudCBkZXZpY2VQaXhlbFJhdGlvKCkgY29uc3Q7CisgICAgUVZhcmlh bnQgZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdDsKICAgICBRSnNvbk9iamVjdCB2aWV3cG9ydCgp IGNvbnN0OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCmluZGV4IDEyNzFiOThhYWY2ODMzZGYzOTA4ZDIyZWNj ZGZjMDI5YmMxYmUyMzAuLjI1ZTNiZjQxYTQ0YjY3Y2M5ZjBkYjhiMzk4NjEwMTc3OWNkNTAxOGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9s bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJv bGxlci5jcHAKQEAgLTQ3LDcgKzQ3LDcgQEAgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6UGFnZVZp ZXdwb3J0Q29udHJvbGxlcihXZWJLaXQ6OldlYlBhZ2VQcm94eSogcHJveHksIFBhZ2UKICAgICAs IG1faW5pdGlhbGx5Rml0VG9WaWV3cG9ydCh0cnVlKQogICAgICwgbV9oYXNTdXNwZW5kZWRDb250 ZW50KGZhbHNlKQogICAgICwgbV9oYWRVc2VySW50ZXJhY3Rpb24oZmFsc2UpCi0gICAgLCBtX2Nv bnRlbnRzU2NhbGUoMSkKKyAgICAsIG1fcGFnZVNjYWxlRmFjdG9yKDEpCiAgICAgLCBtX3BlbmRp bmdQb3NpdGlvbkNoYW5nZShmYWxzZSkKICAgICAsIG1fcGVuZGluZ1NjYWxlQ2hhbmdlKGZhbHNl KQogewpAQCAtODIsNyArODIsNyBAQCBmbG9hdCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpvdXRl ckJvdW5kZWRWaWV3cG9ydFNjYWxlKGZsb2F0IHZpZXdwb3J0U2NhbGUpIGNvbgogICAgIHJldHVy biBpbm5lckJvdW5kZWRWaWV3cG9ydFNjYWxlKHZpZXdwb3J0U2NhbGUpOwogfQogCi1mbG9hdCBQ YWdlVmlld3BvcnRDb250cm9sbGVyOjpkZXZpY2VQaXhlbFJhdGlvKCkgY29uc3QKK2Zsb2F0IFBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6OmRldmljZVNjYWxlRmFjdG9yKCkgY29uc3QKIHsKICAgICBy ZXR1cm4gbV93ZWJQYWdlUHJveHktPmRldmljZVNjYWxlRmFjdG9yKCk7CiB9CkBAIC05NSwxOCAr OTUsMTggQEAgc3RhdGljIGlubGluZSBib29sIGlzSW50ZWdyYWwoZmxvYXQgdmFsdWUpCiBGbG9h dFBvaW50IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnBpeGVsQWxpZ25lZEZsb2F0UG9pbnQoY29u c3QgRmxvYXRQb2ludCYgZnJhbWVQb3NpdGlvbikKIHsKICNpZiBQTEFURk9STShFRkwpCi0gICAg aWYgKCFpc0ludGVncmFsKG1fY29udGVudHNTY2FsZSkpIHsKKyAgICBpZiAoIWlzSW50ZWdyYWwo bV9wYWdlU2NhbGVGYWN0b3IpKSB7CiAgICAgICAgIC8vIFRvIGF2b2lkIGJsdXJyeW5lc3MsIG1v ZGlmeSB0aGUgcG9zaXRpb24gc28gdGhhdCBpdCBtYXBzIGludG8gYSBkaXNjcmV0ZSBkZXZpY2Ug cG9zaXRpb24uCiAgICAgICAgIEZsb2F0UG9pbnQgc2NhbGVkUG9zKGZyYW1lUG9zaXRpb24pOwog CiAgICAgICAgIC8vIFNjYWxlIGJ5IHRoZSBlZmZlY3RpdmUgc2NhbGUgZmFjdG9yIHRvIGNvbXB1 dGUgdGhlIHNjcmVlbi1yZWxhdGl2ZSBwb3NpdGlvbi4KLSAgICAgICAgc2NhbGVkUG9zLnNjYWxl KG1fY29udGVudHNTY2FsZSwgbV9jb250ZW50c1NjYWxlKTsKKyAgICAgICAgc2NhbGVkUG9zLnNj YWxlKG1fcGFnZVNjYWxlRmFjdG9yLCBtX3BhZ2VTY2FsZUZhY3Rvcik7CiAKICAgICAgICAgLy8g Um91bmQgdG8gaW50ZWdlciBib3VuZGFyaWVzLgogICAgICAgICBGbG9hdFBvaW50IGFsaWduZWRQ b3MgPSByb3VuZGVkSW50UG9pbnQoc2NhbGVkUG9zKTsKIAogICAgICAgICAvLyBDb252ZXJ0IGJh Y2sgdG8gQ1NTIGNvb3JkaW5hdGVzLgotICAgICAgICBhbGlnbmVkUG9zLnNjYWxlKDEgLyBtX2Nv bnRlbnRzU2NhbGUsIDEgLyBtX2NvbnRlbnRzU2NhbGUpOworICAgICAgICBhbGlnbmVkUG9zLnNj YWxlKDEgLyBtX3BhZ2VTY2FsZUZhY3RvciwgMSAvIG1fcGFnZVNjYWxlRmFjdG9yKTsKIAogICAg ICAgICByZXR1cm4gYWxpZ25lZFBvczsKICAgICB9CkBAIC0xMzMsNyArMTMzLDcgQEAgRmxvYXRQ b2ludCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpib3VuZENvbnRlbnRzUG9zaXRpb25BdFNjYWxl KGNvbnN0IFdlYkNvcmU6OkYKIAogRmxvYXRQb2ludCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpi b3VuZENvbnRlbnRzUG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgZnJhbWVQb3Np dGlvbikKIHsKLSAgICByZXR1cm4gYm91bmRDb250ZW50c1Bvc2l0aW9uQXRTY2FsZShmcmFtZVBv c2l0aW9uLCBtX2NvbnRlbnRzU2NhbGUpOworICAgIHJldHVybiBib3VuZENvbnRlbnRzUG9zaXRp b25BdFNjYWxlKGZyYW1lUG9zaXRpb24sIG1fcGFnZVNjYWxlRmFjdG9yKTsKIH0KIAogdm9pZCBQ YWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDb21taXRMb2FkKCkKQEAgLTE4OSw3ICsxODksNyBA QCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZFJlbmRlckZyYW1lKGNvbnN0IEludFNp emUmIGNvbnRlbnRzU2l6ZSwgY29uc3QgSQogCiAgICAgaWYgKG1fcGVuZGluZ1NjYWxlQ2hhbmdl KSB7CiAgICAgICAgIG1fcGVuZGluZ1NjYWxlQ2hhbmdlID0gZmFsc2U7Ci0gICAgICAgIG1fY2xp ZW50LT5zZXRDb250ZW50c1NjYWxlKG1fY29udGVudHNTY2FsZSk7CisgICAgICAgIG1fY2xpZW50 LT5zZXRDb250ZW50c1NjYWxlKG1fcGFnZVNjYWxlRmFjdG9yKTsKIAogICAgICAgICAvLyBUaGUg c2NhbGUgY2hhbmdlZCwgd2UgaGF2ZSB0byByZS1waXhlbCBhbGlnbi4KICAgICAgICAgbV9wZW5k aW5nUG9zaXRpb25DaGFuZ2UgPSB0cnVlOwpAQCAtMjU2LDcgKzI1Niw3IEBAIHZvaWQgUGFnZVZp ZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlQ29udGVudHNWaXNpYmlsaXR5KGNvbnN0IEZsb2F0 UG9pbnQmIHBvc2l0CiAgICAgaWYgKCFtX3BlbmRpbmdQb3NpdGlvbkNoYW5nZSkKICAgICAgICAg bV9jb250ZW50c1Bvc2l0aW9uID0gcG9zaXRpb247CiAgICAgaWYgKCFtX3BlbmRpbmdTY2FsZUNo YW5nZSkKLSAgICAgICAgbV9jb250ZW50c1NjYWxlID0gc2NhbGU7CisgICAgICAgIG1fcGFnZVNj YWxlRmFjdG9yID0gc2NhbGU7CiAKICAgICBzeW5jVmlzaWJsZUNvbnRlbnRzKHRyYWplY3RvcnlW ZWN0b3IpOwogfQpAQCAtMjY5LDcgKzI2OSw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxl cjo6c3luY1Zpc2libGVDb250ZW50cyhjb25zdCBGbG9hdFBvaW50JiB0cmFqZWN0b3J5VmVjCiAK ICAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRzUmVjdChib3VuZENvbnRlbnRzUG9zaXRpb24o bV9jb250ZW50c1Bvc2l0aW9uKSwgdmlzaWJsZUNvbnRlbnRzU2l6ZSgpKTsKICAgICB2aXNpYmxl Q29udGVudHNSZWN0LmludGVyc2VjdChGbG9hdFJlY3QoRmxvYXRQb2ludDo6emVybygpLCBtX2Nv bnRlbnRzU2l6ZSkpOwotICAgIGRyYXdpbmdBcmVhLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KHZp c2libGVDb250ZW50c1JlY3QsIG1fY29udGVudHNTY2FsZSwgdHJhamVjdG9yeVZlY3Rvcik7Cisg ICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZUNvbnRlbnRzUmVj dCwgbV9wYWdlU2NhbGVGYWN0b3IsIHRyYWplY3RvcnlWZWN0b3IpOwogCiAgICAgbV9jbGllbnQt PmRpZENoYW5nZVZpc2libGVDb250ZW50cygpOwogfQpAQCAtMjk5LDcgKzI5OSw3IEBAIHZvaWQg UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKGNvbnN0 IFdlYkNvcmU6OlZpZXdwb3J0CiAKIEZsb2F0U2l6ZSBQYWdlVmlld3BvcnRDb250cm9sbGVyOjp2 aXNpYmxlQ29udGVudHNTaXplKCkgY29uc3QKIHsKLSAgICByZXR1cm4gRmxvYXRTaXplKG1fdmll d3BvcnRTaXplLndpZHRoKCkgLyBtX2NvbnRlbnRzU2NhbGUsIG1fdmlld3BvcnRTaXplLmhlaWdo dCgpIC8gbV9jb250ZW50c1NjYWxlKTsKKyAgICByZXR1cm4gRmxvYXRTaXplKG1fdmlld3BvcnRT aXplLndpZHRoKCkgLyBtX3BhZ2VTY2FsZUZhY3RvciwgbV92aWV3cG9ydFNpemUuaGVpZ2h0KCkg LyBtX3BhZ2VTY2FsZUZhY3Rvcik7CiB9CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6 c3VzcGVuZENvbnRlbnQoKQpAQCAtMzI0LDcgKzMyNCw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29u dHJvbGxlcjo6cmVzdW1lQ29udGVudCgpCiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6 YXBwbHlTY2FsZUFmdGVyUmVuZGVyaW5nQ29udGVudHMoZmxvYXQgc2NhbGUpCiB7Ci0gICAgbV9j b250ZW50c1NjYWxlID0gc2NhbGU7CisgICAgbV9wYWdlU2NhbGVGYWN0b3IgPSBzY2FsZTsKICAg ICBtX3BlbmRpbmdTY2FsZUNoYW5nZSA9IHRydWU7CiAgICAgc3luY1Zpc2libGVDb250ZW50cygp OwogfQpAQCAtMzQxLDcgKzM0MSw3IEBAIGJvb2wgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBk YXRlTWluaW11bVNjYWxlVG9GaXQoYm9vbCB1c2VySW5pdGlhdGVkVXBkYXRlKQogICAgIGlmICht X3ZpZXdwb3J0U2l6ZS5pc0VtcHR5KCkgfHwgbV9jb250ZW50c1NpemUuaXNFbXB0eSgpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBib29sIGN1cnJlbnRseVNjYWxlZFRvRml0ID0gZnV6 enlDb21wYXJlKG1fY29udGVudHNTY2FsZSwgbV9taW5pbXVtU2NhbGVUb0ZpdCwgMC4wMDAxKTsK KyAgICBib29sIGN1cnJlbnRseVNjYWxlZFRvRml0ID0gZnV6enlDb21wYXJlKG1fcGFnZVNjYWxl RmFjdG9yLCBtX21pbmltdW1TY2FsZVRvRml0LCAwLjAwMDEpOwogCiAgICAgZmxvYXQgbWluaW11 bVNjYWxlID0gV2ViQ29yZTo6Y29tcHV0ZU1pbmltdW1TY2FsZUZhY3RvckZvckNvbnRlbnRDb250 YWluZWQobV9yYXdBdHRyaWJ1dGVzLCBXZWJDb3JlOjpyb3VuZGVkSW50U2l6ZShtX3ZpZXdwb3J0 U2l6ZSksIFdlYkNvcmU6OnJvdW5kZWRJbnRTaXplKG1fY29udGVudHNTaXplKSwgMSk7CiAKQEAg LTM1Niw4ICszNTYsOCBAQCBib29sIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnVwZGF0ZU1pbmlt dW1TY2FsZVRvRml0KGJvb2wgdXNlckluaXRpYXRlZFVwZGF0ZSkKICAgICAgICAgICAgICAgICBh cHBseVNjYWxlQWZ0ZXJSZW5kZXJpbmdDb250ZW50cyhtX21pbmltdW1TY2FsZVRvRml0KTsKICAg ICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIC8vIEVuc3VyZSB0aGUgZWZmZWN0aXZl IHNjYWxlIHN0YXlzIHdpdGhpbiBib3VuZHMuCi0gICAgICAgICAgICAgICAgZmxvYXQgYm91bmRl ZFNjYWxlID0gaW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZShtX2NvbnRlbnRzU2NhbGUpOwotICAg ICAgICAgICAgICAgIGlmICghZnV6enlDb21wYXJlKGJvdW5kZWRTY2FsZSwgbV9jb250ZW50c1Nj YWxlLCAwLjAwMDEpKQorICAgICAgICAgICAgICAgIGZsb2F0IGJvdW5kZWRTY2FsZSA9IGlubmVy Qm91bmRlZFZpZXdwb3J0U2NhbGUobV9wYWdlU2NhbGVGYWN0b3IpOworICAgICAgICAgICAgICAg IGlmICghZnV6enlDb21wYXJlKGJvdW5kZWRTY2FsZSwgbV9wYWdlU2NhbGVGYWN0b3IsIDAuMDAw MSkpCiAgICAgICAgICAgICAgICAgICAgIGFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRz KGJvdW5kZWRTY2FsZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCmluZGV4IGYzODMxMTFk ZmNlMzQ0NDAzY2MyNTExMDY0OTkxMjZmNDcxZWNkYTQuLjJiNTk2MThlZjc3ZDgxMmUyM2M2ZmIx YWE2NDZmNGFmYmFiYWMxNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuaApAQCAtNjUsMTAgKzY1LDEwIEBAIHB1YmxpYzoKICAgICBi b29sIGFsbG93c1VzZXJTY2FsaW5nKCkgY29uc3QgeyByZXR1cm4gbV9hbGxvd3NVc2VyU2NhbGlu ZzsgfQogCiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIGNvbnRlbnRzTGF5b3V0U2l6ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fcmF3QXR0cmlidXRlcy5sYXlvdXRTaXplOyB9Ci0gICAgZmxvYXQgZGV2aWNl UGl4ZWxSYXRpbygpIGNvbnN0OworICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgY29uc3Q7 CiAgICAgZmxvYXQgbWluaW11bUNvbnRlbnRzU2NhbGUoKSBjb25zdCB7IHJldHVybiBtX21pbmlt dW1TY2FsZVRvRml0OyB9CiAgICAgZmxvYXQgbWF4aW11bUNvbnRlbnRzU2NhbGUoKSBjb25zdCB7 IHJldHVybiBtX3Jhd0F0dHJpYnV0ZXMubWF4aW11bVNjYWxlOyB9Ci0gICAgZmxvYXQgY3VycmVu dENvbnRlbnRzU2NhbGUoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRzU2NhbGU7IH0KKyAgICBm bG9hdCBjdXJyZW50Q29udGVudHNTY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZVNjYWxlRmFj dG9yOyB9CiAKICAgICB2b2lkIHNldEhhZFVzZXJJbnRlcmFjdGlvbihib29sIGRpZFVzZXJJbnRl cmFjdCkgeyBtX2hhZFVzZXJJbnRlcmFjdGlvbiA9IGRpZFVzZXJJbnRlcmFjdDsgfQogCkBAIC0x MDYsNyArMTA2LDcgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpGbG9hdFNpemUgbV9jb250ZW50 c1NpemU7CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIG1fdmlld3BvcnRTaXplOwogICAgIFdlYkNv cmU6OkludFNpemUgbV9jbGllbnRDb250ZW50c1NpemU7Ci0gICAgZmxvYXQgbV9jb250ZW50c1Nj YWxlOworICAgIGZsb2F0IG1fcGFnZVNjYWxlRmFjdG9yOwogCiAgICAgYm9vbCBtX3BlbmRpbmdQ b3NpdGlvbkNoYW5nZTsKICAgICBib29sIG1fcGVuZGluZ1NjYWxlQ2hhbmdlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudEVmbC5jcHAKaW5kZXggNzE5NTFjYTlkODA1ZTc0MDAzZTcyZTM1MWQzNGNm YTRiZTIxYTliYi4uYmMxNDE3NjdmNzE5OWY2MWNjNzZlM2NkYmE3YjMzNzkzYWZjOWM0ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9s bGVyQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCkBAIC02NCw3ICs2NCw3IEBAIHZvaWQgUGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6dXBkYXRlVmlld3BvcnRTaXplKCkKICAgICBB U1NFUlQobV9jb250cm9sbGVyKTsKICAgICBGbG9hdFNpemUgc2l6ZSA9IG1fdmlld0ltcGwtPnNp emUoKTsKICAgICAvLyBUaGUgdmlld3BvcnQgY29udHJvbGxlciBleHBlY3RzIHNpemVzIGluIFVJ IHVuaXRzLCBhbmQgbm90IHJhdyBkZXZpY2UgdW5pdHMuCi0gICAgc2l6ZS5zY2FsZSgxIC8gbV9j b250cm9sbGVyLT5kZXZpY2VQaXhlbFJhdGlvKCkpOworICAgIHNpemUuc2NhbGUoMSAvIG1fY29u dHJvbGxlci0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgbV9jb250cm9sbGVyLT5kaWRDaGFu Z2VWaWV3cG9ydFNpemUoc2l6ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFdlYlBhZ2VTR05vZGUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViUGFnZVNHTm9kZS5jcHAKaW5kZXggZjUzNmM0MjE3NjVmMmI2NjY2YzYzMGQzMWJh MzM0MjhhOTU2OTcyOS4uN2IxZGY0NTg5NTliNDUyYmQwMmRkYjVlOTMwYWFlZjk1ZmE4MDZiNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVNHTm9kZS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVNHTm9kZS5jcHAK QEAgLTQ5LDggKzQ5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZW5kZXIoY29uc3Qg UmVuZGVyU3RhdGUmIHN0YXRlKQogICAgIHsKICAgICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXgg cmVuZGVyTWF0cml4OwotICAgICAgICBpZiAocGFnZU5vZGUoKS0+ZGV2aWNlUGl4ZWxSYXRpbygp ICE9IDEuMCkgewotICAgICAgICAgICAgcmVuZGVyTWF0cml4LnNjYWxlKHBhZ2VOb2RlKCktPmRl dmljZVBpeGVsUmF0aW8oKSk7CisgICAgICAgIGlmIChwYWdlTm9kZSgpLT5kZXZpY2VTY2FsZUZh Y3RvcigpICE9IDEuMCkgeworICAgICAgICAgICAgcmVuZGVyTWF0cml4LnNjYWxlKHBhZ2VOb2Rl KCktPmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgICAgICAgICAgaWYgKG1hdHJpeCgpKQogICAg ICAgICAgICAgICAgIHJlbmRlck1hdHJpeC5tdWx0aXBseSgqbWF0cml4KCkpOwogICAgICAgICB9 IGVsc2UgaWYgKG1hdHJpeCgpKQpAQCAtODcsOCArODcsOCBAQCBwcml2YXRlOgogCiAgICAgICAg IGZvciAoY29uc3QgUVNHQ2xpcE5vZGUqIGNsaXAgPSBjbGlwTGlzdCgpOyBjbGlwOyBjbGlwID0g Y2xpcC0+Y2xpcExpc3QoKSkgewogICAgICAgICAgICAgUU1hdHJpeDR4NCBjbGlwTWF0cml4Owot ICAgICAgICAgICAgaWYgKHBhZ2VOb2RlKCktPmRldmljZVBpeGVsUmF0aW8oKSAhPSAxLjApIHsK LSAgICAgICAgICAgICAgICBjbGlwTWF0cml4LnNjYWxlKHBhZ2VOb2RlKCktPmRldmljZVBpeGVs UmF0aW8oKSk7CisgICAgICAgICAgICBpZiAocGFnZU5vZGUoKS0+ZGV2aWNlU2NhbGVGYWN0b3Io KSAhPSAxLjApIHsKKyAgICAgICAgICAgICAgICBjbGlwTWF0cml4LnNjYWxlKHBhZ2VOb2RlKCkt PmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgICAgICAgICAgICAgIGlmIChjbGlwLT5tYXRyaXgo KSkKICAgICAgICAgICAgICAgICAgICAgY2xpcE1hdHJpeCAqPSAoKmNsaXAtPm1hdHJpeCgpKTsK ICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2xpcC0+bWF0cml4KCkpCkBAIC0xMzIsNyArMTMyLDcg QEAgcHJpdmF0ZToKIFF0V2ViUGFnZVNHTm9kZTo6UXRXZWJQYWdlU0dOb2RlKCkKICAgICA6IG1f Y29udGVudHNOb2RlKDApCiAgICAgLCBtX2JhY2tncm91bmROb2RlKG5ldyBRU0dTaW1wbGVSZWN0 Tm9kZSkKLSAgICAsIG1fZGV2aWNlUGl4ZWxSYXRpbygxKQorICAgICwgbV9kZXZpY2VTY2FsZUZh Y3RvcigxKQogewogICAgIGFwcGVuZENoaWxkTm9kZShtX2JhY2tncm91bmROb2RlKTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VTR05vZGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VTR05vZGUuaAppbmRleCAxYmNj MjhlNDM5OTAyZjU5ZmRjODQ5ZDQwNzY4NmUxNTAzODE4OGIyLi45NTRkMzY1OTRmZmZjNWMxYWJm NDEyYzE3MTA0YWZkNmU2OTI3YzlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRXZWJQYWdlU0dOb2RlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0V2ViUGFnZVNHTm9kZS5oCkBAIC00MCwxMyArNDAsMTMgQEAgY2xhc3MgUXRXZWJQYWdlU0dO b2RlIDogcHVibGljIFFTR1RyYW5zZm9ybU5vZGUgewogICAgICAgICB2b2lkIHNldEJhY2tncm91 bmQoY29uc3QgUVJlY3RGJiwgY29uc3QgUUNvbG9yJik7CiAgICAgICAgIHZvaWQgc2V0U2NhbGUo ZmxvYXQpOwogICAgICAgICB2b2lkIHNldFJlbmRlcmVyKFBhc3NSZWZQdHI8TGF5ZXJUcmVlUmVu ZGVyZXI+KTsKLSAgICAgICAgcXJlYWwgZGV2aWNlUGl4ZWxSYXRpbygpIGNvbnN0IHsgcmV0dXJu IG1fZGV2aWNlUGl4ZWxSYXRpbzsgfQotICAgICAgICB2b2lkIHNldERldmljZVBpeGVsUmF0aW8o cXJlYWwgZGV2aWNlUGl4ZWxSYXRpbykgeyBtX2RldmljZVBpeGVsUmF0aW8gPSBkZXZpY2VQaXhl bFJhdGlvOyB9CisgICAgICAgIHFyZWFsIGRldmljZVNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1 cm4gbV9kZXZpY2VTY2FsZUZhY3RvcjsgfQorICAgICAgICB2b2lkIHNldERldmljZVBpeGVsUmF0 aW8ocXJlYWwgZGV2aWNlU2NhbGVGYWN0b3IpIHsgbV9kZXZpY2VTY2FsZUZhY3RvciA9IGRldmlj ZVNjYWxlRmFjdG9yOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBDb250ZW50c1NHTm9kZSog bV9jb250ZW50c05vZGU7CiAgICAgICAgIFFTR1NpbXBsZVJlY3ROb2RlKiBtX2JhY2tncm91bmRO b2RlOwotICAgICAgICBxcmVhbCBtX2RldmljZVBpeGVsUmF0aW87CisgICAgICAgIHFyZWFsIG1f ZGV2aWNlU2NhbGVGYWN0b3I7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK 182014 2013-01-09 16:44:44 -0800 2013-01-09 19:19:26 -0800 Patch bug-106499-20130110094127.patch text/plain 10091 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWNmNzg0N2JkYWFlNmM0 NjRlMmNlYmYxMDQ5NjdlZWYxNWVkZDQ0OC4uYzNkNzRkYTY2Yjc4NWIzZDU0Y2QyMjU1OGYyMjE4 M2MyMDczOGU3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAxLTA5ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIFtRVF1bRUZM XVtXSzJdIFJlbmFtZSBzY2FsZSBtZW1iZXJzIGluIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY0OTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgZnJv bSBtX2NvbnRlbnRzU2NhbGUgdG8gbV9wYWdlU2NhbGVGYWN0b3IgYW5kIGZyb20gZGV2aWNlUGl4 ZWxSYXRpbygpIHRvCisgICAgICAgIGRldmljZVNjYWxlRmFjdG9yKCkgdG8gbWF0Y2ggdGVybXMg b2YgV2ViQ29yZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3QuY3Bw OgorICAgICAgICAoUVdlYktpdFRlc3Q6OmRldmljZVBpeGVsUmF0aW8pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFn ZVZpZXdwb3J0Q29udHJvbGxlcjo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcik6CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRldmljZVNjYWxlRmFjdG9yKToKKyAgICAg ICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6cGl4ZWxBbGlnbmVkRmxvYXRQb2lu dCk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmJvdW5kQ29udGVu dHNQb3NpdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRp ZFJlbmRlckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6 ZGlkQ2hhbmdlQ29udGVudHNWaXNpYmlsaXR5KToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdw b3J0Q29udHJvbGxlcjo6c3luY1Zpc2libGVDb250ZW50cyk6CisgICAgICAgIChXZWJLaXQ6OlBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6OnZpc2libGVDb250ZW50c1NpemUpOgorICAgICAgICAoV2Vi S2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjphcHBseVNjYWxlQWZ0ZXJSZW5kZXJpbmdDb250 ZW50cyk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnVwZGF0ZU1p bmltdW1TY2FsZVRvRml0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJv bGxlci5oOgorICAgICAgICAoUGFnZVZpZXdwb3J0Q29udHJvbGxlcik6CisgICAgICAgIChXZWJL aXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmN1cnJlbnRDb250ZW50c1NjYWxlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwOgor ICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjp1cGRhdGVW aWV3cG9ydFNpemUpOgorCiAyMDEzLTAxLTA5ICBLaXJhbiBNdXBwYWxhICA8Y211cHBhbGFAYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCB1c2VyIGRlZmF1bHRzIHRvIG92ZXJyaWRlIHN5c3RlbSBw cm94eSBzZXR0aW5ncyBmb3IgTmV0d29ya1Byb2Nlc3Mgb24gTWFjCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3QuY3BwCmluZGV4IGE4YTljNjg2YjdhZDVl ODFkYTViYWE2MWM3MGE4NDg5NzEzNTQ1MTIuLjZhMjUwOGMzNDhiM2VjOGFjZWFhZTZiYWU5NDRi ZWRjYWRkNmUwNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXdlYmtpdHRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdl YmtpdHRlc3QuY3BwCkBAIC0xNjYsNyArMTY2LDcgQEAgUUpzb25PYmplY3QgUVdlYktpdFRlc3Q6 OnZpZXdwb3J0KCkgY29uc3QKIFFWYXJpYW50IFFXZWJLaXRUZXN0OjpkZXZpY2VQaXhlbFJhdGlv KCkgY29uc3QKIHsKICAgICBpZiAoY29uc3QgUGFnZVZpZXdwb3J0Q29udHJvbGxlciogY29uc3Qg dmlld3BvcnQgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydENvbnRyb2xsZXIoKSkKLSAgICAg ICAgcmV0dXJuIHZpZXdwb3J0LT5kZXZpY2VQaXhlbFJhdGlvKCk7CisgICAgICAgIHJldHVybiB2 aWV3cG9ydC0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKICAgICByZXR1cm4gMS4wOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAK aW5kZXggMTI3MWI5OGFhZjY4MzNkZjM5MDhkMjJlY2NkZmMwMjliYzFiZTIzMC4uMjVlM2JmNDFh NDRiNjdjYzlmMGRiOGIzOTg2MTAxNzc5Y2Q1MDE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcApAQCAtNDcsNyArNDcsNyBA QCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpQYWdlVmlld3BvcnRDb250cm9sbGVyKFdlYktpdDo6 V2ViUGFnZVByb3h5KiBwcm94eSwgUGFnZQogICAgICwgbV9pbml0aWFsbHlGaXRUb1ZpZXdwb3J0 KHRydWUpCiAgICAgLCBtX2hhc1N1c3BlbmRlZENvbnRlbnQoZmFsc2UpCiAgICAgLCBtX2hhZFVz ZXJJbnRlcmFjdGlvbihmYWxzZSkKLSAgICAsIG1fY29udGVudHNTY2FsZSgxKQorICAgICwgbV9w YWdlU2NhbGVGYWN0b3IoMSkKICAgICAsIG1fcGVuZGluZ1Bvc2l0aW9uQ2hhbmdlKGZhbHNlKQog ICAgICwgbV9wZW5kaW5nU2NhbGVDaGFuZ2UoZmFsc2UpCiB7CkBAIC04Miw3ICs4Miw3IEBAIGZs b2F0IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6Om91dGVyQm91bmRlZFZpZXdwb3J0U2NhbGUoZmxv YXQgdmlld3BvcnRTY2FsZSkgY29uCiAgICAgcmV0dXJuIGlubmVyQm91bmRlZFZpZXdwb3J0U2Nh bGUodmlld3BvcnRTY2FsZSk7CiB9CiAKLWZsb2F0IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRl dmljZVBpeGVsUmF0aW8oKSBjb25zdAorZmxvYXQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGV2 aWNlU2NhbGVGYWN0b3IoKSBjb25zdAogewogICAgIHJldHVybiBtX3dlYlBhZ2VQcm94eS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKTsKIH0KQEAgLTk1LDE4ICs5NSwxOCBAQCBzdGF0aWMgaW5saW5lIGJv b2wgaXNJbnRlZ3JhbChmbG9hdCB2YWx1ZSkKIEZsb2F0UG9pbnQgUGFnZVZpZXdwb3J0Q29udHJv bGxlcjo6cGl4ZWxBbGlnbmVkRmxvYXRQb2ludChjb25zdCBGbG9hdFBvaW50JiBmcmFtZVBvc2l0 aW9uKQogewogI2lmIFBMQVRGT1JNKEVGTCkKLSAgICBpZiAoIWlzSW50ZWdyYWwobV9jb250ZW50 c1NjYWxlKSkgeworICAgIGlmICghaXNJbnRlZ3JhbChtX3BhZ2VTY2FsZUZhY3RvcikpIHsKICAg ICAgICAgLy8gVG8gYXZvaWQgYmx1cnJ5bmVzcywgbW9kaWZ5IHRoZSBwb3NpdGlvbiBzbyB0aGF0 IGl0IG1hcHMgaW50byBhIGRpc2NyZXRlIGRldmljZSBwb3NpdGlvbi4KICAgICAgICAgRmxvYXRQ b2ludCBzY2FsZWRQb3MoZnJhbWVQb3NpdGlvbik7CiAKICAgICAgICAgLy8gU2NhbGUgYnkgdGhl IGVmZmVjdGl2ZSBzY2FsZSBmYWN0b3IgdG8gY29tcHV0ZSB0aGUgc2NyZWVuLXJlbGF0aXZlIHBv c2l0aW9uLgotICAgICAgICBzY2FsZWRQb3Muc2NhbGUobV9jb250ZW50c1NjYWxlLCBtX2NvbnRl bnRzU2NhbGUpOworICAgICAgICBzY2FsZWRQb3Muc2NhbGUobV9wYWdlU2NhbGVGYWN0b3IsIG1f cGFnZVNjYWxlRmFjdG9yKTsKIAogICAgICAgICAvLyBSb3VuZCB0byBpbnRlZ2VyIGJvdW5kYXJp ZXMuCiAgICAgICAgIEZsb2F0UG9pbnQgYWxpZ25lZFBvcyA9IHJvdW5kZWRJbnRQb2ludChzY2Fs ZWRQb3MpOwogCiAgICAgICAgIC8vIENvbnZlcnQgYmFjayB0byBDU1MgY29vcmRpbmF0ZXMuCi0g ICAgICAgIGFsaWduZWRQb3Muc2NhbGUoMSAvIG1fY29udGVudHNTY2FsZSwgMSAvIG1fY29udGVu dHNTY2FsZSk7CisgICAgICAgIGFsaWduZWRQb3Muc2NhbGUoMSAvIG1fcGFnZVNjYWxlRmFjdG9y LCAxIC8gbV9wYWdlU2NhbGVGYWN0b3IpOwogCiAgICAgICAgIHJldHVybiBhbGlnbmVkUG9zOwog ICAgIH0KQEAgLTEzMyw3ICsxMzMsNyBAQCBGbG9hdFBvaW50IFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXI6OmJvdW5kQ29udGVudHNQb3NpdGlvbkF0U2NhbGUoY29uc3QgV2ViQ29yZTo6RgogCiBGbG9h dFBvaW50IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmJvdW5kQ29udGVudHNQb3NpdGlvbihjb25z dCBXZWJDb3JlOjpGbG9hdFBvaW50JiBmcmFtZVBvc2l0aW9uKQogewotICAgIHJldHVybiBib3Vu ZENvbnRlbnRzUG9zaXRpb25BdFNjYWxlKGZyYW1lUG9zaXRpb24sIG1fY29udGVudHNTY2FsZSk7 CisgICAgcmV0dXJuIGJvdW5kQ29udGVudHNQb3NpdGlvbkF0U2NhbGUoZnJhbWVQb3NpdGlvbiwg bV9wYWdlU2NhbGVGYWN0b3IpOwogfQogCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRp ZENvbW1pdExvYWQoKQpAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJv bGxlcjo6ZGlkUmVuZGVyRnJhbWUoY29uc3QgSW50U2l6ZSYgY29udGVudHNTaXplLCBjb25zdCBJ CiAKICAgICBpZiAobV9wZW5kaW5nU2NhbGVDaGFuZ2UpIHsKICAgICAgICAgbV9wZW5kaW5nU2Nh bGVDaGFuZ2UgPSBmYWxzZTsKLSAgICAgICAgbV9jbGllbnQtPnNldENvbnRlbnRzU2NhbGUobV9j b250ZW50c1NjYWxlKTsKKyAgICAgICAgbV9jbGllbnQtPnNldENvbnRlbnRzU2NhbGUobV9wYWdl U2NhbGVGYWN0b3IpOwogCiAgICAgICAgIC8vIFRoZSBzY2FsZSBjaGFuZ2VkLCB3ZSBoYXZlIHRv IHJlLXBpeGVsIGFsaWduLgogICAgICAgICBtX3BlbmRpbmdQb3NpdGlvbkNoYW5nZSA9IHRydWU7 CkBAIC0yNTYsNyArMjU2LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFu Z2VDb250ZW50c1Zpc2liaWxpdHkoY29uc3QgRmxvYXRQb2ludCYgcG9zaXQKICAgICBpZiAoIW1f cGVuZGluZ1Bvc2l0aW9uQ2hhbmdlKQogICAgICAgICBtX2NvbnRlbnRzUG9zaXRpb24gPSBwb3Np dGlvbjsKICAgICBpZiAoIW1fcGVuZGluZ1NjYWxlQ2hhbmdlKQotICAgICAgICBtX2NvbnRlbnRz U2NhbGUgPSBzY2FsZTsKKyAgICAgICAgbV9wYWdlU2NhbGVGYWN0b3IgPSBzY2FsZTsKIAogICAg IHN5bmNWaXNpYmxlQ29udGVudHModHJhamVjdG9yeVZlY3Rvcik7CiB9CkBAIC0yNjksNyArMjY5 LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpzeW5jVmlzaWJsZUNvbnRlbnRzKGNv bnN0IEZsb2F0UG9pbnQmIHRyYWplY3RvcnlWZWMKIAogICAgIEZsb2F0UmVjdCB2aXNpYmxlQ29u dGVudHNSZWN0KGJvdW5kQ29udGVudHNQb3NpdGlvbihtX2NvbnRlbnRzUG9zaXRpb24pLCB2aXNp YmxlQ29udGVudHNTaXplKCkpOwogICAgIHZpc2libGVDb250ZW50c1JlY3QuaW50ZXJzZWN0KEZs b2F0UmVjdChGbG9hdFBvaW50Ojp6ZXJvKCksIG1fY29udGVudHNTaXplKSk7Ci0gICAgZHJhd2lu Z0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZUNvbnRlbnRzUmVjdCwgbV9jb250 ZW50c1NjYWxlLCB0cmFqZWN0b3J5VmVjdG9yKTsKKyAgICBkcmF3aW5nQXJlYS0+c2V0VmlzaWJs ZUNvbnRlbnRzUmVjdCh2aXNpYmxlQ29udGVudHNSZWN0LCBtX3BhZ2VTY2FsZUZhY3RvciwgdHJh amVjdG9yeVZlY3Rvcik7CiAKICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlVmlzaWJsZUNvbnRlbnRz KCk7CiB9CkBAIC0yOTksNyArMjk5LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpk aWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnQKIAogRmxv YXRTaXplIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnZpc2libGVDb250ZW50c1NpemUoKSBjb25z dAogewotICAgIHJldHVybiBGbG9hdFNpemUobV92aWV3cG9ydFNpemUud2lkdGgoKSAvIG1fY29u dGVudHNTY2FsZSwgbV92aWV3cG9ydFNpemUuaGVpZ2h0KCkgLyBtX2NvbnRlbnRzU2NhbGUpOwor ICAgIHJldHVybiBGbG9hdFNpemUobV92aWV3cG9ydFNpemUud2lkdGgoKSAvIG1fcGFnZVNjYWxl RmFjdG9yLCBtX3ZpZXdwb3J0U2l6ZS5oZWlnaHQoKSAvIG1fcGFnZVNjYWxlRmFjdG9yKTsKIH0K IAogdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpzdXNwZW5kQ29udGVudCgpCkBAIC0zMjQs NyArMzI0LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpyZXN1bWVDb250ZW50KCkK IAogdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjphcHBseVNjYWxlQWZ0ZXJSZW5kZXJpbmdD b250ZW50cyhmbG9hdCBzY2FsZSkKIHsKLSAgICBtX2NvbnRlbnRzU2NhbGUgPSBzY2FsZTsKKyAg ICBtX3BhZ2VTY2FsZUZhY3RvciA9IHNjYWxlOwogICAgIG1fcGVuZGluZ1NjYWxlQ2hhbmdlID0g dHJ1ZTsKICAgICBzeW5jVmlzaWJsZUNvbnRlbnRzKCk7CiB9CkBAIC0zNDEsNyArMzQxLDcgQEAg Ym9vbCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjp1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdChib29s IHVzZXJJbml0aWF0ZWRVcGRhdGUpCiAgICAgaWYgKG1fdmlld3BvcnRTaXplLmlzRW1wdHkoKSB8 fCBtX2NvbnRlbnRzU2l6ZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IGJvb2wgY3VycmVudGx5U2NhbGVkVG9GaXQgPSBmdXp6eUNvbXBhcmUobV9jb250ZW50c1NjYWxl LCBtX21pbmltdW1TY2FsZVRvRml0LCAwLjAwMDEpOworICAgIGJvb2wgY3VycmVudGx5U2NhbGVk VG9GaXQgPSBmdXp6eUNvbXBhcmUobV9wYWdlU2NhbGVGYWN0b3IsIG1fbWluaW11bVNjYWxlVG9G aXQsIDAuMDAwMSk7CiAKICAgICBmbG9hdCBtaW5pbXVtU2NhbGUgPSBXZWJDb3JlOjpjb21wdXRl TWluaW11bVNjYWxlRmFjdG9yRm9yQ29udGVudENvbnRhaW5lZChtX3Jhd0F0dHJpYnV0ZXMsIFdl YkNvcmU6OnJvdW5kZWRJbnRTaXplKG1fdmlld3BvcnRTaXplKSwgV2ViQ29yZTo6cm91bmRlZElu dFNpemUobV9jb250ZW50c1NpemUpLCAxKTsKIApAQCAtMzU2LDggKzM1Niw4IEBAIGJvb2wgUGFn ZVZpZXdwb3J0Q29udHJvbGxlcjo6dXBkYXRlTWluaW11bVNjYWxlVG9GaXQoYm9vbCB1c2VySW5p dGlhdGVkVXBkYXRlKQogICAgICAgICAgICAgICAgIGFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0Nv bnRlbnRzKG1fbWluaW11bVNjYWxlVG9GaXQpOwogICAgICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICAgICAgLy8gRW5zdXJlIHRoZSBlZmZlY3RpdmUgc2NhbGUgc3RheXMgd2l0aGluIGJvdW5k cy4KLSAgICAgICAgICAgICAgICBmbG9hdCBib3VuZGVkU2NhbGUgPSBpbm5lckJvdW5kZWRWaWV3 cG9ydFNjYWxlKG1fY29udGVudHNTY2FsZSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFmdXp6eUNv bXBhcmUoYm91bmRlZFNjYWxlLCBtX2NvbnRlbnRzU2NhbGUsIDAuMDAwMSkpCisgICAgICAgICAg ICAgICAgZmxvYXQgYm91bmRlZFNjYWxlID0gaW5uZXJCb3VuZGVkVmlld3BvcnRTY2FsZShtX3Bh Z2VTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICAgICAgaWYgKCFmdXp6eUNvbXBhcmUoYm91bmRl ZFNjYWxlLCBtX3BhZ2VTY2FsZUZhY3RvciwgMC4wMDAxKSkKICAgICAgICAgICAgICAgICAgICAg YXBwbHlTY2FsZUFmdGVyUmVuZGVyaW5nQ29udGVudHMoYm91bmRlZFNjYWxlKTsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmll d3BvcnRDb250cm9sbGVyLmgKaW5kZXggZjM4MzExMWRmY2UzNDQ0MDNjYzI1MTEwNjQ5OTEyNmY0 NzFlY2RhNC4uMmI1OTYxOGVmNzdkODEyZTIzYzZmYjFhYTY0NmY0YWZiYWJhYzE0NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCkBA IC02NSwxMCArNjUsMTAgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dzVXNlclNjYWxpbmcoKSBj b25zdCB7IHJldHVybiBtX2FsbG93c1VzZXJTY2FsaW5nOyB9CiAKICAgICBXZWJDb3JlOjpGbG9h dFNpemUgY29udGVudHNMYXlvdXRTaXplKCkgY29uc3QgeyByZXR1cm4gbV9yYXdBdHRyaWJ1dGVz LmxheW91dFNpemU7IH0KLSAgICBmbG9hdCBkZXZpY2VQaXhlbFJhdGlvKCkgY29uc3Q7CisgICAg ZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdDsKICAgICBmbG9hdCBtaW5pbXVtQ29udGVu dHNTY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWluaW11bVNjYWxlVG9GaXQ7IH0KICAgICBmbG9h dCBtYXhpbXVtQ29udGVudHNTY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmF3QXR0cmlidXRlcy5t YXhpbXVtU2NhbGU7IH0KLSAgICBmbG9hdCBjdXJyZW50Q29udGVudHNTY2FsZSgpIGNvbnN0IHsg cmV0dXJuIG1fY29udGVudHNTY2FsZTsgfQorICAgIGZsb2F0IGN1cnJlbnRDb250ZW50c1NjYWxl KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlU2NhbGVGYWN0b3I7IH0KIAogICAgIHZvaWQgc2V0SGFk VXNlckludGVyYWN0aW9uKGJvb2wgZGlkVXNlckludGVyYWN0KSB7IG1faGFkVXNlckludGVyYWN0 aW9uID0gZGlkVXNlckludGVyYWN0OyB9CiAKQEAgLTEwNiw3ICsxMDYsNyBAQCBwcml2YXRlOgog ICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX2NvbnRlbnRzU2l6ZTsKICAgICBXZWJDb3JlOjpGbG9h dFNpemUgbV92aWV3cG9ydFNpemU7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtX2NsaWVudENvbnRl bnRzU2l6ZTsKLSAgICBmbG9hdCBtX2NvbnRlbnRzU2NhbGU7CisgICAgZmxvYXQgbV9wYWdlU2Nh bGVGYWN0b3I7CiAKICAgICBib29sIG1fcGVuZGluZ1Bvc2l0aW9uQ2hhbmdlOwogICAgIGJvb2wg bV9wZW5kaW5nU2NhbGVDaGFuZ2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcAppbmRl eCA3MTk1MWNhOWQ4MDVlNzQwMDNlNzJlMzUxZDM0Y2ZhNGJlMjFhOWJiLi5iYzE0MTc2N2Y3MTk5 ZjYxY2M3NmUzY2RiYTdiMzM3OTNhZmM5YzRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVm bC5jcHAKQEAgLTY0LDcgKzY0LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50 RWZsOjp1cGRhdGVWaWV3cG9ydFNpemUoKQogICAgIEFTU0VSVChtX2NvbnRyb2xsZXIpOwogICAg IEZsb2F0U2l6ZSBzaXplID0gbV92aWV3SW1wbC0+c2l6ZSgpOwogICAgIC8vIFRoZSB2aWV3cG9y dCBjb250cm9sbGVyIGV4cGVjdHMgc2l6ZXMgaW4gVUkgdW5pdHMsIGFuZCBub3QgcmF3IGRldmlj ZSB1bml0cy4KLSAgICBzaXplLnNjYWxlKDEgLyBtX2NvbnRyb2xsZXItPmRldmljZVBpeGVsUmF0 aW8oKSk7CisgICAgc2l6ZS5zY2FsZSgxIC8gbV9jb250cm9sbGVyLT5kZXZpY2VTY2FsZUZhY3Rv cigpKTsKICAgICBtX2NvbnRyb2xsZXItPmRpZENoYW5nZVZpZXdwb3J0U2l6ZShzaXplKTsKIH0K IAo=