47330 2010-10-07 02:11:31 -0700 Fixing viewport meta tag user-scalable handling 2010-12-13 14:37:33 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 luiz luiz commit-queue evan kenneth oldest_to_newest 290873 0 luiz 2010-10-07 02:11:31 -0700 user-scalable viewport meta tag attribute was not considered when computing viewport attributes. 290880 1 70057 luiz 2010-10-07 02:22:17 -0700 Created attachment 70057 patch 291004 2 70057 kenneth 2010-10-07 07:39:38 -0700 Comment on attachment 70057 patch View in context: https://bugs.webkit.org/attachment.cgi?id=70057&action=review > WebCore/dom/ViewportArguments.cpp:162 > + if (!args.userScalable) > + result.maximumScale = result.minimumScale = result.initialScale; I think you are missing a result.userScalable = args.userScalable here. 291027 3 70091 luiz 2010-10-07 08:33:57 -0700 Created attachment 70091 patch 291104 4 70091 commit-queue 2010-10-07 10:26:52 -0700 Comment on attachment 70091 patch Clearing flags on attachment: 70091 Committed r69316: <http://trac.webkit.org/changeset/69316> 291105 5 commit-queue 2010-10-07 10:26:56 -0700 All reviewed patches have been landed. Closing bug. 321434 6 evan 2010-12-13 14:36:06 -0800 This patch changed userScalable from a float to a bool. However, userScalable is initialized from an enum in the constructor, and the enum value is ValueAuto (-1). This produces a compiler warning and probably isn't what you intended. third_party/WebKit/WebCore/dom/ViewportArguments.h(78) : warning C4305: 'initializing' : truncation from '' to 'bool' Should I open a separate bug about this? 321436 7 kenneth 2010-12-13 14:37:33 -0800 (In reply to comment #6) > This patch changed userScalable from a float to a bool. > However, userScalable is initialized from an enum in the constructor, and the enum value is ValueAuto (-1). This produces a compiler warning and probably isn't what you intended. > > > third_party/WebKit/WebCore/dom/ViewportArguments.h(78) : warning C4305: 'initializing' : truncation from '' to 'bool' > > Should I open a separate bug about this? Oh yeah, please do. Feel free to cc me as. 70057 2010-10-07 02:22:17 -0700 2010-10-07 08:33:57 -0700 patch 0001-Fixing-viewport-meta-tag-user-scalable-handling.patch text/plain 5371 luiz RnJvbSAyYmY4MDVjMjE5OTlhMWEzMjk2MTBmNTY5NDU4MGEyNzhiOTM4ZTQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IFRodSwgNyBPY3QgMjAxMCAwNjoxOToyMCAtMDMwMApTdWJqZWN0OiBbUEFU Q0hdIEZpeGluZyB2aWV3cG9ydCBtZXRhIHRhZyB1c2VyLXNjYWxhYmxlIGhhbmRsaW5nCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDczMzAKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKdXNlci1zY2FsYWJsZSBhdHRyaWJ1dGUgd2FzIG5vdCBjb25zaWRlcmVk IGluIHZpZXdwb3J0IG1ldGEgdGFnIGhhbmRsaW5nLgoKV2ViQ29yZToKCiogZG9tL1ZpZXdwb3J0 QXJndW1lbnRzLmNwcDoKKFdlYkNvcmU6OmZpbmRDb25maWd1cmF0aW9uRm9yVmlld3BvcnREYXRh KToKKiBkb20vVmlld3BvcnRBcmd1bWVudHMuaDoKCldlYktpdC9xdDoKCiogQXBpL3F3ZWJwYWdl LmNwcDoKKFFXZWJQYWdlOjp2aWV3cG9ydENvbmZpZ3VyYXRpb25Gb3JTaXplKToKCldlYktpdDI6 CgoqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6CihRV0tQYWdlOjp2aWV3cG9ydENvbmZp Z3VyYXRpb25Gb3JTaXplKToKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgfCAgIDEzICsrKysrKysrKysrKysKIFdlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNw cCAgICB8ICAgIDQgKysrKwogV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaCAgICAgIHwg ICAgNCArKystCiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgfCAgICAxICsK IFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysrKysr CiBXZWJLaXQyL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysr KwogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwIHwgICAgMSArCiA3IGZpbGVz IGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlM2Q2MjM4Li4yNTg4 OTgzIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTEwLTA3ICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29z dGluaUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeGluZyB2aWV3cG9ydCBtZXRhIHRhZyB1c2VyLXNjYWxhYmxlIGhhbmRs aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzMz MAorCisgICAgICAgIHVzZXItc2NhbGFibGUgYXR0cmlidXRlIHdhcyBub3QgY29uc2lkZXJlZCBp biB2aWV3cG9ydCBtZXRhIHRhZyBoYW5kbGluZy4KKworICAgICAgICAqIGRvbS9WaWV3cG9ydEFy Z3VtZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaW5kQ29uZmlndXJhdGlvbkZvclZpZXdw b3J0RGF0YSk6CisgICAgICAgICogZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmg6CisKIDIwMTAtMTAt MDYgIEx1aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9W aWV3cG9ydEFyZ3VtZW50cy5jcHAgYi9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAK aW5kZXggNjk1NjI4Yy4uN2ViNDVhYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vVmlld3BvcnRB cmd1bWVudHMuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNwcApAQCAt MTU3LDYgKzE1NywxMCBAQCBWaWV3cG9ydEF0dHJpYnV0ZXMgZmluZENvbmZpZ3VyYXRpb25Gb3JW aWV3cG9ydERhdGEoVmlld3BvcnRBcmd1bWVudHMgYXJncywgaW50CiAgICAgLy8gVXBkYXRlIG1p bmltdW0gc2NhbGUgZmFjdG9yLCB0byBuZXZlciBhbGxvdyB6b29taW5nIG91dCBtb3JlIHRoYW4g dmlld3BvcnQKICAgICByZXN1bHQubWluaW11bVNjYWxlID0gbWF4KHJlc3VsdC5taW5pbXVtU2Nh bGUsIG1heChhdmFpbGFibGVXaWR0aCAvIHdpZHRoLCBhdmFpbGFibGVIZWlnaHQgLyBoZWlnaHQp KTsKIAorICAgIC8vIE1ha2UgbWF4aW11bSBhbmQgbWluaW11bSBzY2FsZSBlcXVhbCB0byB0aGUg aW5pdGlhbCBzY2FsZSBpZiB1c2VyIGlzIG5vdCBhbGxvd2VkIHRvIHpvb20gaW4vb3V0LgorICAg IGlmICghYXJncy51c2VyU2NhbGFibGUpCisgICAgICAgIHJlc3VsdC5tYXhpbXVtU2NhbGUgPSBy ZXN1bHQubWluaW11bVNjYWxlID0gcmVzdWx0LmluaXRpYWxTY2FsZTsKKwogICAgIHJldHVybiBy ZXN1bHQ7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmgg Yi9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCmluZGV4IDg5YWYyOTAuLjA2ZjQ0ZmIg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmgKKysrIGIvV2ViQ29y ZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaApAQCAtNTAsNiArNTAsOCBAQCBzdHJ1Y3QgVmlld3Bv cnRBdHRyaWJ1dGVzIHsKICAgICBmbG9hdCBpbml0aWFsU2NhbGU7CiAgICAgZmxvYXQgbWluaW11 bVNjYWxlOwogICAgIGZsb2F0IG1heGltdW1TY2FsZTsKKworICAgIGJvb2wgdXNlclNjYWxhYmxl OwogfTsKIAogc3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKQEAgLTgzLDcgKzg1LDcgQEAgc3Ry dWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKICAgICBmbG9hdCBoZWlnaHQ7CiAgICAgZmxvYXQgdGFy Z2V0RGVuc2l0eURwaTsKIAotICAgIGZsb2F0IHVzZXJTY2FsYWJsZTsKKyAgICBib29sIHVzZXJT Y2FsYWJsZTsKIAogICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYg b3RoZXIpIGNvbnN0CiAgICAgewpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5j cHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCBlYzJmZmY5Li43ZDk2ZjdlIDEw MDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9XZWJLaXQvcXQvQXBp L3F3ZWJwYWdlLmNwcApAQCAtMjM5OSw2ICsyMzk5LDcgQEAgUVdlYlBhZ2U6OlZpZXdwb3J0Q29u ZmlndXJhdGlvbiBRV2ViUGFnZTo6dmlld3BvcnRDb25maWd1cmF0aW9uRm9yU2l6ZShjb25zdCBR U2kKICAgICByZXN1bHQubV9taW5pbXVtU2NhbGVGYWN0b3IgPSBjb25mLm1pbmltdW1TY2FsZTsK ICAgICByZXN1bHQubV9tYXhpbXVtU2NhbGVGYWN0b3IgPSBjb25mLm1heGltdW1TY2FsZTsKICAg ICByZXN1bHQubV9kZXZpY2VQaXhlbFJhdGlvID0gY29uZi5kZXZpY2VQaXhlbFJhdGlvOworICAg IHJlc3VsdC5tX2lzVXNlclNjYWxhYmxlID0gY29uZi51c2VyU2NhbGFibGU7CiAKICAgICByZXR1 cm4gcmVzdWx0OwogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggY2EwMDFhOC4uZTU1NGUyMiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTAtMTAtMDcgIEx1aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4aW5nIHZp ZXdwb3J0IG1ldGEgdGFnIHVzZXItc2NhbGFibGUgaGFuZGxpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3MzMwCisKKyAgICAgICAgdXNlci1zY2Fs YWJsZSBhdHRyaWJ1dGUgd2FzIG5vdCBjb25zaWRlcmVkIGluIHZpZXdwb3J0IG1ldGEgdGFnIGhh bmRsaW5nLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdl Ojp2aWV3cG9ydENvbmZpZ3VyYXRpb25Gb3JTaXplKToKKwogMjAxMC0xMC0wNiAgTHVpeiBBZ29z dGluaSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0 Mi9DaGFuZ2VMb2cKaW5kZXggNzEwZTE1Yi4uYzlkODI5OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0x MC0wNyAgTHVpeiBBZ29zdGluaSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhpbmcgdmlld3Bv cnQgbWV0YSB0YWcgdXNlci1zY2FsYWJsZSBoYW5kbGluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDczMzAKKworICAgICAgICB1c2VyLXNjYWxhYmxl IGF0dHJpYnV0ZSB3YXMgbm90IGNvbnNpZGVyZWQgaW4gdmlld3BvcnQgbWV0YSB0YWcgaGFuZGxp bmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwOgorICAgICAgICAo UVdLUGFnZTo6dmlld3BvcnRDb25maWd1cmF0aW9uRm9yU2l6ZSk6CisKIDIwMTAtMTAtMDYgIEx1 aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXdrcGFnZS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAK aW5kZXggNTE3NzE4YS4uMGNmYTdkNSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3F3a3BhZ2UuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNw cApAQCAtMzQ5LDYgKzM0OSw3IEBAIFFXS1BhZ2U6OlZpZXdwb3J0Q29uZmlndXJhdGlvbiBRV0tQ YWdlOjp2aWV3cG9ydENvbmZpZ3VyYXRpb25Gb3JTaXplKFFTaXplIGF2YWlsCiAgICAgcmVzdWx0 Lm1fbWluaW11bVNjYWxlRmFjdG9yID0gY29uZi5taW5pbXVtU2NhbGU7CiAgICAgcmVzdWx0Lm1f bWF4aW11bVNjYWxlRmFjdG9yID0gY29uZi5tYXhpbXVtU2NhbGU7CiAgICAgcmVzdWx0Lm1fZGV2 aWNlUGl4ZWxSYXRpbyA9IGNvbmYuZGV2aWNlUGl4ZWxSYXRpbzsKKyAgICByZXN1bHQubV9pc1Vz ZXJTY2FsYWJsZSA9IGNvbmYudXNlclNjYWxhYmxlOwogCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0K LS0gCjEuNy4yLjIKCg== 70091 2010-10-07 08:33:57 -0700 2010-10-07 10:26:51 -0700 patch 0001-Fixing-viewport-meta-tag-user-scalable-handling.patch text/plain 5418 luiz RnJvbSBkNDg3ZGVmODRmYzcxZjdhNzZhYTRjODdjZWU4MGU0Y2NkNGUwNTM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IFRodSwgNyBPY3QgMjAxMCAwNjoxOToyMCAtMDMwMApTdWJqZWN0OiBbUEFU Q0hdIEZpeGluZyB2aWV3cG9ydCBtZXRhIHRhZyB1c2VyLXNjYWxhYmxlIGhhbmRsaW5nCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDczMzAKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKdXNlci1zY2FsYWJsZSBhdHRyaWJ1dGUgd2FzIG5vdCBjb25zaWRlcmVk IGluIHZpZXdwb3J0IG1ldGEgdGFnIGhhbmRsaW5nLgoKV2ViQ29yZToKCiogZG9tL1ZpZXdwb3J0 QXJndW1lbnRzLmNwcDoKKFdlYkNvcmU6OmZpbmRDb25maWd1cmF0aW9uRm9yVmlld3BvcnREYXRh KToKKiBkb20vVmlld3BvcnRBcmd1bWVudHMuaDoKCldlYktpdC9xdDoKCiogQXBpL3F3ZWJwYWdl LmNwcDoKKFFXZWJQYWdlOjp2aWV3cG9ydENvbmZpZ3VyYXRpb25Gb3JTaXplKToKCldlYktpdDI6 CgoqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6CihRV0tQYWdlOjp2aWV3cG9ydENvbmZp Z3VyYXRpb25Gb3JTaXplKToKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgfCAgIDEzICsrKysrKysrKysrKysKIFdlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNw cCAgICB8ICAgIDUgKysrKysKIFdlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmggICAgICB8 ICAgIDQgKysrLQogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgICAgICAgICAgIHwgICAgMSAr CiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysr KwogV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgIHwgICAxMiArKysrKysrKysr KysKIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcCB8ICAgIDEgKwogNyBmaWxl cyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNkNjIzOC4uMjU4 ODk4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMC0wNyAgTHVpeiBBZ29zdGluaSAgPGx1aXouYWdv c3RpbmlAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaXhpbmcgdmlld3BvcnQgbWV0YSB0YWcgdXNlci1zY2FsYWJsZSBoYW5k bGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcz MzAKKworICAgICAgICB1c2VyLXNjYWxhYmxlIGF0dHJpYnV0ZSB3YXMgbm90IGNvbnNpZGVyZWQg aW4gdmlld3BvcnQgbWV0YSB0YWcgaGFuZGxpbmcuCisKKyAgICAgICAgKiBkb20vVmlld3BvcnRB cmd1bWVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmluZENvbmZpZ3VyYXRpb25Gb3JWaWV3 cG9ydERhdGEpOgorICAgICAgICAqIGRvbS9WaWV3cG9ydEFyZ3VtZW50cy5oOgorCiAyMDEwLTEw LTA2ICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20v Vmlld3BvcnRBcmd1bWVudHMuY3BwIGIvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3Bw CmluZGV4IDY5NTYyOGMuLjliZmE0NzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1ZpZXdwb3J0 QXJndW1lbnRzLmNwcAorKysgYi9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKQEAg LTE1Nyw2ICsxNTcsMTEgQEAgVmlld3BvcnRBdHRyaWJ1dGVzIGZpbmRDb25maWd1cmF0aW9uRm9y Vmlld3BvcnREYXRhKFZpZXdwb3J0QXJndW1lbnRzIGFyZ3MsIGludAogICAgIC8vIFVwZGF0ZSBt aW5pbXVtIHNjYWxlIGZhY3RvciwgdG8gbmV2ZXIgYWxsb3cgem9vbWluZyBvdXQgbW9yZSB0aGFu IHZpZXdwb3J0CiAgICAgcmVzdWx0Lm1pbmltdW1TY2FsZSA9IG1heChyZXN1bHQubWluaW11bVNj YWxlLCBtYXgoYXZhaWxhYmxlV2lkdGggLyB3aWR0aCwgYXZhaWxhYmxlSGVpZ2h0IC8gaGVpZ2h0 KSk7CiAKKyAgICByZXN1bHQudXNlclNjYWxhYmxlID0gYXJncy51c2VyU2NhbGFibGU7CisgICAg Ly8gTWFrZSBtYXhpbXVtIGFuZCBtaW5pbXVtIHNjYWxlIGVxdWFsIHRvIHRoZSBpbml0aWFsIHNj YWxlIGlmIHVzZXIgaXMgbm90IGFsbG93ZWQgdG8gem9vbSBpbi9vdXQuCisgICAgaWYgKCFhcmdz LnVzZXJTY2FsYWJsZSkKKyAgICAgICAgcmVzdWx0Lm1heGltdW1TY2FsZSA9IHJlc3VsdC5taW5p bXVtU2NhbGUgPSByZXN1bHQuaW5pdGlhbFNjYWxlOworCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0K IApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaCBiL1dlYkNvcmUv ZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmgKaW5kZXggODlhZjI5MC4uMDZmNDRmYiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaAorKysgYi9XZWJDb3JlL2RvbS9WaWV3 cG9ydEFyZ3VtZW50cy5oCkBAIC01MCw2ICs1MCw4IEBAIHN0cnVjdCBWaWV3cG9ydEF0dHJpYnV0 ZXMgewogICAgIGZsb2F0IGluaXRpYWxTY2FsZTsKICAgICBmbG9hdCBtaW5pbXVtU2NhbGU7CiAg ICAgZmxvYXQgbWF4aW11bVNjYWxlOworCisgICAgYm9vbCB1c2VyU2NhbGFibGU7CiB9OwogCiBz dHJ1Y3QgVmlld3BvcnRBcmd1bWVudHMgewpAQCAtODMsNyArODUsNyBAQCBzdHJ1Y3QgVmlld3Bv cnRBcmd1bWVudHMgewogICAgIGZsb2F0IGhlaWdodDsKICAgICBmbG9hdCB0YXJnZXREZW5zaXR5 RHBpOwogCi0gICAgZmxvYXQgdXNlclNjYWxhYmxlOworICAgIGJvb2wgdXNlclNjYWxhYmxlOwog CiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBvdGhlcikgY29u c3QKICAgICB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IGVjMmZmZjkuLjdkOTZmN2UgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2Uu Y3BwCkBAIC0yMzk5LDYgKzIzOTksNyBAQCBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9u IFFXZWJQYWdlOjp2aWV3cG9ydENvbmZpZ3VyYXRpb25Gb3JTaXplKGNvbnN0IFFTaQogICAgIHJl c3VsdC5tX21pbmltdW1TY2FsZUZhY3RvciA9IGNvbmYubWluaW11bVNjYWxlOwogICAgIHJlc3Vs dC5tX21heGltdW1TY2FsZUZhY3RvciA9IGNvbmYubWF4aW11bVNjYWxlOwogICAgIHJlc3VsdC5t X2RldmljZVBpeGVsUmF0aW8gPSBjb25mLmRldmljZVBpeGVsUmF0aW87CisgICAgcmVzdWx0Lm1f aXNVc2VyU2NhbGFibGUgPSBjb25mLnVzZXJTY2FsYWJsZTsKIAogICAgIHJldHVybiByZXN1bHQ7 CiB9CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxv ZwppbmRleCBjYTAwMWE4Li5lNTU0ZTIyIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9n CisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMC0wNyAg THVpeiBBZ29zdGluaSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhpbmcgdmlld3BvcnQgbWV0 YSB0YWcgdXNlci1zY2FsYWJsZSBoYW5kbGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDczMzAKKworICAgICAgICB1c2VyLXNjYWxhYmxlIGF0dHJp YnV0ZSB3YXMgbm90IGNvbnNpZGVyZWQgaW4gdmlld3BvcnQgbWV0YSB0YWcgaGFuZGxpbmcuCisK KyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OnZpZXdwb3J0 Q29uZmlndXJhdGlvbkZvclNpemUpOgorCiAyMDEwLTEwLTA2ICBMdWl6IEFnb3N0aW5pICA8bHVp ei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCA3MTBlMTViLi5jOWQ4Mjk5IDEwMDY0NAotLS0gYS9XZWJLaXQyL0NoYW5nZUxvZwor KysgYi9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTEwLTA3ICBMdWl6 IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGluZyB2aWV3cG9ydCBtZXRhIHRh ZyB1c2VyLXNjYWxhYmxlIGhhbmRsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NzMzMAorCisgICAgICAgIHVzZXItc2NhbGFibGUgYXR0cmlidXRl IHdhcyBub3QgY29uc2lkZXJlZCBpbiB2aWV3cG9ydCBtZXRhIHRhZyBoYW5kbGluZy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6CisgICAgICAgIChRV0tQYWdlOjp2 aWV3cG9ydENvbmZpZ3VyYXRpb25Gb3JTaXplKToKKwogMjAxMC0xMC0wNiAgTHVpeiBBZ29zdGlu aSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2tw YWdlLmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAppbmRleCA1MTc3 MThhLi4wY2ZhN2Q1IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFn ZS5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCkBAIC0zNDks NiArMzQ5LDcgQEAgUVdLUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uIFFXS1BhZ2U6OnZpZXdw b3J0Q29uZmlndXJhdGlvbkZvclNpemUoUVNpemUgYXZhaWwKICAgICByZXN1bHQubV9taW5pbXVt U2NhbGVGYWN0b3IgPSBjb25mLm1pbmltdW1TY2FsZTsKICAgICByZXN1bHQubV9tYXhpbXVtU2Nh bGVGYWN0b3IgPSBjb25mLm1heGltdW1TY2FsZTsKICAgICByZXN1bHQubV9kZXZpY2VQaXhlbFJh dGlvID0gY29uZi5kZXZpY2VQaXhlbFJhdGlvOworICAgIHJlc3VsdC5tX2lzVXNlclNjYWxhYmxl ID0gY29uZi51c2VyU2NhbGFibGU7CiAKICAgICByZXR1cm4gcmVzdWx0OwogfQotLSAKMS43LjIu MgoK