102958 2012-11-21 10:10:58 -0800 [chromium] Add WebLayerTreeViewClient API to request font atlas 2012-11-27 15:17:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 egraether webkit-unassigned abarth dglazkov egraether fishd jamesr nduca tkent+wkapi webkit.review.bot oldest_to_newest 773074 0 egraether 2012-11-21 10:10:58 -0800 [chromium] make compositor requesting the font atlas #1 773075 1 175473 egraether 2012-11-21 10:13:11 -0800 Created attachment 175473 Patch 773081 2 webkit.review.bot 2012-11-21 10:16:43 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 773100 3 egraether 2012-11-21 10:29:26 -0800 commit order: https://bugs.webkit.org/show_bug.cgi?id=102958 https://codereview.chromium.org/11413123 https://bugs.webkit.org/show_bug.cgi?id=102960 773104 4 175473 webkit.review.bot 2012-11-21 10:36:26 -0800 Comment on attachment 175473 Patch Attachment 175473 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14960027 773129 5 175486 egraether 2012-11-21 11:19:17 -0800 Created attachment 175486 Patch 773405 6 egraether 2012-11-21 16:35:56 -0800 (In reply to comment #3) > commit order: > https://bugs.webkit.org/show_bug.cgi?id=102958 > https://codereview.chromium.org/11413123 > https://bugs.webkit.org/show_bug.cgi?id=102960 jamesr, can you please hava a look at them? 775140 7 175486 jamesr 2012-11-25 22:08:35 -0800 Comment on attachment 175486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175486&action=review > Source/Platform/ChangeLog:3 > + [chromium] make compositor request the font atlas #1 This does not describe the patch or the bug and is grammatically iffy. Please rephrase > Source/Platform/chromium/public/WebLayerTreeViewClient.h:109 > + virtual void createFontAtlas(SkBitmap&, WebRect[128], int&) { } The third parameter isn't very clear from the signature - could you provide a descriptive name? 775673 8 egraether 2012-11-26 10:58:23 -0800 (In reply to comment #7) > (From update of attachment 175486 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=175486&action=review > > > Source/Platform/ChangeLog:3 > > + [chromium] make compositor request the font atlas #1 > > This does not describe the patch or the bug and is grammatically iffy. Please rephrase Yeah, I found it pretty hard to find something descriptive. What would be better? - replace font atlas passing with requesting - make font atlas creation accessible to WebLayerTreeView and remove font atlas passing - replace WebLayerTreeView::setFontAtlas() with WebLayerTreeViewClient::createFontAtlas() I tried to find one name for all three patches and number them. Is that a good idea? I need some help here please. > > Source/Platform/chromium/public/WebLayerTreeViewClient.h:109 > > + virtual void createFontAtlas(SkBitmap&, WebRect[128], int&) { } > > The third parameter isn't very clear from the signature - could you provide a descriptive name? I had a look at how this was done before, the second parameter was named as well. Is this better?: virtual void createFontAtlas(SkBitmap&, WebRect asciiToRectTable[128], int& fontHeight) { } Is there a rule of thumb of when to name parameters in interface methods? 775688 9 jamesr 2012-11-26 11:09:45 -0800 (In reply to comment #8) > (In reply to comment #7) > > (From update of attachment 175486 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=175486&action=review > > > > > Source/Platform/ChangeLog:3 > > > + [chromium] make compositor request the font atlas #1 > > > > This does not describe the patch or the bug and is grammatically iffy. Please rephrase > > Yeah, I found it pretty hard to find something descriptive. What would be better? > > - replace font atlas passing with requesting > - make font atlas creation accessible to WebLayerTreeView and remove font atlas passing > - replace WebLayerTreeView::setFontAtlas() with WebLayerTreeViewClient::createFontAtlas() > > I tried to find one name for all three patches and number them. Is that a good idea? I need some help here please. That sounds like a good list to have in the ChangeLog. For the top line, you could describe the API change this adds - for instance something like "[chromium] Add WebLayerTreeViewClient API to request font atlas" or something like that. > > > > Source/Platform/chromium/public/WebLayerTreeViewClient.h:109 > > > + virtual void createFontAtlas(SkBitmap&, WebRect[128], int&) { } > > > > The third parameter isn't very clear from the signature - could you provide a descriptive name? > > I had a look at how this was done before, the second parameter was named as well. Is this better?: > > virtual void createFontAtlas(SkBitmap&, WebRect asciiToRectTable[128], int& fontHeight) { } Yes > > Is there a rule of thumb of when to name parameters in interface methods? Yes - if the name of the parameter is fairly obvious from the type and signature, leave it out. Otherwise, include it. For instance having the first parameter be called 'bitmap' would be redundant with the type and calling it 'atlas' would be redundant with the function name, so leaving it out is fine. See http://www.webkit.org/coding/coding-style.html#names-verb 775796 10 176048 egraether 2012-11-26 12:55:17 -0800 Created attachment 176048 Patch 775804 11 176048 jamesr 2012-11-26 13:08:53 -0800 Comment on attachment 176048 Patch Thanks, looks good. 776921 12 176048 webkit.review.bot 2012-11-27 10:09:00 -0800 Comment on attachment 176048 Patch Rejecting attachment 176048 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: 0 (offset -10 lines). 1 out of 2 hunks FAILED -- saving rejects to file Source/Platform/chromium/public/WebLayerTreeViewClient.h.rej patching file Source/WebKit/chromium/src/WebViewImpl.cpp Hunk #1 succeeded at 4203 (offset -11 lines). patching file Source/WebKit/chromium/src/WebViewImpl.h Hunk #1 succeeded at 324 (offset -1 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'James Robi..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/15018112 777236 13 176341 egraether 2012-11-27 14:33:37 -0800 Created attachment 176341 Patch 777265 14 176341 webkit.review.bot 2012-11-27 15:17:51 -0800 Comment on attachment 176341 Patch Clearing flags on attachment: 176341 Committed r135929: <http://trac.webkit.org/changeset/135929> 777266 15 webkit.review.bot 2012-11-27 15:17:55 -0800 All reviewed patches have been landed. Closing bug. 175473 2012-11-21 10:13:11 -0800 2012-11-21 11:19:14 -0800 Patch bug-102958-20121121101058.patch text/plain 4113 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA1YzE4MGZiNjVlNzhh MWMzNDI4MzBjY2M5ZmY4YTZhNjA5YWJkZGM5Li41ZDM2NTcxMmY4MTFhMTVjMDI1NjM4MTEyZGY3 NTE2ODQ1MmNiYjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMS0yMSAg RWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hy b21pdW1dIG1ha2UgY29tcG9zaXRvciByZXF1ZXN0aW5nIHRoZSBmb250IGF0bGFzICMxCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI5NTgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIFdlYlZpZXdJ bXBsOjpjcmVhdGVGb250QXRsYXMoKSB0byBhbGxvdyB0aGUgY29tcG9zaXRvciB0byBjcmVhdGUg YSBmb250IGF0bGFzIG9uIGRlbWFuZC4KKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJM YXllclRyZWVWaWV3Q2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViTGF5 ZXJUcmVlVmlld0NsaWVudCk6CisKIDIwMTItMTEtMjEgIEhhcmFsZCBBbHZlc3RyYW5kICA8aHRh QGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViTWVkaWFTdHJlYW1Db21wb25lbnQ6IEFkZCBhc3Np Z25tZW50IGFuZCBjb3B5IG9wZXJhdG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1 NzE4NTA5MmQxMjRkNDk5OWZiNmUzNDZjYTIzZmE0MDE3M2Y5MWUzLi5hMDQ4ZDZlOWJhMjM4NmFi NGE5MmYzMzdmNmFhYzYwNjBlYWUxMWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE4IEBACisyMDEyLTExLTIxICBFYmVyaGFyZCBHcmFldGhlciAgPGVncmFldGhlckBn b29nbGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gbWFrZSBjb21wb3NpdG9yIHJlcXVlc3Rp bmcgdGhlIGZvbnQgYXRsYXMgIzEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMjk1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZHMgV2ViVmlld0ltcGw6OmNyZWF0ZUZvbnRBdGxhcygpIHRvIGFsbG93 IHRoZSBjb21wb3NpdG9yIHRvIGNyZWF0ZSBhIGZvbnQgYXRsYXMgb24gZGVtYW5kLgorCisgICAg ICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6 OmNyZWF0ZUZvbnRBdGxhcyk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHNyYy9XZWJW aWV3SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTExLTIxICBEYW4gQ2Fy bmV5ICA8ZGNhcm5leUBnb29nbGUuY29tPgogCiAgICAgICAgIElEQlJlcXVlc3RUZXN0IG5lZWRz IGEgdjggY29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1Ymxp Yy9XZWJMYXllclRyZWVWaWV3Q2xpZW50LmggYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVi bGljL1dlYkxheWVyVHJlZVZpZXdDbGllbnQuaAppbmRleCA1Yjk5MjlmMGUyNGFkMDUxZGRlNjRm MTM2YTVkZTRjM2FkNGJjYzExLi5jMThkMGFiYWJlMDFhMTVkY2U2OGY4MjY0MjdiMzQ1ZjBiOWI5 MTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVy VHJlZVZpZXdDbGllbnQuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dl YkxheWVyVHJlZVZpZXdDbGllbnQuaApAQCAtMjYsMTEgKzI2LDE0IEBACiAjaWZuZGVmIFdlYkxh eWVyVHJlZVZpZXdDbGllbnRfaAogI2RlZmluZSBXZWJMYXllclRyZWVWaWV3Q2xpZW50X2gKIAor Y2xhc3MgU2tCaXRtYXA7CisKIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViQ29tcG9zaXRv ck91dHB1dFN1cmZhY2U7CiBjbGFzcyBXZWJHcmFwaGljc0NvbnRleHQzRDsKIGNsYXNzIFdlYklu cHV0SGFuZGxlcjsKIGNsYXNzIFdlYlRocmVhZDsKK3N0cnVjdCBXZWJSZWN0Owogc3RydWN0IFdl YlNpemU7CiAKIGNsYXNzIFdlYkxheWVyVHJlZVZpZXdDbGllbnQgewpAQCAtMTAwLDYgKzEwMywx MSBAQCBwdWJsaWM6CiAgICAgLy8gaW50ZXJuYWxseSBzY2hlZHVsZSBhIGNvbXBvc2l0aW5nIHBh c3Mgd2hlbiBuZWVkZWQuCiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQ29tcG9zaXRlKCkgPSAw OwogCisgICAgLy8gQ3JlYXRlcyBhIGZvbnQgYXRsYXMgdG8gdXNlIGZvciBkZWJ1ZyB2aXN1YWxp emF0aW9ucy4gVGhlIGF0bGFzIGlzIGEgYml0bWFwCisgICAgLy8gY29udGFpbmluZyBnbHlwaCBk YXRhLCBhIHRhYmxlIG9mIEFTQ0lJIGNoYXJhY3RlciB2YWx1ZXMgdG8gYSBzdWJyZWN0YW5nbGUK KyAgICAvLyBvZiB0aGUgYXRsYXMgcmVwcmVzZW50aW5nIHRoZSBjb3JyZXNwb25kaW5nIGdseXBo LCBhbmQgdGhlIGdseXBoIGhlaWdodC4KKyAgICB2aXJ0dWFsIFNrQml0bWFwIGNyZWF0ZUZvbnRB dGxhcyhXZWJSZWN0WzEyOF0sIGludCYpID0gMDsKKwogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwg fldlYkxheWVyVHJlZVZpZXdDbGllbnQoKSB7IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZTZiOTIxYzFjNjNhOGI5YTFlZTM3NWFiZGI3NDEw NTQ1MTg0NDM4OC4uOGQ0Y2FjNDY5YjVjYzdiMzFlN2UyZGNmNjQ0NzVhM2YyZWMxNDZiZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNDIxNCw2ICs0 MjE0LDEyIEBAIHZvaWQgV2ViVmlld0ltcGw6OnNjaGVkdWxlQ29tcG9zaXRlKCkKICAgICBtX2Ns aWVudC0+c2NoZWR1bGVDb21wb3NpdGUoKTsKIH0KIAorU2tCaXRtYXAgV2ViVmlld0ltcGw6OmNy ZWF0ZUZvbnRBdGxhcyhXZWJSZWN0IGFzY2lpVG9SZWN0VGFibGVbMTI4XSwgaW50JiBmb250SGVp Z2h0KQoreworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIldlYlZpZXdJbXBsOjpsb2FkRm9u dEF0bGFzIik7CisgICAgcmV0dXJuIFdlYkNvcmU6OkNvbXBvc2l0b3JIVURGb250QXRsYXM6Omdl bmVyYXRlRm9udEF0bGFzKGFzY2lpVG9SZWN0VGFibGUsIGZvbnRIZWlnaHQpOworfQorCiB2b2lk IFdlYlZpZXdJbXBsOjp1cGRhdGVMYXllclRyZWVWaWV3cG9ydCgpCiB7CiAgICAgaWYgKCFwYWdl KCkgfHwgIW1fbm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0IHx8ICFtX2xheWVyVHJlZVZpZXcpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCA1OWMzMjA2ZTU4YjVm M2YzZjZkYjhjMzc0OTBmNzlmMTk3ZTdhZDVjLi4yMzBlZTRmYmIyNmFkNTIxOTYxZmQxMGY5ZDU4 MGIxMjVmZjZjYWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgK QEAgLTMyNSw2ICszMjUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbW1pdEFu ZERyYXdGcmFtZSgpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb21wbGV0ZVN3YXBCdWZmZXJzKCk7 CiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQ29tcG9zaXRlKCk7CisgICAgdmlydHVhbCBTa0Jp dG1hcCBjcmVhdGVGb250QXRsYXMoV2ViUmVjdFsxMjhdLCBpbnQmKTsKIAogICAgIC8vIFdlYlZp ZXdJbXBsCiAK 175486 2012-11-21 11:19:17 -0800 2012-11-26 12:55:14 -0800 Patch bug-102958-20121121111704.patch text/plain 4196 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA1YzE4MGZiNjVlNzhh MWMzNDI4MzBjY2M5ZmY4YTZhNjA5YWJkZGM5Li42ZGQ4OWZjNDgwY2ViNzUzM2RmODZiYzE5Yjdl OTFmMGZjYjM4NzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0xMS0yMSAg RWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hy b21pdW1dIG1ha2UgY29tcG9zaXRvciByZXF1ZXN0IHRoZSBmb250IGF0bGFzICMxCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI5NTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIFdlYlZpZXdJbXBs OjpjcmVhdGVGb250QXRsYXMoKSB0byBhbGxvdyB0aGUgY29tcG9zaXRvciB0byBjcmVhdGUgYSBm b250IGF0bGFzIG9uIGRlbWFuZC4KKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJMYXll clRyZWVWaWV3Q2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViTGF5ZXJU cmVlVmlld0NsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYkxheWVyVHJlZVZpZXdDbGllbnQ6 OmNyZWF0ZUZvbnRBdGxhcyk6CisKIDIwMTItMTEtMjEgIEhhcmFsZCBBbHZlc3RyYW5kICA8aHRh QGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViTWVkaWFTdHJlYW1Db21wb25lbnQ6IEFkZCBhc3Np Z25tZW50IGFuZCBjb3B5IG9wZXJhdG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1 NzE4NTA5MmQxMjRkNDk5OWZiNmUzNDZjYTIzZmE0MDE3M2Y5MWUzLi5lMGQ2YWRkZWZjZjkzMWQz MWZjZjM0NDU4ZDk5MTRjZWE4OGUyZWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE4IEBACisyMDEyLTExLTIxICBFYmVyaGFyZCBHcmFldGhlciAgPGVncmFldGhlckBn b29nbGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gbWFrZSBjb21wb3NpdG9yIHJlcXVlc3Qg dGhlIGZvbnQgYXRsYXMgIzEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMjk1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZHMgV2ViVmlld0ltcGw6OmNyZWF0ZUZvbnRBdGxhcygpIHRvIGFsbG93IHRo ZSBjb21wb3NpdG9yIHRvIGNyZWF0ZSBhIGZvbnQgYXRsYXMgb24gZGVtYW5kLgorCisgICAgICAg ICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmNy ZWF0ZUZvbnRBdGxhcyk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3 SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTExLTIxICBEYW4gQ2FybmV5 ICA8ZGNhcm5leUBnb29nbGUuY29tPgogCiAgICAgICAgIElEQlJlcXVlc3RUZXN0IG5lZWRzIGEg djggY29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9X ZWJMYXllclRyZWVWaWV3Q2xpZW50LmggYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGlj L1dlYkxheWVyVHJlZVZpZXdDbGllbnQuaAppbmRleCA1Yjk5MjlmMGUyNGFkMDUxZGRlNjRmMTM2 YTVkZTRjM2FkNGJjYzExLi4xZGY1ZGJmOWUwYWYxNmQ3NWZkNTFlYTVhNjg1ZDY1YTdlZjQ2NGY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJl ZVZpZXdDbGllbnQuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxh eWVyVHJlZVZpZXdDbGllbnQuaApAQCAtMjYsMTEgKzI2LDE0IEBACiAjaWZuZGVmIFdlYkxheWVy VHJlZVZpZXdDbGllbnRfaAogI2RlZmluZSBXZWJMYXllclRyZWVWaWV3Q2xpZW50X2gKIAorY2xh c3MgU2tCaXRtYXA7CisKIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViQ29tcG9zaXRvck91 dHB1dFN1cmZhY2U7CiBjbGFzcyBXZWJHcmFwaGljc0NvbnRleHQzRDsKIGNsYXNzIFdlYklucHV0 SGFuZGxlcjsKIGNsYXNzIFdlYlRocmVhZDsKK3N0cnVjdCBXZWJSZWN0Owogc3RydWN0IFdlYlNp emU7CiAKIGNsYXNzIFdlYkxheWVyVHJlZVZpZXdDbGllbnQgewpAQCAtMTAwLDYgKzEwMywxMSBA QCBwdWJsaWM6CiAgICAgLy8gaW50ZXJuYWxseSBzY2hlZHVsZSBhIGNvbXBvc2l0aW5nIHBhc3Mg d2hlbiBuZWVkZWQuCiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQ29tcG9zaXRlKCkgPSAwOwog CisgICAgLy8gQ3JlYXRlcyBhIGZvbnQgYXRsYXMgdG8gdXNlIGZvciBkZWJ1ZyB2aXN1YWxpemF0 aW9ucy4gVGhlIGF0bGFzIGlzIGEgYml0bWFwCisgICAgLy8gY29udGFpbmluZyBnbHlwaCBkYXRh LCBhIHRhYmxlIG9mIEFTQ0lJIGNoYXJhY3RlciB2YWx1ZXMgdG8gYSBzdWJyZWN0YW5nbGUKKyAg ICAvLyBvZiB0aGUgYXRsYXMgcmVwcmVzZW50aW5nIHRoZSBjb3JyZXNwb25kaW5nIGdseXBoLCBh bmQgdGhlIGdseXBoIGhlaWdodC4KKyAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlRm9udEF0bGFzKFNr Qml0bWFwJiwgV2ViUmVjdFsxMjhdLCBpbnQmKSB7IH0KKwogcHJvdGVjdGVkOgogICAgIHZpcnR1 YWwgfldlYkxheWVyVHJlZVZpZXdDbGllbnQoKSB7IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZTZiOTIxYzFjNjNhOGI5YTFlZTM3NWFiZGI3 NDEwNTQ1MTg0NDM4OC4uZThmZTk5ZTY4NGFmMmUwM2NjOTk5ZjE4MjQ4MGQxMjZmYzYzM2JhMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNDIxNCw2 ICs0MjE0LDEyIEBAIHZvaWQgV2ViVmlld0ltcGw6OnNjaGVkdWxlQ29tcG9zaXRlKCkKICAgICBt X2NsaWVudC0+c2NoZWR1bGVDb21wb3NpdGUoKTsKIH0KIAordm9pZCBXZWJWaWV3SW1wbDo6Y3Jl YXRlRm9udEF0bGFzKFNrQml0bWFwJiBiaXRtYXAsIFdlYlJlY3QgYXNjaWlUb1JlY3RUYWJsZVsx MjhdLCBpbnQmIGZvbnRIZWlnaHQpCit7CisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiV2Vi Vmlld0ltcGw6OmxvYWRGb250QXRsYXMiKTsKKyAgICBiaXRtYXAgPSBXZWJDb3JlOjpDb21wb3Np dG9ySFVERm9udEF0bGFzOjpnZW5lcmF0ZUZvbnRBdGxhcyhhc2NpaVRvUmVjdFRhYmxlLCBmb250 SGVpZ2h0KTsKK30KKwogdm9pZCBXZWJWaWV3SW1wbDo6dXBkYXRlTGF5ZXJUcmVlVmlld3BvcnQo KQogewogICAgIGlmICghcGFnZSgpIHx8ICFtX25vbkNvbXBvc2l0ZWRDb250ZW50SG9zdCB8fCAh bV9sYXllclRyZWVWaWV3KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgK aW5kZXggNTljMzIwNmU1OGI1ZjNmM2Y2ZGI4YzM3NDkwZjc5ZjE5N2U3YWQ1Yy4uNDdlOGNhZDgy NzFlYzYxY2JjZDhlZWJjOTJlODgwZjhkYWI1ZDZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0zMjUsNiArMzI1LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBkaWRDb21taXRBbmREcmF3RnJhbWUoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29t cGxldGVTd2FwQnVmZmVycygpOwogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZUNvbXBvc2l0ZSgp OworICAgIHZpcnR1YWwgdm9pZCBjcmVhdGVGb250QXRsYXMoU2tCaXRtYXAmLCBXZWJSZWN0WzEy OF0sIGludCYpOwogCiAgICAgLy8gV2ViVmlld0ltcGwKIAo= 176048 2012-11-26 12:55:17 -0800 2012-11-27 14:33:33 -0800 Patch bug-102958-20121126125255.patch text/plain 4254 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3ZTdlMTBkYTI1MmY5 ODYzMDYzZTNhY2FkZDk2NzlhYTg0N2NiYjg1Li5jZDBlNzcxZDE3OWZlNmVhNWQ2NDBjNjhhZjRk MjdiZDNmYzlhNmM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0xMS0yNiAg RWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hy b21pdW1dIEFkZCBXZWJMYXllclRyZWVWaWV3Q2xpZW50IEFQSSB0byByZXF1ZXN0IGZvbnQgYXRs YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjk1 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg Y2hhbmdlIG1ha2VzIHRoZSBmb250IGF0bGFzIGNyZWF0aW9uIGFjY2Vzc2libGUgdG8gdGhlIFdl YkxheWVyVHJlZVZpZXcuCisKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVl Vmlld0NsaWVudC5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYkxheWVyVHJlZVZp ZXdDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJMYXllclRyZWVWaWV3Q2xpZW50OjpjcmVh dGVGb250QXRsYXMpOgorCiAyMDEyLTExLTIzICBTYW1pIEt5b3N0aWxhICA8c2t5b3N0aWxAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIFdlYlNjcmVlbkluZm8ue2hv cml6b250YWwsdmVydGljYWx9RFBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDkxMGIz ZjkxNDA0ZmRmMDNlMmNmZGZlY2NhNmI3YmZkNjk3YTIzMDMuLjhlOTc3OGQ1NDQwOGJiZTNiMzA2 MWQ4NDE5MDViNjQyMzI2ZTBkZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMTItMTEtMjYgIEViZXJoYXJkIEdyYWV0aGVyICA8ZWdyYWV0aGVyQGdvb2ds ZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBBZGQgV2ViTGF5ZXJUcmVlVmlld0NsaWVudCBB UEkgdG8gcmVxdWVzdCBmb250IGF0bGFzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDI5NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBtYWtlcyB0aGUgZm9udCBhdGxhcyBjcmVhdGlv biBhY2Nlc3NpYmxlIHRvIHRoZSBXZWJMYXllclRyZWVWaWV3LgorCisgICAgICAgICogc3JjL1dl YlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmNyZWF0ZUZvbnRB dGxhcyk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgor ICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTExLTI2ICBNaWtlIFJlZWQgIDxyZWVkQGdv b2dsZS5jb20+CiAKICAgICAgICAgYWRkIFNLX0RJU0FCTEVfRElUSEVSXzMyQklUX0dSQURJRU5U IGRlZmluZSwgaW4gcHJlcGFyYXRpb24gZm9yIHJlYmFzZWxpbmluZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJMYXllclRyZWVWaWV3Q2xpZW50LmggYi9T b3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXdDbGllbnQuaApp bmRleCA1Yjk5MjlmMGUyNGFkMDUxZGRlNjRmMTM2YTVkZTRjM2FkNGJjYzExLi41ZTk1MzEyMjg0 ZDFmNWQ2NDU0YTY3ZTBiMGE2NjAzMTIyZjViMDIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZv cm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXdDbGllbnQuaAorKysgYi9Tb3VyY2Uv UGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXdDbGllbnQuaApAQCAtMjYs MTEgKzI2LDE0IEBACiAjaWZuZGVmIFdlYkxheWVyVHJlZVZpZXdDbGllbnRfaAogI2RlZmluZSBX ZWJMYXllclRyZWVWaWV3Q2xpZW50X2gKIAorY2xhc3MgU2tCaXRtYXA7CisKIG5hbWVzcGFjZSBX ZWJLaXQgewogY2xhc3MgV2ViQ29tcG9zaXRvck91dHB1dFN1cmZhY2U7CiBjbGFzcyBXZWJHcmFw aGljc0NvbnRleHQzRDsKIGNsYXNzIFdlYklucHV0SGFuZGxlcjsKIGNsYXNzIFdlYlRocmVhZDsK K3N0cnVjdCBXZWJSZWN0Owogc3RydWN0IFdlYlNpemU7CiAKIGNsYXNzIFdlYkxheWVyVHJlZVZp ZXdDbGllbnQgewpAQCAtMTAwLDYgKzEwMywxMSBAQCBwdWJsaWM6CiAgICAgLy8gaW50ZXJuYWxs eSBzY2hlZHVsZSBhIGNvbXBvc2l0aW5nIHBhc3Mgd2hlbiBuZWVkZWQuCiAgICAgdmlydHVhbCB2 b2lkIHNjaGVkdWxlQ29tcG9zaXRlKCkgPSAwOwogCisgICAgLy8gQ3JlYXRlcyBhIGZvbnQgYXRs YXMgdG8gdXNlIGZvciBkZWJ1ZyB2aXN1YWxpemF0aW9ucy4gVGhlIGF0bGFzIGlzIGEgYml0bWFw CisgICAgLy8gY29udGFpbmluZyBnbHlwaCBkYXRhLCBhIHRhYmxlIG9mIEFTQ0lJIGNoYXJhY3Rl ciB2YWx1ZXMgdG8gYSBzdWJyZWN0YW5nbGUKKyAgICAvLyBvZiB0aGUgYXRsYXMgcmVwcmVzZW50 aW5nIHRoZSBjb3JyZXNwb25kaW5nIGdseXBoLCBhbmQgdGhlIGdseXBoIGhlaWdodC4KKyAgICB2 aXJ0dWFsIHZvaWQgY3JlYXRlRm9udEF0bGFzKFNrQml0bWFwJiwgV2ViUmVjdCBhc2NpaVRvUmVj dFRhYmxlWzEyOF0sIGludCYgZm9udEhlaWdodCkgeyB9CisKIHByb3RlY3RlZDoKICAgICB2aXJ0 dWFsIH5XZWJMYXllclRyZWVWaWV3Q2xpZW50KCkgeyB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDdhYTEyMDQ4ZmI2MGRjZjYyMDk1YjBiMWQ2 MjBiOGI5YjgyNTUzZDEuLjQxYTc3MjI2NWIxNjgwZjVhNmQzNDA0OWU4Y2Y0MWViYzdjNmIwZDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTQyMTQs NiArNDIxNCwxMiBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzY2hlZHVsZUNvbXBvc2l0ZSgpCiAgICAg bV9jbGllbnQtPnNjaGVkdWxlQ29tcG9zaXRlKCk7CiB9CiAKK3ZvaWQgV2ViVmlld0ltcGw6OmNy ZWF0ZUZvbnRBdGxhcyhTa0JpdG1hcCYgYml0bWFwLCBXZWJSZWN0IGFzY2lpVG9SZWN0VGFibGVb MTI4XSwgaW50JiBmb250SGVpZ2h0KQoreworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIldl YlZpZXdJbXBsOjpsb2FkRm9udEF0bGFzIik7CisgICAgYml0bWFwID0gV2ViQ29yZTo6Q29tcG9z aXRvckhVREZvbnRBdGxhczo6Z2VuZXJhdGVGb250QXRsYXMoYXNjaWlUb1JlY3RUYWJsZSwgZm9u dEhlaWdodCk7Cit9CisKIHZvaWQgV2ViVmlld0ltcGw6OnVwZGF0ZUxheWVyVHJlZVZpZXdwb3J0 KCkKIHsKICAgICBpZiAoIXBhZ2UoKSB8fCAhbV9ub25Db21wb3NpdGVkQ29udGVudEhvc3QgfHwg IW1fbGF5ZXJUcmVlVmlldykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5o CmluZGV4IGRhNWY2OWI5ZWQ1ZTc0M2I2NDNmMzk3MGYyMWE3Y2Y2NzkzN2YxNDAuLjU0OWM2MTlm ZWQwMjBjZGMxOTU3M2Y1NmFmMWQ5ZGFhMzlhMTcxZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtMzI1LDYgKzMyNSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIHZvaWQgZGlkQ29tbWl0QW5kRHJhd0ZyYW1lKCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZENv bXBsZXRlU3dhcEJ1ZmZlcnMoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVDb21wb3NpdGUo KTsKKyAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlRm9udEF0bGFzKFNrQml0bWFwJiwgV2ViUmVjdFsx MjhdLCBpbnQmKTsKIAogICAgIC8vIFdlYlZpZXdJbXBsCiAK 176341 2012-11-27 14:33:37 -0800 2012-11-27 15:17:50 -0800 Patch bug-102958-20121127143114.patch text/plain 4306 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1OTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBjNGUzYzNkOTMzNWEw MjM2MDNiMjc3MDcwY2YyYjY3OTA0NmY4YzliLi42ZGIwZjIwNDE4MmFjZjVhZTFhYzQ1MjZkNzVm ZGJhMWQwMjJmZTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBAQAogMjAxMi0xMS0yNyAg RWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KIAorICAgICAgICBbY2hy b21pdW1dIEFkZCBXZWJMYXllclRyZWVWaWV3Q2xpZW50IEFQSSB0byByZXF1ZXN0IGZvbnQgYXRs YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjk1 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg Y2hhbmdlIG1ha2VzIHRoZSBmb250IGF0bGFzIGNyZWF0aW9uIGFjY2Vzc2libGUgdG8gdGhlIFdl YkxheWVyVHJlZVZpZXcuCisKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVl Vmlld0NsaWVudC5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYkxheWVyVHJlZVZp ZXdDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJMYXllclRyZWVWaWV3Q2xpZW50OjpjcmVh dGVGb250QXRsYXMpOgorCisyMDEyLTExLTI3ICBFYmVyaGFyZCBHcmFldGhlciAgPGVncmFldGhl ckBnb29nbGUuY29tPgorCiAgICAgICAgIFBsdW1iaW5nIHNob3dQYWludFJlY3RzIG91dCBvZiBJ bnNwZWN0b3JQYWdlQWdlbnQgdG8gdXNlIGEgZGlmZmVyZW50IGRyYXdpbmcgaW1wbGVtZW50YXRp b24gaWYgYXZhaWxhYmxlLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAyNDUyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNjZkYWE2Mzlk OWMzNTE5YTk5OGUyM2RlNDA0YzE5MTY5NTcwZjQ5NS4uNDFlOTgyNDYwMmFkYzk0MWJlMmI3M2Nk YTcxZTk1MDU1Mjg1NWNjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAxMi0xMS0yNyAgRWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNv bT4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCBXZWJMYXllclRyZWVWaWV3Q2xpZW50IEFQSSB0 byByZXF1ZXN0IGZvbnQgYXRsYXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMjk1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgY2hhbmdlIG1ha2VzIHRoZSBmb250IGF0bGFzIGNyZWF0aW9uIGFj Y2Vzc2libGUgdG8gdGhlIFdlYkxheWVyVHJlZVZpZXcuCisKKyAgICAgICAgKiBzcmMvV2ViVmll d0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Y3JlYXRlRm9udEF0bGFz KToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisgICAg ICAgIChXZWJWaWV3SW1wbCk6CisKIDIwMTItMTEtMjcgIEFscGhhIExhbSAgPGhjbGFtQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEltcGxlbWVudCBmdWxsLWZlYXR1cmVkIGlt YWdlIGNhY2hlCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dl YkxheWVyVHJlZVZpZXdDbGllbnQuaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMv V2ViTGF5ZXJUcmVlVmlld0NsaWVudC5oCmluZGV4IDMzNzU5MTM2NWQ1ZWJlMjc3ZGRmMDhjYzZi ZjRlODNjZTI3ZWRiMTMuLjJjYTZiMGE1MWVkY2IyZmY0NzdmOGM5MDRhNjRhNTJmODAzZmZmZWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVl Vmlld0NsaWVudC5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5 ZXJUcmVlVmlld0NsaWVudC5oCkBAIC0yNiwxMCArMjYsMTMgQEAKICNpZm5kZWYgV2ViTGF5ZXJU cmVlVmlld0NsaWVudF9oCiAjZGVmaW5lIFdlYkxheWVyVHJlZVZpZXdDbGllbnRfaAogCitjbGFz cyBTa0JpdG1hcDsKKwogbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBXZWJDb21wb3NpdG9yT3V0 cHV0U3VyZmFjZTsKIGNsYXNzIFdlYklucHV0SGFuZGxlcjsKIGNsYXNzIFdlYlRocmVhZDsKK3N0 cnVjdCBXZWJSZWN0Owogc3RydWN0IFdlYlNpemU7CiAKIGNsYXNzIFdlYkxheWVyVHJlZVZpZXdD bGllbnQgewpAQCAtOTAsNiArOTMsMTEgQEAgcHVibGljOgogICAgIC8vIGludGVybmFsbHkgc2No ZWR1bGUgYSBjb21wb3NpdGluZyBwYXNzIHdoZW4gbmVlZGVkLgogICAgIHZpcnR1YWwgdm9pZCBz Y2hlZHVsZUNvbXBvc2l0ZSgpID0gMDsKIAorICAgIC8vIENyZWF0ZXMgYSBmb250IGF0bGFzIHRv IHVzZSBmb3IgZGVidWcgdmlzdWFsaXphdGlvbnMuIFRoZSBhdGxhcyBpcyBhIGJpdG1hcAorICAg IC8vIGNvbnRhaW5pbmcgZ2x5cGggZGF0YSwgYSB0YWJsZSBvZiBBU0NJSSBjaGFyYWN0ZXIgdmFs dWVzIHRvIGEgc3VicmVjdGFuZ2xlCisgICAgLy8gb2YgdGhlIGF0bGFzIHJlcHJlc2VudGluZyB0 aGUgY29ycmVzcG9uZGluZyBnbHlwaCwgYW5kIHRoZSBnbHlwaCBoZWlnaHQuCisgICAgdmlydHVh bCB2b2lkIGNyZWF0ZUZvbnRBdGxhcyhTa0JpdG1hcCYsIFdlYlJlY3QgYXNjaWlUb1JlY3RUYWJs ZVsxMjhdLCBpbnQmIGZvbnRIZWlnaHQpIHsgfQorCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB+ V2ViTGF5ZXJUcmVlVmlld0NsaWVudCgpIHsgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBmYjQyMjFjMmRmZjdkMmU0NzAwZGQwZDNhNmI5ZGNj ZTg5ZmVlNTFmLi5mNjZhZTQ4YzQ4ZDhhMzhlZWUyMGQ3NGZmYzc0NTM3MWU3MGIxMDA4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC00MjEyLDYgKzQy MTIsMTIgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2NoZWR1bGVDb21wb3NpdGUoKQogICAgIG1fY2xp ZW50LT5zY2hlZHVsZUNvbXBvc2l0ZSgpOwogfQogCit2b2lkIFdlYlZpZXdJbXBsOjpjcmVhdGVG b250QXRsYXMoU2tCaXRtYXAmIGJpdG1hcCwgV2ViUmVjdCBhc2NpaVRvUmVjdFRhYmxlWzEyOF0s IGludCYgZm9udEhlaWdodCkKK3sKKyAgICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJWaWV3 SW1wbDo6bG9hZEZvbnRBdGxhcyIpOworICAgIGJpdG1hcCA9IFdlYkNvcmU6OkNvbXBvc2l0b3JI VURGb250QXRsYXM6OmdlbmVyYXRlRm9udEF0bGFzKGFzY2lpVG9SZWN0VGFibGUsIGZvbnRIZWln aHQpOworfQorCiB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVMYXllclRyZWVWaWV3cG9ydCgpCiB7 CiAgICAgaWYgKCFwYWdlKCkgfHwgIW1fbm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0IHx8ICFtX2xh eWVyVHJlZVZpZXcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRl eCBiZmNmZDU4ZWEzODQzN2IzYTdlNDYzOTZmYmIzNDQ3MmRkY2JlYjJmLi5iYmRiZGE3Yzg5OTQ5 OWM3ZDIwMTc2ZGQ4YjhlODFiZTc2YTU2Yjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmgKQEAgLTMyNSw2ICszMjUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIGRpZENvbW1pdEFuZERyYXdGcmFtZSgpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb21wbGV0 ZVN3YXBCdWZmZXJzKCk7CiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQ29tcG9zaXRlKCk7Cisg ICAgdmlydHVhbCB2b2lkIGNyZWF0ZUZvbnRBdGxhcyhTa0JpdG1hcCYsIFdlYlJlY3RbMTI4XSwg aW50Jik7CiAKICAgICAvLyBXZWJWaWV3SW1wbAogCg==