76499 2012-01-17 17:04:26 -0800 [EFL] Use static const insted of #define macro. 2012-01-17 20:28:58 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim gyuyoung.kim gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 537453 0 gyuyoung.kim 2012-01-17 17:04:26 -0800 WebKit coding style prefers const to #define. EFL port needs to use const insted of #define macro. This patch replace global variables defined by #define with const. const keyword can make very slight performance hit. I think we can ignore it. 537455 1 122840 gyuyoung.kim 2012-01-17 17:05:44 -0800 Created attachment 122840 Patch 537535 2 122840 morrita 2012-01-17 18:29:30 -0800 Comment on attachment 122840 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122840&action=review > Source/WebKit/efl/ewk/ewk_tiled_backing_store.h:37 > +static const int defaultTileHeigth = 256; It looks this should be just const int, without static. Static is for static variables, which are usually staying inside c/cpp file. > Source/WebKit/efl/ewk/ewk_tiled_backing_store.h:39 > +static const float zoomStepMinimum = 0.01; Ditto. 537557 3 122863 gyuyoung.kim 2012-01-17 18:54:55 -0800 Created attachment 122863 Patch 537594 4 122863 webkit.review.bot 2012-01-17 20:28:53 -0800 Comment on attachment 122863 Patch Clearing flags on attachment: 122863 Committed r105240: <http://trac.webkit.org/changeset/105240> 537595 5 webkit.review.bot 2012-01-17 20:28:58 -0800 All reviewed patches have been landed. Closing bug. 122840 2012-01-17 17:05:44 -0800 2012-01-17 18:54:50 -0800 Patch bug-76499-20120118100544.patch text/plain 11812 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggZDIxNTA0MTAz MjFkOWRlYmQ1OTg2MDgxNDI0YzVjMDU1MjVlMzQ3NS4uMmExMDQyYTc4Y2ViY2VlZGNjZmM5ZTU3 YzNjNWIxOTZiYzlhZjJkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTAxLTE3ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0VGTF0gVXNlIHN0YXRpYyBjb25zdCBpbnN0ZWQgb2YgI2RlZmluZSBtYWNyby4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2NDk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0IGNvZGluZyBz dHlsZSBwcmVmZXJzIGNvbnN0IHRvICNkZWZpbmUuIEVGTCBwb3J0IG5lZWRzIHRvIHVzZSBjb25z dCBpbnN0ZWQgb2YgI2RlZmluZSBtYWNyby4KKyAgICAgICAgVGhpcyBwYXRjaCByZXBsYWNlIGds b2JhbCB2YXJpYWJsZXMgZGVmaW5lZCBieSAjZGVmaW5lIHdpdGggY29uc3QuCisKKyAgICAgICAg KiBld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3BwOgorICAgICAgICAoX2V3a190aWxlZF9i YWNraW5nX3N0b3JlX3NtYXJ0X2FkZCk6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3Rv cmVfem9vbV9zZXRfaW50ZXJuYWwpOgorICAgICAgICAqIGV3ay9ld2tfdGlsZWRfYmFja2luZ19z dG9yZS5oOgorICAgICAgICAqIGV3ay9ld2tfdGlsZWRfbWF0cml4LmNwcDoKKyAgICAgICAgKGV3 a190aWxlX21hdHJpeF9uZXcpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAg IChfZXdrX3ZpZXdfcmVwYWludF9hZGQpOgorICAgICAgICAoX2V3a192aWV3X3JlcGFpbnRzX2Zs dXNoKToKKyAgICAgICAgKF9ld2tfdmlld19zY3JvbGxfYWRkKToKKyAgICAgICAgKF9ld2tfdmll d19zY3JvbGxzX2ZsdXNoKToKKyAgICAgICAgKF9ld2tfdmlld19wcml2X25ldyk6CisgICAgICAg IChld2tfdmlld19iYXNlX3NtYXJ0X3NldCk6CisgICAgICAgICogZXdrL2V3a192aWV3X3RpbGVk LmNwcDoKKyAgICAgICAgKF9ld2tfdmlld190aWxlZF9zbWFydF9wcmVfcmVuZGVyX3N0YXJ0KToK KwogMjAxMi0wMS0xNiAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgW0VGTF0gQnVpbGQgZml4IHdoZW4gdXNpbmcgcGFuZ28gYXMgZm9udCBiYWNrZW5kcy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9y ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3Bw CmluZGV4IGZmYzY3MWMyY2ZlMDRlNDE5OWE1ODg2MGZjY2I5MzVhNzhjNWM4Y2UuLjRjZGQ3MmQ4 NTkxZGVhYTcwMDI0ZTA3NzY0OTVjZDU1ZDIxMTFiMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmNwcApAQCAtNjk2LDggKzY5Niw4IEBA IHN0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9zbWFydF9hZGQoRXZhc19PYmpl Y3QqIGV3a0JhY2tpbmdTdG9yZSkKIAogICAgIHByaXYtPnNlbGYgPSBld2tCYWNraW5nU3RvcmU7 CiAgICAgcHJpdi0+dmlldy50aWxlLnpvb20gPSAxLjA7Ci0gICAgcHJpdi0+dmlldy50aWxlLndp ZHRoID0gREVGQVVMVF9USUxFX1c7Ci0gICAgcHJpdi0+dmlldy50aWxlLmhlaWdodCA9IERFRkFV TFRfVElMRV9IOworICAgIHByaXYtPnZpZXcudGlsZS53aWR0aCA9IGRlZmF1bHRUaWxlV2lkdGg7 CisgICAgcHJpdi0+dmlldy50aWxlLmhlaWdodCA9IGRlZmF1bHRUaWxlSGVpZ3RoOwogICAgIHBy aXYtPnZpZXcub2Zmc2V0LmN1ci54ID0gMDsKICAgICBwcml2LT52aWV3Lm9mZnNldC5jdXIueSA9 IDA7CiAgICAgcHJpdi0+dmlldy5vZmZzZXQub2xkLnggPSAwOwpAQCAtMTQ4NSw5ICsxNDg1LDkg QEAgc3RhdGljIEVpbmFfQm9vbCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfem9vbV9zZXRfaW50 ZXJuYWwoRXdrX1RpbGVkX0JhY2tpbmdfU3QKICAgICAqb2Zmc2V0WCA9IHByaXYtPnZpZXcub2Zm c2V0LmN1ci54OwogICAgICpvZmZzZXRZID0gcHJpdi0+dmlldy5vZmZzZXQuY3VyLnk7CiAKLSAg ICBpZiAoZmFic2YocHJpdi0+dmlldy50aWxlLnpvb20gLSAqem9vbSkgPCBaT09NX1NURVBfTUlO KSB7CisgICAgaWYgKGZhYnNmKHByaXYtPnZpZXcudGlsZS56b29tIC0gKnpvb20pIDwgem9vbVN0 ZXBNaW5pbXVtKSB7CiAgICAgICAgIERCRygiaWdub3JlZCBhcyB6b29tIGRpZmZlcmVuY2UgaXMg PCAlZjogJWYiLAotICAgICAgICAgICAgKGRvdWJsZSlaT09NX1NURVBfTUlOLCBmYWJzZihwcml2 LT52aWV3LnRpbGUuem9vbSAtICp6b29tKSk7CisgICAgICAgICAgICAoZG91YmxlKXpvb21TdGVw TWluaW11bSwgZmFic2YocHJpdi0+dmlldy50aWxlLnpvb20gLSAqem9vbSkpOwogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdGlsZWRfYmFja2luZ19zdG9yZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxl ZF9iYWNraW5nX3N0b3JlLmgKaW5kZXggNDQ3NDBjYjQyNTM0MjdlYmUyNDUzOTVkMDEwOTRiN2Nk MDYyNWU4Yy4uYmY0MjY0YzhiMzM0YjQ3YTNkNjhiYmZhNDA5NDYzZTNlYzlmMzM4ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKKysr IGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKQEAgLTMz LDEwICszMywxMCBAQAogICovCiAjdW5kZWYgREVCVUdfTUVNX0xFQUtTCiAKLSNkZWZpbmUgREVG QVVMVF9USUxFX1cgKDI1NikKLSNkZWZpbmUgREVGQVVMVF9USUxFX0ggKDI1NikKK3N0YXRpYyBj b25zdCBpbnQgZGVmYXVsdFRpbGVXaWR0aCA9IDI1NjsKK3N0YXRpYyBjb25zdCBpbnQgZGVmYXVs dFRpbGVIZWlndGggPSAyNTY7CiAKLSNkZWZpbmUgWk9PTV9TVEVQX01JTiAoMC4wMSkKK3N0YXRp YyBjb25zdCBmbG9hdCB6b29tU3RlcE1pbmltdW0gPSAwLjAxOwogCiAjZGVmaW5lIFRJTEVfU0la RV9BVF9aT09NKFNJWkUsIFpPT00pICgoaW50KXJvdW5kZigoU0laRSkgKiAoWk9PTSkpKQogI2Rl ZmluZSBUSUxFX1pPT01fQVRfU0laRShTSVpFLCBPUklHX1RJTEUpICgoZmxvYXQpKFNJWkUpIC8g KGZsb2F0KShPUklHX1RJTEUpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a190aWxlZF9tYXRyaXguY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9tYXRy aXguY3BwCmluZGV4IDk1ZTIzMTlmZTI1NjkzNzJiZjUxZTJkN2I2N2VlNGJiOGJhY2ViNjAuLmFi MDYwNDJjZTYwZTVlYWQxMmM2ZTA0NWFiZmY4NDkwYWExMTQ5YTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfbWF0cml4LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3RpbGVkX21hdHJpeC5jcHAKQEAgLTIyNSw4ICsyMjUsOCBAQCBFd2tfVGls ZV9NYXRyaXgqIGV3a190aWxlX21hdHJpeF9uZXcoRXdrX1RpbGVfVW51c2VkX0NhY2hlKiB0aWxl VW51c2VkQ2FjaGUsIHVucwogICAgIHRpbGVNYXRyaXgtPmNzcGFjZSA9IGNvbG9yU3BhY2U7CiAg ICAgdGlsZU1hdHJpeC0+cmVuZGVyLmNhbGxiYWNrID0gcmVuZGVyQ2FsbGJhY2s7CiAgICAgdGls ZU1hdHJpeC0+cmVuZGVyLmRhdGEgPSAodm9pZCopcmVuZGVyRGF0YTsKLSAgICB0aWxlTWF0cml4 LT50aWxlLndpZHRoID0gREVGQVVMVF9USUxFX1c7Ci0gICAgdGlsZU1hdHJpeC0+dGlsZS5oZWln aHQgPSBERUZBVUxUX1RJTEVfSDsKKyAgICB0aWxlTWF0cml4LT50aWxlLndpZHRoID0gZGVmYXVs dFRpbGVXaWR0aDsKKyAgICB0aWxlTWF0cml4LT50aWxlLmhlaWdodCA9IGRlZmF1bHRUaWxlSGVp Z3RoOwogCiAgICAgcmV0dXJuIHRpbGVNYXRyaXg7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmNwcAppbmRleCA1MzU0MDBiZjI3Mzg2NTM5MTFkNDRmNTM5ZDFkNjRmMjZiNTJiNDViLi5mMzM4 NWJkMjA3ZTQyMGMyYjBkZGQ5YzA0OGQ1ZmM4NjYxMmNhMjBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdmlldy5jcHAKQEAgLTY4LDIwICs2OCwyMCBAQAogI2luY2x1ZGUgIkRldmljZU9yaWVudGF0 aW9uQ2xpZW50RWZsLmgiCiAjZW5kaWYKIAotI2RlZmluZSBaT09NX01JTiAoMC4wNSkKLSNkZWZp bmUgWk9PTV9NQVggKDQuMCkKK3N0YXRpYyBjb25zdCBmbG9hdCB6b29tTWluaW11bSA9IDAuMDU7 CitzdGF0aWMgY29uc3QgZmxvYXQgem9vbU1heGltdW0gPSA0LjA7CiAKLSNkZWZpbmUgREVWSUNF X1BJWEVMX1JBVElPICgxLjApCitzdGF0aWMgY29uc3QgZmxvYXQgZGV2aWNlUGl4ZWxSYXRpbyA9 IDEuMDsKIAotc3RhdGljIGNvbnN0IGNoYXIgRVdLX1ZJRVdfVFlQRV9TVFJbXSA9ICJFV0tfVmll dyI7CitzdGF0aWMgY29uc3QgY2hhciBld2tWaWV3VHlwZVN0cmluZ1tdID0gIkVXS19WaWV3IjsK IAotc3RhdGljIGNvbnN0IHNpemVfdCBFV0tfVklFV19SRVBBSU5UU19TSVpFX0lOSVRJQUwgPSAz MjsKLXN0YXRpYyBjb25zdCBzaXplX3QgRVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9TVEVQID0gODsK LXN0YXRpYyBjb25zdCBzaXplX3QgRVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9NQVhfRlJFRSA9IDY0 Oworc3RhdGljIGNvbnN0IHNpemVfdCBld2tWaWV3UmVwYWludHNTaXplSW5pdGlhbCA9IDMyOwor c3RhdGljIGNvbnN0IHNpemVfdCBld2tWaWV3UmVwYWludHNTaXplU3RlcCA9IDg7CitzdGF0aWMg Y29uc3Qgc2l6ZV90IGV3a1ZpZXdSZXBhaW50c1NpemVNYXhpbXVtRnJlZSA9IDY0OwogCi1zdGF0 aWMgY29uc3Qgc2l6ZV90IEVXS19WSUVXX1NDUk9MTFNfU0laRV9JTklUSUFMID0gODsKLXN0YXRp YyBjb25zdCBzaXplX3QgRVdLX1ZJRVdfU0NST0xMU19TSVpFX1NURVAgPSAyOwotc3RhdGljIGNv bnN0IHNpemVfdCBFV0tfVklFV19TQ1JPTExTX1NJWkVfTUFYX0ZSRUUgPSAzMjsKK3N0YXRpYyBj b25zdCBzaXplX3QgZXdrVmlld1Njcm9sbHNTaXplSW5pdGlhbCA9IDg7CitzdGF0aWMgY29uc3Qg c2l6ZV90IGV3a1ZpZXdTY3JvbGxzU2l6ZVN0ZXAgPSAyOworc3RhdGljIGNvbnN0IHNpemVfdCBl d2tWaWV3U2Nyb2xsc1NpemVNYXhpbXVtRnJlZSA9IDMyOwogCiBzdGF0aWMgY29uc3QgRXZhc19T bWFydF9DYl9EZXNjcmlwdGlvbiBfZXdrX3ZpZXdfY2FsbGJhY2tfbmFtZXNbXSA9IHsKICAgICB7 ICJkb3dubG9hZCxyZXF1ZXN0IiwgInAiIH0sCkBAIC0yMzMsMTEgKzIzMywxMSBAQCBzdHJ1Y3Qg X0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgICAgICAgICAgX3RtcF9vdHlwZSA/IF90 bXBfb3R5cGUgOiAiKG51bGwpIik7ICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgICAgIHJl dHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgaWYgKEVJTkFfVU5MSUtFTFkoX3RtcF9zYy0+ ZGF0YSAhPSBFV0tfVklFV19UWVBFX1NUUikpIHsgICAgICAgIFwKKyAgICAgICAgaWYgKEVJTkFf VU5MSUtFTFkoX3RtcF9zYy0+ZGF0YSAhPSBld2tWaWV3VHlwZVN0cmluZykpIHsgICAgICAgIFwK ICAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKICAgICAgICAgICAgICAgICAoIiVwICglcykgaXMgbm90IG9mIGFu IGV3a192aWV3IChuZWVkICVwLCBnb3QgJXApISIsICAgIFwKICAgICAgICAgICAgICAgICBld2tW aWV3LCBfdG1wX290eXBlID8gX3RtcF9vdHlwZSA6ICIobnVsbCkiLCAgICAgICAgICAgICAgICAg XAotICAgICAgICAgICAgICAgIEVXS19WSUVXX1RZUEVfU1RSLCBfdG1wX3NjLT5kYXRhKTsgICAg ICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICAgICAgZXdrVmlld1R5cGVTdHJpbmcsIF90 bXBfc2MtPmRhdGEpOyAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgICAgIHJldHVybiBf X1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAg ICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKICAgICB9IHdoaWxlICgwKQpAQCAtMjk3LDkgKzI5Nyw5IEBAIHN0YXRp YyB2b2lkIF9ld2tfdmlld19yZXBhaW50X2FkZChFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYs IEV2YXNfQ29vcmQgeCwgRXZhCiAgICAgc2l6ZV90IG5ld1NpemUgPSAwOwogCiAgICAgaWYgKHBy aXYtPnJlcGFpbnRzLmFsbG9jYXRlZCA9PSBwcml2LT5yZXBhaW50cy5jb3VudCkKLSAgICAgICAg bmV3U2l6ZSA9IHByaXYtPnJlcGFpbnRzLmFsbG9jYXRlZCArIEVXS19WSUVXX1JFUEFJTlRTX1NJ WkVfU1RFUDsKLSAgICBlbHNlIGlmICghcHJpdi0+cmVwYWludHMuY291bnQgJiYgcHJpdi0+cmVw YWludHMuYWxsb2NhdGVkID4gRVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9JTklUSUFMKQotICAgICAg ICBuZXdTaXplID0gRVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9JTklUSUFMOworICAgICAgICBuZXdT aXplID0gcHJpdi0+cmVwYWludHMuYWxsb2NhdGVkICsgZXdrVmlld1JlcGFpbnRzU2l6ZVN0ZXA7 CisgICAgZWxzZSBpZiAoIXByaXYtPnJlcGFpbnRzLmNvdW50ICYmIHByaXYtPnJlcGFpbnRzLmFs bG9jYXRlZCA+IGV3a1ZpZXdSZXBhaW50c1NpemVJbml0aWFsKQorICAgICAgICBuZXdTaXplID0g ZXdrVmlld1JlcGFpbnRzU2l6ZUluaXRpYWw7CiAKICAgICBpZiAobmV3U2l6ZSkgewogICAgICAg ICBpZiAoIV9ld2tfdmlld19yZXBhaW50c19yZXNpemUocHJpdiwgbmV3U2l6ZSkpCkBAIC0zMjAs OSArMzIwLDkgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3JlcGFpbnRfYWRkKEV3a19WaWV3X1By aXZhdGVfRGF0YSogcHJpdiwgRXZhc19Db29yZCB4LCBFdmEKIHN0YXRpYyB2b2lkIF9ld2tfdmll d19yZXBhaW50c19mbHVzaChFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYpCiB7CiAgICAgcHJp di0+cmVwYWludHMuY291bnQgPSAwOwotICAgIGlmIChwcml2LT5yZXBhaW50cy5hbGxvY2F0ZWQg PD0gRVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9NQVhfRlJFRSkKKyAgICBpZiAocHJpdi0+cmVwYWlu dHMuYWxsb2NhdGVkIDw9IGV3a1ZpZXdSZXBhaW50c1NpemVNYXhpbXVtRnJlZSkKICAgICAgICAg cmV0dXJuOwotICAgIF9ld2tfdmlld19yZXBhaW50c19yZXNpemUocHJpdiwgRVdLX1ZJRVdfUkVQ QUlOVFNfU0laRV9NQVhfRlJFRSk7CisgICAgX2V3a192aWV3X3JlcGFpbnRzX3Jlc2l6ZShwcml2 LCBld2tWaWV3UmVwYWludHNTaXplTWF4aW11bUZyZWUpOwogfQogCiBzdGF0aWMgRWluYV9Cb29s IF9ld2tfdmlld19zY3JvbGxzX3Jlc2l6ZShFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYsIHNp emVfdCBzaXplKQpAQCAtMzY2LDkgKzM2Niw5IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zY3Jv bGxfYWRkKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdiwgRXZhc19Db29yZCBkZWx0YVgsCiAg ICAgaWYgKHByaXYtPnNjcm9sbHMuYWxsb2NhdGVkID09IHByaXYtPnNjcm9sbHMuY291bnQpIHsK ICAgICAgICAgc2l6ZV90IHNpemU7CiAgICAgICAgIGlmICghcHJpdi0+c2Nyb2xscy5hbGxvY2F0 ZWQpCi0gICAgICAgICAgICBzaXplID0gRVdLX1ZJRVdfU0NST0xMU19TSVpFX0lOSVRJQUw7Cisg ICAgICAgICAgICBzaXplID0gZXdrVmlld1Njcm9sbHNTaXplSW5pdGlhbDsKICAgICAgICAgZWxz ZQotICAgICAgICAgICAgc2l6ZSA9IHByaXYtPnNjcm9sbHMuYWxsb2NhdGVkICsgRVdLX1ZJRVdf U0NST0xMU19TSVpFX1NURVA7CisgICAgICAgICAgICBzaXplID0gcHJpdi0+c2Nyb2xscy5hbGxv Y2F0ZWQgKyBld2tWaWV3U2Nyb2xsc1NpemVTdGVwOwogICAgICAgICBpZiAoIV9ld2tfdmlld19z Y3JvbGxzX3Jlc2l6ZShwcml2LCBzaXplKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC00MDEsOSArNDAxLDkgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3Njcm9sbF9hZGQoRXdrX1Zp ZXdfUHJpdmF0ZV9EYXRhKiBwcml2LCBFdmFzX0Nvb3JkIGRlbHRhWCwKIHN0YXRpYyB2b2lkIF9l d2tfdmlld19zY3JvbGxzX2ZsdXNoKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdikKIHsKICAg ICBwcml2LT5zY3JvbGxzLmNvdW50ID0gMDsKLSAgICBpZiAocHJpdi0+c2Nyb2xscy5hbGxvY2F0 ZWQgPD0gRVdLX1ZJRVdfU0NST0xMU19TSVpFX01BWF9GUkVFKQorICAgIGlmIChwcml2LT5zY3Jv bGxzLmFsbG9jYXRlZCA8PSBld2tWaWV3U2Nyb2xsc1NpemVNYXhpbXVtRnJlZSkKICAgICAgICAg cmV0dXJuOwotICAgIF9ld2tfdmlld19zY3JvbGxzX3Jlc2l6ZShwcml2LCBFV0tfVklFV19TQ1JP TExTX1NJWkVfTUFYX0ZSRUUpOworICAgIF9ld2tfdmlld19zY3JvbGxzX3Jlc2l6ZShwcml2LCBl d2tWaWV3U2Nyb2xsc1NpemVNYXhpbXVtRnJlZSk7CiB9CiAKIC8vIERlZmF1bHQgRXZlbnQgSGFu ZGxpbmcgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwpAQCAt NzAwLDEwICs3MDAsMTAgQEAgc3RhdGljIEV3a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3 X3ByaXZfbmV3KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKICAgICAvLyBTaW5jZSB0 aGVyZSdzIG5vIHNjYWxlIHNlcGFyYXRlZCBmcm9tIHpvb21pbmcgaW4gd2Via2l0LWVmbCwgdGhp cyBmdW5jdGlvbmFsaXR5IG9mCiAgICAgLy8gdmlld3BvcnQgbWV0YSB0YWcgaXMgaW1wbGVtZW50 ZWQgdXNpbmcgem9vbS4gV2hlbiBzY2FsZSB6b29tIGlzIHN1cHBvcnRlZCBieSB3ZWJraXQtZWZs LAogICAgIC8vIHRoaXMgZnVuY3Rpb25hbGl0eSB3aWxsIGJlIG1vZGlmaWVkIGJ5IHRoZSBzY2Fs ZSB6b29tIHBhdGNoLgotICAgIHByaXYtPnNldHRpbmdzLnpvb21SYW5nZS5taW5TY2FsZSA9IFpP T01fTUlOOwotICAgIHByaXYtPnNldHRpbmdzLnpvb21SYW5nZS5tYXhTY2FsZSA9IFpPT01fTUFY OworICAgIHByaXYtPnNldHRpbmdzLnpvb21SYW5nZS5taW5TY2FsZSA9IHpvb21NaW5pbXVtOwor ICAgIHByaXYtPnNldHRpbmdzLnpvb21SYW5nZS5tYXhTY2FsZSA9IHpvb21NYXhpbXVtOwogICAg IHByaXYtPnNldHRpbmdzLnpvb21SYW5nZS51c2VyU2NhbGFibGUgPSB0cnVlOwotICAgIHByaXYt PnNldHRpbmdzLmRldmljZVBpeGVsUmF0aW8gPSBERVZJQ0VfUElYRUxfUkFUSU87CisgICAgcHJp di0+c2V0dGluZ3MuZGV2aWNlUGl4ZWxSYXRpbyA9IGRldmljZVBpeGVsUmF0aW87CiAKICAgICBw cml2LT5zZXR0aW5ncy5kb21UaW1lckludGVydmFsID0gcHJpdi0+cGFnZVNldHRpbmdzLT5kZWZh dWx0TWluRE9NVGltZXJJbnRlcnZhbCgpOwogCkBAIC0xMTM2LDcgKzExMzYsNyBAQCBFaW5hX0Jv b2wgZXdrX3ZpZXdfYmFzZV9zbWFydF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAg ICBhcGktPnNjLmNhbGN1bGF0ZSA9IF9ld2tfdmlld19zbWFydF9jYWxjdWxhdGU7CiAgICAgYXBp LT5zYy5zaG93ID0gX2V3a192aWV3X3NtYXJ0X3Nob3c7CiAgICAgYXBpLT5zYy5oaWRlID0gX2V3 a192aWV3X3NtYXJ0X2hpZGU7Ci0gICAgYXBpLT5zYy5kYXRhID0gRVdLX1ZJRVdfVFlQRV9TVFI7 IC8qIHVzZWQgYnkgdHlwZSBjaGVja2luZyAqLworICAgIGFwaS0+c2MuZGF0YSA9IGV3a1ZpZXdU eXBlU3RyaW5nOyAvKiB1c2VkIGJ5IHR5cGUgY2hlY2tpbmcgKi8KICAgICBhcGktPnNjLmNhbGxi YWNrcyA9IF9ld2tfdmlld19jYWxsYmFja19uYW1lczsKIAogICAgIGFwaS0+Y29udGVudHNfcmVz aXplID0gX2V3a192aWV3X3NtYXJ0X2NvbnRlbnRzX3Jlc2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXdfdGlsZWQuY3BwCmluZGV4IDMxMDFjMTJlOTM1YjQ4NjNiYWMzMzlkNTIwMzc1 ZTkwOTY5NDRjZjcuLmI3MmQ2YWU0NGNkNzQyNjJiMTVhZGM3MmE3Mjc1ZjkyYWI4YjBjMWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVkLmNwcApAQCAtMjYyLDggKzI2Miw4 IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3RpbGVkX3NtYXJ0X3ByZV9yZW5kZXJfc3Rh cnQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hCiAgICAgLy8gcHJlLXJlbmRlciB3b3JrcyB3aGVu IHR3byBjb25kaXRpb25zIGFyZSBtZXQuCiAgICAgLy8gem9vbSBoYXMgYmVlbiBjaGFuZ2VkLgog ICAgIC8vIGFuZCB0aGUgdmlldyBoYXMgYmVlbiBtb3ZlZCBtb3JlIHRoYW4gdGlsZSBzaXplLgot ICAgIGlmIChhYnMocHJldmlvdXNWaWV3WCAtIHZpZXdYKSA8IERFRkFVTFRfVElMRV9XCi0gICAg ICAgICYmIGFicyhwcmV2aW91c1ZpZXdZIC0gdmlld1kpIDwgREVGQVVMVF9USUxFX0gKKyAgICBp ZiAoYWJzKHByZXZpb3VzVmlld1ggLSB2aWV3WCkgPCBkZWZhdWx0VGlsZVdpZHRoCisgICAgICAg ICYmIGFicyhwcmV2aW91c1ZpZXdZIC0gdmlld1kpIDwgZGVmYXVsdFRpbGVIZWlndGgKICAgICAg ICAgJiYgc21hcnREYXRhLT5wcmV2aW91c1ZpZXcuem9vbSA9PSBjdXJyZW50Vmlld1pvb20pIHsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTI5NSw3ICsyOTUsNyBAQCBzdGF0aWMg RWluYV9Cb29sIF9ld2tfdmlld190aWxlZF9zbWFydF9wcmVfcmVuZGVyX3N0YXJ0KEV3a19WaWV3 X1NtYXJ0X0RhdGEqIHNtYQogICAgICAgICAvLyBNYWtlIGEgYmFzZSByZWN0YW5nbGUgYXMgYmln IGFzIHBvc3NpYmxlIHdpdGggdXNpbmcgbWF4TWVtb3J5LgogICAgICAgICAvLyBhbmQgdGhlbiBy ZXNoYXBlIHRoZSBiYXNlIHJlY3RhbmdsZSB0byBmaXQgdG8gY29udGVudHMuCiAgICAgICAgIGNv bnN0IGludCBiYXNlU2l6ZSA9IHN0YXRpY19jYXN0PGludD4oc3FydChtYXhNZW1vcnkgLyA0LjBm KSk7Ci0gICAgICAgIGNvbnN0IGZsb2F0IHdpZHRoUmF0ZSA9ICh2aWV3UmVjdC53ICsgKERFRkFV TFRfVElMRV9XICogMikpIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGJhc2VTaXplKTsKKyAgICAgICAg Y29uc3QgZmxvYXQgd2lkdGhSYXRlID0gKHZpZXdSZWN0LncgKyAoZGVmYXVsdFRpbGVXaWR0aCAq IDIpKSAvIHN0YXRpY19jYXN0PGZsb2F0PihiYXNlU2l6ZSk7CiAgICAgICAgIGNvbnN0IGZsb2F0 IGhlaWdodFJhdGUgPSBiYXNlU2l6ZSAvIHN0YXRpY19jYXN0PGZsb2F0Pihjb250ZW50SGVpZ2h0 KTsKICAgICAgICAgY29uc3QgZmxvYXQgcmVjdFJhdGUgPSBzdGQ6Om1heCh3aWR0aFJhdGUsIGhl aWdodFJhdGUpOwogCg== 122863 2012-01-17 18:54:55 -0800 2012-01-17 20:28:53 -0800 Patch bug-76499-20120118115456.patch text/plain 11791 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggZDIxNTA0MTAz MjFkOWRlYmQ1OTg2MDgxNDI0YzVjMDU1MjVlMzQ3NS4uMmExMDQyYTc4Y2ViY2VlZGNjZmM5ZTU3 YzNjNWIxOTZiYzlhZjJkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTAxLTE3ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0VGTF0gVXNlIHN0YXRpYyBjb25zdCBpbnN0ZWQgb2YgI2RlZmluZSBtYWNyby4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2NDk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0IGNvZGluZyBz dHlsZSBwcmVmZXJzIGNvbnN0IHRvICNkZWZpbmUuIEVGTCBwb3J0IG5lZWRzIHRvIHVzZSBjb25z dCBpbnN0ZWQgb2YgI2RlZmluZSBtYWNyby4KKyAgICAgICAgVGhpcyBwYXRjaCByZXBsYWNlIGds b2JhbCB2YXJpYWJsZXMgZGVmaW5lZCBieSAjZGVmaW5lIHdpdGggY29uc3QuCisKKyAgICAgICAg KiBld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3BwOgorICAgICAgICAoX2V3a190aWxlZF9i YWNraW5nX3N0b3JlX3NtYXJ0X2FkZCk6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3Rv cmVfem9vbV9zZXRfaW50ZXJuYWwpOgorICAgICAgICAqIGV3ay9ld2tfdGlsZWRfYmFja2luZ19z dG9yZS5oOgorICAgICAgICAqIGV3ay9ld2tfdGlsZWRfbWF0cml4LmNwcDoKKyAgICAgICAgKGV3 a190aWxlX21hdHJpeF9uZXcpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAg IChfZXdrX3ZpZXdfcmVwYWludF9hZGQpOgorICAgICAgICAoX2V3a192aWV3X3JlcGFpbnRzX2Zs dXNoKToKKyAgICAgICAgKF9ld2tfdmlld19zY3JvbGxfYWRkKToKKyAgICAgICAgKF9ld2tfdmll d19zY3JvbGxzX2ZsdXNoKToKKyAgICAgICAgKF9ld2tfdmlld19wcml2X25ldyk6CisgICAgICAg IChld2tfdmlld19iYXNlX3NtYXJ0X3NldCk6CisgICAgICAgICogZXdrL2V3a192aWV3X3RpbGVk LmNwcDoKKyAgICAgICAgKF9ld2tfdmlld190aWxlZF9zbWFydF9wcmVfcmVuZGVyX3N0YXJ0KToK KwogMjAxMi0wMS0xNiAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgW0VGTF0gQnVpbGQgZml4IHdoZW4gdXNpbmcgcGFuZ28gYXMgZm9udCBiYWNrZW5kcy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9y ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3Bw CmluZGV4IGZmYzY3MWMyY2ZlMDRlNDE5OWE1ODg2MGZjY2I5MzVhNzhjNWM4Y2UuLjRjZGQ3MmQ4 NTkxZGVhYTcwMDI0ZTA3NzY0OTVjZDU1ZDIxMTFiMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmNwcApAQCAtNjk2LDggKzY5Niw4IEBA IHN0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9zbWFydF9hZGQoRXZhc19PYmpl Y3QqIGV3a0JhY2tpbmdTdG9yZSkKIAogICAgIHByaXYtPnNlbGYgPSBld2tCYWNraW5nU3RvcmU7 CiAgICAgcHJpdi0+dmlldy50aWxlLnpvb20gPSAxLjA7Ci0gICAgcHJpdi0+dmlldy50aWxlLndp ZHRoID0gREVGQVVMVF9USUxFX1c7Ci0gICAgcHJpdi0+dmlldy50aWxlLmhlaWdodCA9IERFRkFV TFRfVElMRV9IOworICAgIHByaXYtPnZpZXcudGlsZS53aWR0aCA9IGRlZmF1bHRUaWxlV2lkdGg7 CisgICAgcHJpdi0+dmlldy50aWxlLmhlaWdodCA9IGRlZmF1bHRUaWxlSGVpZ3RoOwogICAgIHBy aXYtPnZpZXcub2Zmc2V0LmN1ci54ID0gMDsKICAgICBwcml2LT52aWV3Lm9mZnNldC5jdXIueSA9 IDA7CiAgICAgcHJpdi0+dmlldy5vZmZzZXQub2xkLnggPSAwOwpAQCAtMTQ4NSw5ICsxNDg1LDkg QEAgc3RhdGljIEVpbmFfQm9vbCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfem9vbV9zZXRfaW50 ZXJuYWwoRXdrX1RpbGVkX0JhY2tpbmdfU3QKICAgICAqb2Zmc2V0WCA9IHByaXYtPnZpZXcub2Zm c2V0LmN1ci54OwogICAgICpvZmZzZXRZID0gcHJpdi0+dmlldy5vZmZzZXQuY3VyLnk7CiAKLSAg ICBpZiAoZmFic2YocHJpdi0+dmlldy50aWxlLnpvb20gLSAqem9vbSkgPCBaT09NX1NURVBfTUlO KSB7CisgICAgaWYgKGZhYnNmKHByaXYtPnZpZXcudGlsZS56b29tIC0gKnpvb20pIDwgem9vbVN0 ZXBNaW5pbXVtKSB7CiAgICAgICAgIERCRygiaWdub3JlZCBhcyB6b29tIGRpZmZlcmVuY2UgaXMg PCAlZjogJWYiLAotICAgICAgICAgICAgKGRvdWJsZSlaT09NX1NURVBfTUlOLCBmYWJzZihwcml2 LT52aWV3LnRpbGUuem9vbSAtICp6b29tKSk7CisgICAgICAgICAgICAoZG91YmxlKXpvb21TdGVw TWluaW11bSwgZmFic2YocHJpdi0+dmlldy50aWxlLnpvb20gLSAqem9vbSkpOwogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdGlsZWRfYmFja2luZ19zdG9yZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxl ZF9iYWNraW5nX3N0b3JlLmgKaW5kZXggNDQ3NDBjYjQyNTM0MjdlYmUyNDUzOTVkMDEwOTRiN2Nk MDYyNWU4Yy4uZTkzY2NmNzk5Y2IyYjU1ZTRhNzBkZWYyZTA1NTM2ODFhMmFlNDY4MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKKysr IGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKQEAgLTMz LDEwICszMywxMCBAQAogICovCiAjdW5kZWYgREVCVUdfTUVNX0xFQUtTCiAKLSNkZWZpbmUgREVG QVVMVF9USUxFX1cgKDI1NikKLSNkZWZpbmUgREVGQVVMVF9USUxFX0ggKDI1NikKK2NvbnN0IGlu dCBkZWZhdWx0VGlsZVdpZHRoID0gMjU2OworY29uc3QgaW50IGRlZmF1bHRUaWxlSGVpZ3RoID0g MjU2OwogCi0jZGVmaW5lIFpPT01fU1RFUF9NSU4gKDAuMDEpCitjb25zdCBmbG9hdCB6b29tU3Rl cE1pbmltdW0gPSAwLjAxOwogCiAjZGVmaW5lIFRJTEVfU0laRV9BVF9aT09NKFNJWkUsIFpPT00p ICgoaW50KXJvdW5kZigoU0laRSkgKiAoWk9PTSkpKQogI2RlZmluZSBUSUxFX1pPT01fQVRfU0la RShTSVpFLCBPUklHX1RJTEUpICgoZmxvYXQpKFNJWkUpIC8gKGZsb2F0KShPUklHX1RJTEUpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9tYXRyaXguY3BwIGIv U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9tYXRyaXguY3BwCmluZGV4IDk1ZTIzMTlm ZTI1NjkzNzJiZjUxZTJkN2I2N2VlNGJiOGJhY2ViNjAuLmFiMDYwNDJjZTYwZTVlYWQxMmM2ZTA0 NWFiZmY4NDkwYWExMTQ5YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tf dGlsZWRfbWF0cml4LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX21h dHJpeC5jcHAKQEAgLTIyNSw4ICsyMjUsOCBAQCBFd2tfVGlsZV9NYXRyaXgqIGV3a190aWxlX21h dHJpeF9uZXcoRXdrX1RpbGVfVW51c2VkX0NhY2hlKiB0aWxlVW51c2VkQ2FjaGUsIHVucwogICAg IHRpbGVNYXRyaXgtPmNzcGFjZSA9IGNvbG9yU3BhY2U7CiAgICAgdGlsZU1hdHJpeC0+cmVuZGVy LmNhbGxiYWNrID0gcmVuZGVyQ2FsbGJhY2s7CiAgICAgdGlsZU1hdHJpeC0+cmVuZGVyLmRhdGEg PSAodm9pZCopcmVuZGVyRGF0YTsKLSAgICB0aWxlTWF0cml4LT50aWxlLndpZHRoID0gREVGQVVM VF9USUxFX1c7Ci0gICAgdGlsZU1hdHJpeC0+dGlsZS5oZWlnaHQgPSBERUZBVUxUX1RJTEVfSDsK KyAgICB0aWxlTWF0cml4LT50aWxlLndpZHRoID0gZGVmYXVsdFRpbGVXaWR0aDsKKyAgICB0aWxl TWF0cml4LT50aWxlLmhlaWdodCA9IGRlZmF1bHRUaWxlSGVpZ3RoOwogCiAgICAgcmV0dXJuIHRp bGVNYXRyaXg7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu Y3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA1MzU0MDBiZjI3 Mzg2NTM5MTFkNDRmNTM5ZDFkNjRmMjZiNTJiNDViLi5mMzM4NWJkMjA3ZTQyMGMyYjBkZGQ5YzA0 OGQ1ZmM4NjYxMmNhMjBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTY4LDIw ICs2OCwyMCBAQAogI2luY2x1ZGUgIkRldmljZU9yaWVudGF0aW9uQ2xpZW50RWZsLmgiCiAjZW5k aWYKIAotI2RlZmluZSBaT09NX01JTiAoMC4wNSkKLSNkZWZpbmUgWk9PTV9NQVggKDQuMCkKK3N0 YXRpYyBjb25zdCBmbG9hdCB6b29tTWluaW11bSA9IDAuMDU7CitzdGF0aWMgY29uc3QgZmxvYXQg em9vbU1heGltdW0gPSA0LjA7CiAKLSNkZWZpbmUgREVWSUNFX1BJWEVMX1JBVElPICgxLjApCitz dGF0aWMgY29uc3QgZmxvYXQgZGV2aWNlUGl4ZWxSYXRpbyA9IDEuMDsKIAotc3RhdGljIGNvbnN0 IGNoYXIgRVdLX1ZJRVdfVFlQRV9TVFJbXSA9ICJFV0tfVmlldyI7CitzdGF0aWMgY29uc3QgY2hh ciBld2tWaWV3VHlwZVN0cmluZ1tdID0gIkVXS19WaWV3IjsKIAotc3RhdGljIGNvbnN0IHNpemVf dCBFV0tfVklFV19SRVBBSU5UU19TSVpFX0lOSVRJQUwgPSAzMjsKLXN0YXRpYyBjb25zdCBzaXpl X3QgRVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9TVEVQID0gODsKLXN0YXRpYyBjb25zdCBzaXplX3Qg RVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9NQVhfRlJFRSA9IDY0Oworc3RhdGljIGNvbnN0IHNpemVf dCBld2tWaWV3UmVwYWludHNTaXplSW5pdGlhbCA9IDMyOworc3RhdGljIGNvbnN0IHNpemVfdCBl d2tWaWV3UmVwYWludHNTaXplU3RlcCA9IDg7CitzdGF0aWMgY29uc3Qgc2l6ZV90IGV3a1ZpZXdS ZXBhaW50c1NpemVNYXhpbXVtRnJlZSA9IDY0OwogCi1zdGF0aWMgY29uc3Qgc2l6ZV90IEVXS19W SUVXX1NDUk9MTFNfU0laRV9JTklUSUFMID0gODsKLXN0YXRpYyBjb25zdCBzaXplX3QgRVdLX1ZJ RVdfU0NST0xMU19TSVpFX1NURVAgPSAyOwotc3RhdGljIGNvbnN0IHNpemVfdCBFV0tfVklFV19T Q1JPTExTX1NJWkVfTUFYX0ZSRUUgPSAzMjsKK3N0YXRpYyBjb25zdCBzaXplX3QgZXdrVmlld1Nj cm9sbHNTaXplSW5pdGlhbCA9IDg7CitzdGF0aWMgY29uc3Qgc2l6ZV90IGV3a1ZpZXdTY3JvbGxz U2l6ZVN0ZXAgPSAyOworc3RhdGljIGNvbnN0IHNpemVfdCBld2tWaWV3U2Nyb2xsc1NpemVNYXhp bXVtRnJlZSA9IDMyOwogCiBzdGF0aWMgY29uc3QgRXZhc19TbWFydF9DYl9EZXNjcmlwdGlvbiBf ZXdrX3ZpZXdfY2FsbGJhY2tfbmFtZXNbXSA9IHsKICAgICB7ICJkb3dubG9hZCxyZXF1ZXN0Iiwg InAiIH0sCkBAIC0yMzMsMTEgKzIzMywxMSBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0 YSB7CiAgICAgICAgICAgICAgICAgX3RtcF9vdHlwZSA/IF90bXBfb3R5cGUgOiAiKG51bGwpIik7 ICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgfSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK LSAgICAgICAgaWYgKEVJTkFfVU5MSUtFTFkoX3RtcF9zYy0+ZGF0YSAhPSBFV0tfVklFV19UWVBF X1NUUikpIHsgICAgICAgIFwKKyAgICAgICAgaWYgKEVJTkFfVU5MSUtFTFkoX3RtcF9zYy0+ZGF0 YSAhPSBld2tWaWV3VHlwZVN0cmluZykpIHsgICAgICAgIFwKICAgICAgICAgICAgIEVJTkFfTE9H X0NSSVQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAg ICAgICAgICAgICAgICAoIiVwICglcykgaXMgbm90IG9mIGFuIGV3a192aWV3IChuZWVkICVwLCBn b3QgJXApISIsICAgIFwKICAgICAgICAgICAgICAgICBld2tWaWV3LCBfdG1wX290eXBlID8gX3Rt cF9vdHlwZSA6ICIobnVsbCkiLCAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgIEVX S19WSUVXX1RZUEVfU1RSLCBfdG1wX3NjLT5kYXRhKTsgICAgICAgICAgICAgICAgICAgICBcCisg ICAgICAgICAgICAgICAgZXdrVmlld1R5cGVTdHJpbmcsIF90bXBfc2MtPmRhdGEpOyAgICAgICAg ICAgICAgICAgICAgIFwKICAgICAgICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgfSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICB9 IHdoaWxlICgwKQpAQCAtMjk3LDkgKzI5Nyw5IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19yZXBh aW50X2FkZChFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYsIEV2YXNfQ29vcmQgeCwgRXZhCiAg ICAgc2l6ZV90IG5ld1NpemUgPSAwOwogCiAgICAgaWYgKHByaXYtPnJlcGFpbnRzLmFsbG9jYXRl ZCA9PSBwcml2LT5yZXBhaW50cy5jb3VudCkKLSAgICAgICAgbmV3U2l6ZSA9IHByaXYtPnJlcGFp bnRzLmFsbG9jYXRlZCArIEVXS19WSUVXX1JFUEFJTlRTX1NJWkVfU1RFUDsKLSAgICBlbHNlIGlm ICghcHJpdi0+cmVwYWludHMuY291bnQgJiYgcHJpdi0+cmVwYWludHMuYWxsb2NhdGVkID4gRVdL X1ZJRVdfUkVQQUlOVFNfU0laRV9JTklUSUFMKQotICAgICAgICBuZXdTaXplID0gRVdLX1ZJRVdf UkVQQUlOVFNfU0laRV9JTklUSUFMOworICAgICAgICBuZXdTaXplID0gcHJpdi0+cmVwYWludHMu YWxsb2NhdGVkICsgZXdrVmlld1JlcGFpbnRzU2l6ZVN0ZXA7CisgICAgZWxzZSBpZiAoIXByaXYt PnJlcGFpbnRzLmNvdW50ICYmIHByaXYtPnJlcGFpbnRzLmFsbG9jYXRlZCA+IGV3a1ZpZXdSZXBh aW50c1NpemVJbml0aWFsKQorICAgICAgICBuZXdTaXplID0gZXdrVmlld1JlcGFpbnRzU2l6ZUlu aXRpYWw7CiAKICAgICBpZiAobmV3U2l6ZSkgewogICAgICAgICBpZiAoIV9ld2tfdmlld19yZXBh aW50c19yZXNpemUocHJpdiwgbmV3U2l6ZSkpCkBAIC0zMjAsOSArMzIwLDkgQEAgc3RhdGljIHZv aWQgX2V3a192aWV3X3JlcGFpbnRfYWRkKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdiwgRXZh c19Db29yZCB4LCBFdmEKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19yZXBhaW50c19mbHVzaChFd2tf Vmlld19Qcml2YXRlX0RhdGEqIHByaXYpCiB7CiAgICAgcHJpdi0+cmVwYWludHMuY291bnQgPSAw OwotICAgIGlmIChwcml2LT5yZXBhaW50cy5hbGxvY2F0ZWQgPD0gRVdLX1ZJRVdfUkVQQUlOVFNf U0laRV9NQVhfRlJFRSkKKyAgICBpZiAocHJpdi0+cmVwYWludHMuYWxsb2NhdGVkIDw9IGV3a1Zp ZXdSZXBhaW50c1NpemVNYXhpbXVtRnJlZSkKICAgICAgICAgcmV0dXJuOwotICAgIF9ld2tfdmll d19yZXBhaW50c19yZXNpemUocHJpdiwgRVdLX1ZJRVdfUkVQQUlOVFNfU0laRV9NQVhfRlJFRSk7 CisgICAgX2V3a192aWV3X3JlcGFpbnRzX3Jlc2l6ZShwcml2LCBld2tWaWV3UmVwYWludHNTaXpl TWF4aW11bUZyZWUpOwogfQogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zY3JvbGxzX3Jl c2l6ZShFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYsIHNpemVfdCBzaXplKQpAQCAtMzY2LDkg KzM2Niw5IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zY3JvbGxfYWRkKEV3a19WaWV3X1ByaXZh dGVfRGF0YSogcHJpdiwgRXZhc19Db29yZCBkZWx0YVgsCiAgICAgaWYgKHByaXYtPnNjcm9sbHMu YWxsb2NhdGVkID09IHByaXYtPnNjcm9sbHMuY291bnQpIHsKICAgICAgICAgc2l6ZV90IHNpemU7 CiAgICAgICAgIGlmICghcHJpdi0+c2Nyb2xscy5hbGxvY2F0ZWQpCi0gICAgICAgICAgICBzaXpl ID0gRVdLX1ZJRVdfU0NST0xMU19TSVpFX0lOSVRJQUw7CisgICAgICAgICAgICBzaXplID0gZXdr Vmlld1Njcm9sbHNTaXplSW5pdGlhbDsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgc2l6ZSA9 IHByaXYtPnNjcm9sbHMuYWxsb2NhdGVkICsgRVdLX1ZJRVdfU0NST0xMU19TSVpFX1NURVA7Cisg ICAgICAgICAgICBzaXplID0gcHJpdi0+c2Nyb2xscy5hbGxvY2F0ZWQgKyBld2tWaWV3U2Nyb2xs c1NpemVTdGVwOwogICAgICAgICBpZiAoIV9ld2tfdmlld19zY3JvbGxzX3Jlc2l6ZShwcml2LCBz aXplKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC00MDEsOSArNDAxLDkgQEAgc3Rh dGljIHZvaWQgX2V3a192aWV3X3Njcm9sbF9hZGQoRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2 LCBFdmFzX0Nvb3JkIGRlbHRhWCwKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zY3JvbGxzX2ZsdXNo KEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdikKIHsKICAgICBwcml2LT5zY3JvbGxzLmNvdW50 ID0gMDsKLSAgICBpZiAocHJpdi0+c2Nyb2xscy5hbGxvY2F0ZWQgPD0gRVdLX1ZJRVdfU0NST0xM U19TSVpFX01BWF9GUkVFKQorICAgIGlmIChwcml2LT5zY3JvbGxzLmFsbG9jYXRlZCA8PSBld2tW aWV3U2Nyb2xsc1NpemVNYXhpbXVtRnJlZSkKICAgICAgICAgcmV0dXJuOwotICAgIF9ld2tfdmll d19zY3JvbGxzX3Jlc2l6ZShwcml2LCBFV0tfVklFV19TQ1JPTExTX1NJWkVfTUFYX0ZSRUUpOwor ICAgIF9ld2tfdmlld19zY3JvbGxzX3Jlc2l6ZShwcml2LCBld2tWaWV3U2Nyb2xsc1NpemVNYXhp bXVtRnJlZSk7CiB9CiAKIC8vIERlZmF1bHQgRXZlbnQgSGFuZGxpbmcgLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwpAQCAtNzAwLDEwICs3MDAsMTAgQEAgc3Rh dGljIEV3a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSkKICAgICAvLyBTaW5jZSB0aGVyZSdzIG5vIHNjYWxlIHNlcGFy YXRlZCBmcm9tIHpvb21pbmcgaW4gd2Via2l0LWVmbCwgdGhpcyBmdW5jdGlvbmFsaXR5IG9mCiAg ICAgLy8gdmlld3BvcnQgbWV0YSB0YWcgaXMgaW1wbGVtZW50ZWQgdXNpbmcgem9vbS4gV2hlbiBz Y2FsZSB6b29tIGlzIHN1cHBvcnRlZCBieSB3ZWJraXQtZWZsLAogICAgIC8vIHRoaXMgZnVuY3Rp b25hbGl0eSB3aWxsIGJlIG1vZGlmaWVkIGJ5IHRoZSBzY2FsZSB6b29tIHBhdGNoLgotICAgIHBy aXYtPnNldHRpbmdzLnpvb21SYW5nZS5taW5TY2FsZSA9IFpPT01fTUlOOwotICAgIHByaXYtPnNl dHRpbmdzLnpvb21SYW5nZS5tYXhTY2FsZSA9IFpPT01fTUFYOworICAgIHByaXYtPnNldHRpbmdz Lnpvb21SYW5nZS5taW5TY2FsZSA9IHpvb21NaW5pbXVtOworICAgIHByaXYtPnNldHRpbmdzLnpv b21SYW5nZS5tYXhTY2FsZSA9IHpvb21NYXhpbXVtOwogICAgIHByaXYtPnNldHRpbmdzLnpvb21S YW5nZS51c2VyU2NhbGFibGUgPSB0cnVlOwotICAgIHByaXYtPnNldHRpbmdzLmRldmljZVBpeGVs UmF0aW8gPSBERVZJQ0VfUElYRUxfUkFUSU87CisgICAgcHJpdi0+c2V0dGluZ3MuZGV2aWNlUGl4 ZWxSYXRpbyA9IGRldmljZVBpeGVsUmF0aW87CiAKICAgICBwcml2LT5zZXR0aW5ncy5kb21UaW1l ckludGVydmFsID0gcHJpdi0+cGFnZVNldHRpbmdzLT5kZWZhdWx0TWluRE9NVGltZXJJbnRlcnZh bCgpOwogCkBAIC0xMTM2LDcgKzExMzYsNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfYmFzZV9zbWFy dF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAgICBhcGktPnNjLmNhbGN1bGF0ZSA9 IF9ld2tfdmlld19zbWFydF9jYWxjdWxhdGU7CiAgICAgYXBpLT5zYy5zaG93ID0gX2V3a192aWV3 X3NtYXJ0X3Nob3c7CiAgICAgYXBpLT5zYy5oaWRlID0gX2V3a192aWV3X3NtYXJ0X2hpZGU7Ci0g ICAgYXBpLT5zYy5kYXRhID0gRVdLX1ZJRVdfVFlQRV9TVFI7IC8qIHVzZWQgYnkgdHlwZSBjaGVj a2luZyAqLworICAgIGFwaS0+c2MuZGF0YSA9IGV3a1ZpZXdUeXBlU3RyaW5nOyAvKiB1c2VkIGJ5 IHR5cGUgY2hlY2tpbmcgKi8KICAgICBhcGktPnNjLmNhbGxiYWNrcyA9IF9ld2tfdmlld19jYWxs YmFja19uYW1lczsKIAogICAgIGFwaS0+Y29udGVudHNfcmVzaXplID0gX2V3a192aWV3X3NtYXJ0 X2NvbnRlbnRzX3Jlc2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tf dmlld190aWxlZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3Bw CmluZGV4IDMxMDFjMTJlOTM1YjQ4NjNiYWMzMzlkNTIwMzc1ZTkwOTY5NDRjZjcuLmI3MmQ2YWU0 NGNkNzQyNjJiMTVhZGM3MmE3Mjc1ZjkyYWI4YjBjMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3X3RpbGVkLmNwcApAQCAtMjYyLDggKzI2Miw4IEBAIHN0YXRpYyBFaW5hX0Jvb2wg X2V3a192aWV3X3RpbGVkX3NtYXJ0X3ByZV9yZW5kZXJfc3RhcnQoRXdrX1ZpZXdfU21hcnRfRGF0 YSogc21hCiAgICAgLy8gcHJlLXJlbmRlciB3b3JrcyB3aGVuIHR3byBjb25kaXRpb25zIGFyZSBt ZXQuCiAgICAgLy8gem9vbSBoYXMgYmVlbiBjaGFuZ2VkLgogICAgIC8vIGFuZCB0aGUgdmlldyBo YXMgYmVlbiBtb3ZlZCBtb3JlIHRoYW4gdGlsZSBzaXplLgotICAgIGlmIChhYnMocHJldmlvdXNW aWV3WCAtIHZpZXdYKSA8IERFRkFVTFRfVElMRV9XCi0gICAgICAgICYmIGFicyhwcmV2aW91c1Zp ZXdZIC0gdmlld1kpIDwgREVGQVVMVF9USUxFX0gKKyAgICBpZiAoYWJzKHByZXZpb3VzVmlld1gg LSB2aWV3WCkgPCBkZWZhdWx0VGlsZVdpZHRoCisgICAgICAgICYmIGFicyhwcmV2aW91c1ZpZXdZ IC0gdmlld1kpIDwgZGVmYXVsdFRpbGVIZWlndGgKICAgICAgICAgJiYgc21hcnREYXRhLT5wcmV2 aW91c1ZpZXcuem9vbSA9PSBjdXJyZW50Vmlld1pvb20pIHsKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIH0KQEAgLTI5NSw3ICsyOTUsNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld190 aWxlZF9zbWFydF9wcmVfcmVuZGVyX3N0YXJ0KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYQogICAg ICAgICAvLyBNYWtlIGEgYmFzZSByZWN0YW5nbGUgYXMgYmlnIGFzIHBvc3NpYmxlIHdpdGggdXNp bmcgbWF4TWVtb3J5LgogICAgICAgICAvLyBhbmQgdGhlbiByZXNoYXBlIHRoZSBiYXNlIHJlY3Rh bmdsZSB0byBmaXQgdG8gY29udGVudHMuCiAgICAgICAgIGNvbnN0IGludCBiYXNlU2l6ZSA9IHN0 YXRpY19jYXN0PGludD4oc3FydChtYXhNZW1vcnkgLyA0LjBmKSk7Ci0gICAgICAgIGNvbnN0IGZs b2F0IHdpZHRoUmF0ZSA9ICh2aWV3UmVjdC53ICsgKERFRkFVTFRfVElMRV9XICogMikpIC8gc3Rh dGljX2Nhc3Q8ZmxvYXQ+KGJhc2VTaXplKTsKKyAgICAgICAgY29uc3QgZmxvYXQgd2lkdGhSYXRl ID0gKHZpZXdSZWN0LncgKyAoZGVmYXVsdFRpbGVXaWR0aCAqIDIpKSAvIHN0YXRpY19jYXN0PGZs b2F0PihiYXNlU2l6ZSk7CiAgICAgICAgIGNvbnN0IGZsb2F0IGhlaWdodFJhdGUgPSBiYXNlU2l6 ZSAvIHN0YXRpY19jYXN0PGZsb2F0Pihjb250ZW50SGVpZ2h0KTsKICAgICAgICAgY29uc3QgZmxv YXQgcmVjdFJhdGUgPSBzdGQ6Om1heCh3aWR0aFJhdGUsIGhlaWdodFJhdGUpOwogCg==