170051 2017-03-24 06:31:42 -0700 [Modern Media Controls] Captions don't move with the appearance of the inline controls 2017-03-24 15:10:53 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts commit-queue webkit-bug-importer oldest_to_newest 1290790 0 graouts 2017-03-24 06:31:42 -0700 We need to monitor when the controls bar fades in and out and offset the captions by the size of the controls bar. 1290791 1 graouts 2017-03-24 06:31:55 -0700 <rdar://problem/30754428> 1290793 2 305280 graouts 2017-03-24 06:54:29 -0700 Created attachment 305280 Patch 1290929 3 305280 dino 2017-03-24 12:25:11 -0700 Comment on attachment 305280 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=305280&action=review > Source/WebCore/Modules/modern-media-controls/media/media-controller.js:221 > + this.host.textTrackContainer.classList.toggle("compact-controls-bar", !!(layoutTraits & LayoutTraits.Compact)); I don't think you need the !! here. 1290933 4 graouts 2017-03-24 12:30:52 -0700 (In reply to Dean Jackson from comment #3) > Comment on attachment 305280 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=305280&action=review > > > Source/WebCore/Modules/modern-media-controls/media/media-controller.js:221 > > + this.host.textTrackContainer.classList.toggle("compact-controls-bar", !!(layoutTraits & LayoutTraits.Compact)); > > I don't think you need the !! here. It's just so that we're passing a boolean in and not a number, which I think is cleaner. 1291012 5 305280 commit-queue 2017-03-24 15:10:49 -0700 Comment on attachment 305280 Patch Clearing flags on attachment: 305280 Committed r214381: <http://trac.webkit.org/changeset/214381> 1291013 6 commit-queue 2017-03-24 15:10:53 -0700 All reviewed patches have been landed. Closing bug. 305280 2017-03-24 06:54:29 -0700 2017-03-24 15:10:49 -0700 Patch bug-170051-20170324145428.patch text/plain 15544 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2FiMTA1YzhiODg2MWMx M2NhZmU0Y2JkMDViYmMxZjcxNTU5ODJlYi4uMTliY2M2NmVhNWFhMmEwMjg5NzIyNTBmNmFlYTk3 NzI2YjQ3NDZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYxIEBACisyMDE3LTAzLTI0ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFtNb2Rlcm4gTWVkaWEg Q29udHJvbHNdIENhcHRpb25zIGRvbid0IG1vdmUgd2l0aCB0aGUgYXBwZWFyYW5jZSBvZiB0aGUg aW5saW5lIGNvbnRyb2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzAwNTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNzU0NDI4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIG5vdyBzaXplIHRo ZSBjYXB0aW9ucyBjb250YWluZXIgdG8gYWNjb3VudCBmb3IgdGhlIGNvbnRyb2xzIGJhciBoZWln aHQgd2hlbiB2aXNpYmxlLiBUbyBkbyB0aGlzLAorICAgICAgICB3ZSB1c2UgQ1NTIHZhcmlhYmxl cyB0byBzcGVjaWZ5IHRoZSBoZWlnaHQgb2YgdGhlIGNvbnRyb2xzIGJhciBpbiBkZWZhdWx0IGlu bGluZSBtb2RlLCBjb21wYWN0IGlubGluZQorICAgICAgICBtb2RlIGFuZCBmdWxsc2NyZWVuIG1v ZGUuCisKKyAgICAgICAgVGVzdDogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1z dXBwb3J0L3RyYWNrcy1zdXBwb3J0LWNhcHRpb25zLW9mZnNldC13aXRoLWNvbnRyb2xzLWJhci5o dG1sCisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9j b250cm9scy1iYXIuanM6CisgICAgICAgIChDb250cm9sc0Jhci5wcm90b3R5cGUuc2V0IGZhZGVk KToKKyAgICAgICAgTm90aWZ5IHRoZSBob3N0aW5nIE1lZGlhQ29udHJvbHMgdGhhdCB0aGUgImZh ZGVkIiBwcm9wZXJ0eSBjaGFuZ2VkLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy5jc3M6CisgICAgICAg ICgubWVkaWEtY29udHJvbHMuaW9zLmlubGluZSA+IC5jb250cm9scy1iYXIpOgorICAgICAgICBV c2UgdGhlIG5ldyAtLWlubGluZS1jb250cm9scy1iYXItaGVpZ2h0IENTUyB2YXJpYWJsZSB0byBz cGVjaWZ5IHRoZSBpbmxpbmUgYmFyIGhlaWdodC4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLWNvbXBhY3QtaW5saW5lLW1lZGlhLWNvbnRy b2xzLmNzczoKKyAgICAgICAgKC5tZWRpYS1jb250cm9scy5tYWMuaW5saW5lLmNvbXBhY3QgPiAu Y29udHJvbHMtYmFyKToKKyAgICAgICAgVXNlIHRoZSBuZXcgLS1pbmxpbmUtY29tcGFjdC1jb250 cm9scy1iYXItaGVpZ2h0IENTUyB2YXJpYWJsZSB0byBzcGVjaWZ5IHRoZSBpbmxpbmUgYmFyIGhl aWdodC4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xz L21hY29zLWZ1bGxzY3JlZW4tbWVkaWEtY29udHJvbHMuY3NzOgorICAgICAgICAoLm1lZGlhLWNv bnRyb2xzLm1hYy5mdWxsc2NyZWVuID4gLmNvbnRyb2xzLWJhcik6CisgICAgICAgIFVzZSB0aGUg bmV3IC0tZnVsbHNjcmVlbi1jb250cm9scy1iYXItaGVpZ2h0IENTUyB2YXJpYWJsZSB0byBzcGVj aWZ5IHRoZSBpbmxpbmUgYmFyIGhlaWdodC4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLWlubGluZS1tZWRpYS1jb250cm9scy5jc3M6Cisg ICAgICAgICgubWVkaWEtY29udHJvbHMubWFjLmlubGluZSA+IC5jb250cm9scy1iYXIpOgorICAg ICAgICBVc2UgdGhlIG5ldyAtLWlubGluZS1jb250cm9scy1iYXItaGVpZ2h0IENTUyB2YXJpYWJs ZSB0byBzcGVjaWZ5IHRoZSBpbmxpbmUgYmFyIGhlaWdodC4KKworICAgICAgICAqIE1vZHVsZXMv bW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmNzczoKKyAgICAg ICAgKCopOgorICAgICAgICBTcGVjaWZ5IG5ldyBDU1MgdmFyaWFibGVzIGZvciB0aGUgdmFyaW91 cyBjb250cm9scyBiYXIgaGVpZ2h0cy4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmpzOgorICAgICAgICAoTWVkaWFDb250 cm9scy5wcm90b3R5cGUuY29udHJvbHNCYXJGYWRlZFN0YXRlRGlkQ2hhbmdlKToKKyAgICAgICAg Tm90aWZ5IHRoZSBkZWxlZ2F0ZSBvZiBhIGNvbnRyb2xzIGJhciAiZmFkZWQiIHByb3BlcnR5IGNo YW5nZS4gCisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9s cy90ZXh0LXRyYWNrcy5jc3M6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRy YWNrLWNvbnRhaW5lcik6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNr LWNvbnRhaW5lci52aXNpYmxlLWNvbnRyb2xzLWJhcik6CisgICAgICAgICh2aWRlbzo6LXdlYmtp dC1tZWRpYS10ZXh0LXRyYWNrLWNvbnRhaW5lci52aXNpYmxlLWNvbnRyb2xzLWJhci5jb21wYWN0 LWNvbnRyb2xzLWJhcik6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNr LWRpc3BsYXkpOgorICAgICAgICBTaG9ydGVuIHRoZSBoZWlnaHQgb2YgdGhlIGNhcHRpb25zIGNv bnRhaW5lciB3aGVuIHRoZSBjb250cm9scyBiYXIgaXMgdmlzaWJsZS4gV2UgYWxzbworICAgICAg ICBmaXggYSBjb3VwbGUgb2YgcHJlZml4ZWQgcHJvcGVydGllcyB0aGF0IGRpZG4ndCBuZWVkIHRv IGJlLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVk aWEtY29udHJvbGxlci5qczoKKyAgICAgICAgKE1lZGlhQ29udHJvbGxlci5wcm90b3R5cGUuY29u dHJvbHNCYXJGYWRlZFN0YXRlRGlkQ2hhbmdlKToKKyAgICAgICAgKE1lZGlhQ29udHJvbGxlci5w cm90b3R5cGUuX3VwZGF0ZUNvbnRyb2xzSWZOZWVkZWQpOgorICAgICAgICAoTWVkaWFDb250cm9s bGVyLnByb3RvdHlwZS5fdXBkYXRlVGV4dFRyYWNrc0NsYXNzTGlzdCk6CisgICAgICAgIChNZWRp YUNvbnRyb2xsZXIpOgorICAgICAgICBFbnN1cmUgd2UgcmVmbGVjdCB0aGUgImZhZGVkIiBzdGF0 ZSBvZiB0aGUgY29udHJvbHMgYmFyIG9uIHRoZSBjYXB0aW9ucyBjb250YWluZXIgdXNpbmcKKyAg ICAgICAgYSBDU1MgY2xhc3MsIGFzIHdlbGwgYXMgd2hldGhlciB0aGUgY29udHJvbHMgYmFyIG1v ZGUgaXMgY29tcGFjdC4KKwogMjAxNy0wMy0yNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIE1JTUVUeXBlUmVnaXN0cnkgaW1w bGVtZW50YXRpb24gdXNpbmcgeGRnbWltZSBhbmQgcmVtb3ZlIHRoZSBHVEsrIG9uZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJv bHMvY29udHJvbHMtYmFyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvY29udHJvbHMvY29udHJvbHMtYmFyLmpzCmluZGV4IDdjMTBkYWQwMjdmZTdkZjI3 YzM2NmRhM2U2ZGUzZjUxZThiM2JmNzUuLjU1ODlmOTZlMmFjNWEwMjJhMWFlMzgwYmUzZWQ2MmNj OGZlZGRjYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL2NvbnRyb2xzLWJhci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9jb250cm9scy1iYXIuanMKQEAg LTE0OCw2ICsxNDgsOCBAQCBjbGFzcyBDb250cm9sc0JhciBleHRlbmRzIExheW91dE5vZGUKICAg ICAgICAgICAgIGRlbGV0ZSB0aGlzLl9lbmZvcmNlQXV0b0hpZGVUaW1lcjsKIAogICAgICAgICB0 aGlzLm1hcmtEaXJ0eVByb3BlcnR5KCJmYWRlZCIpOworCisgICAgICAgIHRoaXMuX21lZGlhQ29u dHJvbHMuY29udHJvbHNCYXJGYWRlZFN0YXRlRGlkQ2hhbmdlKCk7CiAgICAgfQogCiAgICAgLy8g UHJvdGVjdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmNzcyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lvcy1pbmxp bmUtbWVkaWEtY29udHJvbHMuY3NzCmluZGV4IDhkNjE2ODVmZDk2OGVhM2RmY2EwZjkzNjg2OTQ0 ZjI1MGIwNGNjYTguLmUxNzkxMjVjMTdkMmRkMjZlNTBiNGJkNTAyZTZiZWI1NzJlYTc4M2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEt Y29udHJvbHMuY3NzCkBAIC0yOSw3ICsyOSw3IEBACiAgICAgbGVmdDogMDsKICAgICByaWdodDog MDsKICAgICBib3R0b206IDA7Ci0gICAgaGVpZ2h0OiA1MHB4OworICAgIGhlaWdodDogdmFyKC0t aW5saW5lLWNvbnRyb2xzLWJhci1oZWlnaHQpOwogfQogCiAubWVkaWEtY29udHJvbHMuaW9zLmlu bGluZSA+IC5jb250cm9scy1iYXI6YmVmb3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLWNvbXBhY3QtaW5s aW5lLW1lZGlhLWNvbnRyb2xzLmNzcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLWNvbXBhY3QtaW5saW5lLW1lZGlhLWNvbnRyb2xz LmNzcwppbmRleCBjZDUwNjU4YmUxYWFkZDZmZDM5YzY1OGE3NDQyMjVhMjJmM2NlYmE3Li44Y2Zj YzUyNTE0OTBiMDgzYzM0NjkzMGQzNWQ1Mjc1OWZjOTU4ZjhlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1jb21w YWN0LWlubGluZS1tZWRpYS1jb250cm9scy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtY29tcGFjdC1pbmxpbmUtbWVk aWEtY29udHJvbHMuY3NzCkBAIC0yNiw3ICsyNiw3IEBACiAvKiBDb250cm9scyBiYXIgKi8KIAog Lm1lZGlhLWNvbnRyb2xzLm1hYy5pbmxpbmUuY29tcGFjdCA+IC5jb250cm9scy1iYXIgewotICAg IGhlaWdodDogMjVweDsKKyAgICBoZWlnaHQ6IHZhcigtLWlubGluZS1jb21wYWN0LWNvbnRyb2xz LWJhci1oZWlnaHQpOwogfQogCiAvKiBDb250cm9scyBwbGFjZW1lbnQgKi8KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21h Y29zLWZ1bGxzY3JlZW4tbWVkaWEtY29udHJvbHMuY3NzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtZnVsbHNjcmVlbi1tZWRpYS1j b250cm9scy5jc3MKaW5kZXggMWYxZmQ2MWQ3Nzk1NDAyODUwMjIxZGM2N2FlYTI0MTFmNGQ3OGZm Ny4uMTg2MjgwY2RiNzlhYTMyOTQ3NWNlMmRlMWQ0NjlmYjEwY2ZkZGM5ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFj b3MtZnVsbHNjcmVlbi1tZWRpYS1jb250cm9scy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtZnVsbHNjcmVlbi1tZWRp YS1jb250cm9scy5jc3MKQEAgLTM3LDcgKzM3LDcgQEAKICAgICBsZWZ0OiBjYWxjKCgxMDAlIC0g dmFyKC0tY29udHJvbHMtYmFyLXdpZHRoKSkgLyAyKTsKICAgICBib3R0b206IDI1cHg7CiAgICAg d2lkdGg6IHZhcigtLWNvbnRyb2xzLWJhci13aWR0aCk7Ci0gICAgaGVpZ2h0OiA3NXB4OworICAg IGhlaWdodDogdmFyKC0tZnVsbHNjcmVlbi1jb250cm9scy1iYXItaGVpZ2h0KTsKIH0KIAogLm1l ZGlhLWNvbnRyb2xzLm1hYy5mdWxsc2NyZWVuID4gLmNvbnRyb2xzLWJhciA+IC5iYWNrZ3JvdW5k LXRpbnQgPiBkaXYgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmNzcyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21h Y29zLWlubGluZS1tZWRpYS1jb250cm9scy5jc3MKaW5kZXggNjZlMzYyZDZiYzkzZjljNTAxM2M4 MjkzMDE1NmIwZWI1MjA3MDJkMi4uNGQyYjA5N2Y0ZWM2ZDYzNjVkZmJmM2RhMzY2NjFmZDM3N2Nh ZDcxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvY29udHJvbHMvbWFjb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmNzcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1p bmxpbmUtbWVkaWEtY29udHJvbHMuY3NzCkBAIC0yOSw3ICsyOSw3IEBACiAgICAgbGVmdDogMDsK ICAgICBib3R0b206IDA7CiAgICAgd2lkdGg6IDEwMCU7Ci0gICAgaGVpZ2h0OiA1MHB4OworICAg IGhlaWdodDogdmFyKC0taW5saW5lLWNvbnRyb2xzLWJhci1oZWlnaHQpOwogfQogCiAubWVkaWEt Y29udHJvbHMubWFjLmlubGluZSA+IC5jb250cm9scy1iYXIgPiAqIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21lZGlh LWNvbnRyb2xzLmNzcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmNzcwppbmRleCBmMDM1OGVkMzZmNzQwMGYxODk5 NzEzNGJlNDNmOWI0MzAzYzU0ZTUyLi4zOWI0NTJlZThlZjMxNmY5MzEyMzQzYmQ3N2E0MzJjYWRl OWRjOWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9jb250cm9scy9tZWRpYS1jb250cm9scy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWVkaWEtY29udHJvbHMuY3Nz CkBAIC0zNSw2ICszNSwxMiBAQAogICAgIG1pbi1oZWlnaHQ6IDUwcHggIWltcG9ydGFudDsKIH0K IAorKiB7CisgICAgLS1pbmxpbmUtY29udHJvbHMtYmFyLWhlaWdodDogNTBweDsKKyAgICAtLWlu bGluZS1jb21wYWN0LWNvbnRyb2xzLWJhci1oZWlnaHQ6IDI1cHg7CisgICAgLS1mdWxsc2NyZWVu LWNvbnRyb2xzLWJhci1oZWlnaHQ6IDc1cHg7Cit9CisKIC8qIFdlIG5lZWQgdG8gdXNlIHJlbGF0 aXZlIHBvc2l0aW9uaW5nIGR1ZSB0byB3ZWJraXQub3JnL2IvMTYzNjAzICovCiAubWVkaWEtY29u dHJvbHMtY29udGFpbmVyIHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tZWRp YS1jb250cm9scy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmpzCmluZGV4IDc1MTQyYWYyNzgwYTFkMDA5ZTk0 M2RiOGE2ZGZjN2VjMDIxYWYzMTUuLjZjYzc0MDVkN2RkZWI2ZDU1MGQyYTJjM2ViYjE3ZWJhMTkz YjFjNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmpzCkBA IC0xODUsNiArMTg1LDEyIEBAIGNsYXNzIE1lZGlhQ29udHJvbHMgZXh0ZW5kcyBMYXlvdXROb2Rl CiAgICAgICAgICAgICB0aGlzLmxheW91dCgpOwogICAgIH0KIAorICAgIGNvbnRyb2xzQmFyRmFk ZWRTdGF0ZURpZENoYW5nZSgpCisgICAgeworICAgICAgICBpZiAodGhpcy5kZWxlZ2F0ZSAmJiB0 eXBlb2YgdGhpcy5kZWxlZ2F0ZS5jb250cm9sc0JhckZhZGVkU3RhdGVEaWRDaGFuZ2UgPT09ICJm dW5jdGlvbiIpCisgICAgICAgICAgICB0aGlzLmRlbGVnYXRlLmNvbnRyb2xzQmFyRmFkZWRTdGF0 ZURpZENoYW5nZSgpOworICAgIH0KKwogICAgIGxheW91dFRyYWl0c0RpZENoYW5nZSgpCiAgICAg ewogICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGFzIG5lZWRlZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRy b2xzL3RleHQtdHJhY2tzLmNzcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL3RleHQtdHJhY2tzLmNzcwppbmRleCBhYjY1ZTIyYzIxN2IyNDM5 OWQ3NzliNmRiNmIwZDFhMDg1NjE1ODljLi40ZjUyMDc3ZDZhMjU1MDg4MjQ3M2Q5M2E2YzExMjEy MDljZWUwOTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9jb250cm9scy90ZXh0LXRyYWNrcy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGV4dC10cmFja3MuY3NzCkBA IC0yNCw3ICsyNCw2IEBACiAgKi8KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtdGV4dC10cmFjay1j b250YWluZXIgewotICAgIGJvdHRvbTogNTBweDsKICAgICBvdmVyZmxvdzogaGlkZGVuOwogICAg IHBhZGRpbmctYm90dG9tOiA1cHg7CiAgICAgei1pbmRleDogMDsKQEAgLTQwLDExICszOSwxOSBA QCB2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNvbnRhaW5lciB7CiAgICAgcG9pbnRl ci1ldmVudHM6IG5vbmU7CiAgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTsKIAotICAgIC13 ZWJraXQtZmxleDogMSAxIGF1dG87CisgICAgZmxleDogMSAxIGF1dG87CiAKICAgICAtd2Via2l0 LWxpbmUtYm94LWNvbnRhaW46IGJsb2NrIGlubGluZS1ib3ggcmVwbGFjZWQ7CiB9CiAKK3ZpZGVv Ojotd2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29udGFpbmVyLnZpc2libGUtY29udHJvbHMtYmFy IHsKKyAgICBoZWlnaHQ6IGNhbGMoMTAwJSAtIHZhcigtLWlubGluZS1jb250cm9scy1iYXItaGVp Z2h0KSk7Cit9CisKK3ZpZGVvOjotd2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29udGFpbmVyLnZp c2libGUtY29udHJvbHMtYmFyLmNvbXBhY3QtY29udHJvbHMtYmFyIHsKKyAgICBoZWlnaHQ6IGNh bGMoMTAwJSAtIHZhcigtLWlubGluZS1jb21wYWN0LWNvbnRyb2xzLWJhci1oZWlnaHQpKTsKK30K KwogdmlkZW86OmN1ZSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAwLCAwLCAwLjgp OwogfQpAQCAtNTMsNyArNjAsNyBAQCB2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWRp c3BsYXkgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBvdmVyZmxvdzogaGlkZGVuOwog ICAgIHdoaXRlLXNwYWNlOiBwcmUtd3JhcDsKLSAgICAtd2Via2l0LWJveC1zaXppbmc6IGJvcmRl ci1ib3g7CisgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICAgICBmb250OiAyMnB4IHNhbnMt c2VyaWY7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCmlu ZGV4IDQxNzViNGU2MGI3M2RmODg1MzBjYWI4OGFmNmI0YzdkNWVhNmU5ZTMuLjMzYzczNWUyZTdi YTcwNWMzNjdjOTkwZDk1MjU0ZmViM2RkZGY2NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEv bWVkaWEtY29udHJvbGxlci5qcwpAQCAtMTAyLDYgKzEwMiwxMSBAQCBjbGFzcyBNZWRpYUNvbnRy b2xsZXIKICAgICAgICAgdGhpcy5jb250cm9scy51c2VzTFRSVXNlckludGVyZmFjZUxheW91dERp cmVjdGlvbiA9IGZsYWc7CiAgICAgfQogCisgICAgY29udHJvbHNCYXJGYWRlZFN0YXRlRGlkQ2hh bmdlKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRleHRUcmFja3NDbGFzc0xpc3QoKTsK KyAgICB9CisKICAgICBtYWNPU0NvbnRyb2xzQmFja2dyb3VuZFdhc0NsaWNrZWQoKQogICAgIHsK ICAgICAgICAgLy8gVG9nZ2xlIHBsYXliYWNrIHdoZW4gY2xpY2tpbmcgb24gdGhlIHZpZGVvIGJ1 dCBub3Qgb24gYW55IGNvbnRyb2xzIG9uIG1hY09TLgpAQCAtMTQyLDYgKzE0Nyw3IEBAIGNsYXNz IE1lZGlhQ29udHJvbGxlcgogICAgICAgICBjb25zdCBDb250cm9sc0NsYXNzID0gdGhpcy5fY29u dHJvbHNDbGFzc0ZvckxheW91dFRyYWl0cyhsYXlvdXRUcmFpdHMpOwogICAgICAgICBpZiAocHJl dmlvdXNDb250cm9scyAmJiBwcmV2aW91c0NvbnRyb2xzLmNvbnN0cnVjdG9yID09PSBDb250cm9s c0NsYXNzKSB7CiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLmxheW91dFRyYWl0cyA9IGxheW91 dFRyYWl0czsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVRleHRUcmFja3NDbGFzc0xpc3QoKTsK ICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUNvbnRyb2xzU2l6ZSgpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CkBAIC0xNjcsNiArMTczLDcgQEAgY2xhc3MgTWVkaWFDb250cm9sbGVy CiAgICAgICAgICAgICB0aGlzLmNvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLmVs ZW1lbnQpOwogCiAgICAgICAgIHRoaXMuY29udHJvbHMubGF5b3V0VHJhaXRzID0gbGF5b3V0VHJh aXRzOworICAgICAgICB0aGlzLl91cGRhdGVUZXh0VHJhY2tzQ2xhc3NMaXN0KCk7CiAgICAgICAg IHRoaXMuX3VwZGF0ZUNvbnRyb2xzU2l6ZSgpOwogCiAgICAgICAgIHRoaXMuX3N1cHBvcnRpbmdP YmplY3RzID0gW0FpcnBsYXlTdXBwb3J0LCBDb250cm9sc1Zpc2liaWxpdHlTdXBwb3J0LCBGdWxs c2NyZWVuU3VwcG9ydCwgTXV0ZVN1cHBvcnQsIFBpUFN1cHBvcnQsIFBsYWNhcmRTdXBwb3J0LCBQ bGF5YmFja1N1cHBvcnQsIFNjcnViYmluZ1N1cHBvcnQsIFNlZWtCYWNrd2FyZFN1cHBvcnQsIFNl ZWtGb3J3YXJkU3VwcG9ydCwgU2tpcEJhY2tTdXBwb3J0LCBTdGFydFN1cHBvcnQsIFN0YXR1c1N1 cHBvcnQsIFRpbWVMYWJlbHNTdXBwb3J0LCBUcmFja3NTdXBwb3J0LCBWb2x1bWVTdXBwb3J0LCBW b2x1bWVEb3duU3VwcG9ydCwgVm9sdW1lVXBTdXBwb3J0XS5tYXAoU3VwcG9ydENsYXNzID0+IHsK QEAgLTIwMSw0ICsyMDgsMTcgQEAgY2xhc3MgTWVkaWFDb250cm9sbGVyCiAgICAgICAgIHJldHVy biBNYWNPU0lubGluZU1lZGlhQ29udHJvbHM7CiAgICAgfQogCisgICAgX3VwZGF0ZVRleHRUcmFj a3NDbGFzc0xpc3QoKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLmhvc3QpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgY29uc3QgbGF5b3V0VHJhaXRzID0gdGhpcy5sYXlvdXRUcmFp dHM7CisgICAgICAgIGlmIChsYXlvdXRUcmFpdHMgJiBMYXlvdXRUcmFpdHMuRnVsbHNjcmVlbikK KyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLmhvc3QudGV4dFRyYWNrQ29udGFp bmVyLmNsYXNzTGlzdC50b2dnbGUoInZpc2libGUtY29udHJvbHMtYmFyIiwgIXRoaXMuY29udHJv bHMuY29udHJvbHNCYXIuZmFkZWQpOworICAgICAgICB0aGlzLmhvc3QudGV4dFRyYWNrQ29udGFp bmVyLmNsYXNzTGlzdC50b2dnbGUoImNvbXBhY3QtY29udHJvbHMtYmFyIiwgISEobGF5b3V0VHJh aXRzICYgTGF5b3V0VHJhaXRzLkNvbXBhY3QpKTsKKyAgICB9CisKIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2YjY3YTAw NzgxMGY2ZmZhN2Q3ODAxYzM0NTRjMDQxMTQ2MmU2ZGZmLi40MTQ2NzIwZTIyOTgwM2YwZDA4MmQ2 ZGVkODRiNWYxMzIwMjQ2MTFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTctMDMtMjQgIEFu dG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW01vZGVybiBNZWRp YSBDb250cm9sc10gQ2FwdGlvbnMgZG9uJ3QgbW92ZSB3aXRoIHRoZSBhcHBlYXJhbmNlIG9mIHRo ZSBpbmxpbmUgY29udHJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MDA1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzA3NTQ0Mjg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IHRl c3QsIHdoaWNoIHdvdWxkIGhhdmUgcHJldmlvdXNseSBmYWlsZWQsIHdoZXJlIHdlIGNoZWNrIHRo YXQgd2UgYWNjb3VudCBmb3IgdGhlIGNvbnRyb2xzIGJhciBoZWlnaHQKKyAgICAgICAgd2hlbiBz aG93aW5nIGNhcHRpb25zIHdpdGggdGhlIGNvbnRyb2xzIGJhciB2aXNpYmxlLgorCisgICAgICAg ICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBw b3J0LWNhcHRpb25zLW9mZnNldC13aXRoLWNvbnRyb2xzLWJhci1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90 cmFja3Mtc3VwcG9ydC1jYXB0aW9ucy1vZmZzZXQtd2l0aC1jb250cm9scy1iYXIuaHRtbDogQWRk ZWQuCisKIDIwMTctMDMtMjQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIEFkZCBNSU1FVHlwZVJlZ2lzdHJ5IGltcGxlbWVudGF0aW9u IHVzaW5nIHhkZ21pbWUgYW5kIHJlbW92ZSB0aGUgR1RLKyBvbmUKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mt c3VwcG9ydC1jYXB0aW9ucy1vZmZzZXQtd2l0aC1jb250cm9scy1iYXItZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3Ry YWNrcy1zdXBwb3J0LWNhcHRpb25zLW9mZnNldC13aXRoLWNvbnRyb2xzLWJhci1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uNTg3MWRmODNkYTU0Y2Q3ZTkxY2QzNjM5N2Q4M2M0YTUyN2YwZWZhMgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jYXB0aW9ucy1vZmZzZXQtd2l0aC1jb250 cm9scy1iYXItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTAgQEAKK0Vuc3VyZSB0aGF0IHRoZSBj YXB0aW9ucyBjb250YWluZXIgYWNjb3VudHMgZm9yIHRoZSBjb250cm9zbCBiYXIgd2hlbiB2aXNp YmxlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBnZXRDb21wdXRlZFN0 eWxlKHNoYWRvd1Jvb3QubGFzdEVsZW1lbnRDaGlsZC5maXJzdEVsZW1lbnRDaGlsZCkuaGVpZ2h0 IGlzICJjYWxjKDEwMCUgLSAyNXB4KSIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUK KworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQtY2FwdGlvbnMtb2Zm c2V0LXdpdGgtY29udHJvbHMtYmFyLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVk aWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQtY2FwdGlvbnMtb2Zmc2V0 LXdpdGgtY29udHJvbHMtYmFyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZThhNzdkZmJhMGIwYmE5ODEyMTE5 YWY5M2ZhZjE4OTk3OTc3NjcxNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jYXB0 aW9ucy1vZmZzZXQtd2l0aC1jb250cm9scy1iYXIuaHRtbApAQCAtMCwwICsxLDI1IEBACis8IURP Q1RZUEUgaHRtbD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUu anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11 dGlscy5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48L3NjcmlwdD4KKzxib2R5PgorPHZpZGVv IHNyYz0iLi4vLi4vY29udGVudC9DQytTdWJ0aXRsZXMubW92IiBzdHlsZT0icG9zaXRpb246IGFi c29sdXRlOyBsZWZ0OiAwOyB0b3A6IDA7IHdpZHRoOiA2NDBweDsgaGVpZ2h0OiAzNjBweDsiIGNv bnRyb2xzIGF1dG9wbGF5PjwvdmlkZW8+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+ CisKK3dpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworZGVzY3JpcHRpb24oIkVuc3VyZSB0 aGF0IHRoZSBjYXB0aW9ucyBjb250YWluZXIgYWNjb3VudHMgZm9yIHRoZSBjb250cm9zbCBiYXIg d2hlbiB2aXNpYmxlLiIpOworCitjb25zdCBtZWRpYSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3Io InZpZGVvIik7Citjb25zdCBzaGFkb3dSb290ID0gd2luZG93LmludGVybmFscy5zaGFkb3dSb290 KG1lZGlhKTsKKworbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKKyAgICBt ZWRpYS5wYXVzZSgpOworCisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJnZXRDb21wdXRlZFN0 eWxlKHNoYWRvd1Jvb3QubGFzdEVsZW1lbnRDaGlsZC5maXJzdEVsZW1lbnRDaGlsZCkuaGVpZ2h0 IiwgImNhbGMoMTAwJSAtIDI1cHgpIik7CisgICAgbWVkaWEucmVtb3ZlKCk7CisgICAgZmluaXNo SlNUZXN0KCk7Cit9KTsKKworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3Vy Y2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cg==