46119 2010-09-20 14:05:11 -0700 Add logical accessors to RenderStyle for margins, padding, border widths, widths and heights. 2010-09-20 14:35:26 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 281801 0 hyatt 2010-09-20 14:05:11 -0700 Need to add logical accessors to RenderStyle so layout code can switch over to logical terms like before/after/start/end instead of top/bottom/left/right. 281815 1 68136 hyatt 2010-09-20 14:26:24 -0700 Created attachment 68136 Patch 281817 2 68136 mitz 2010-09-20 14:30:15 -0700 Comment on attachment 68136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68136&action=review > WebCore/rendering/style/RenderStyle.cpp:1118 > + default: Please change these default:s to case RightToLeftBlockFlow: 281819 3 hyatt 2010-09-20 14:35:26 -0700 Fixed in r67884. 68136 2010-09-20 14:26:24 -0700 2010-09-20 14:30:15 -0700 Patch patch.txt text/plain 9073 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Nzg4MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMTAtMDktMjAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjExOSwgYWRkIGxvZ2ljYWwgYWNj ZXNzb3JzIHRvIFJlbmRlclN0eWxlLiAgTm90IHVzZWQgYnkgYW55IFJlbmRlck9iamVjdHMgeWV0 LCBzbyBubyB0ZXN0cworICAgICAgICB1bnRpbCB0aGVuLgorCisgICAgICAgICogcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjps b2dpY2FsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmxvZ2ljYWxIZWln aHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmxvZ2ljYWxNaW5XaWR0aCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6bG9naWNhbE1heFdpZHRoKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclN0eWxlOjpsb2dpY2FsTWluSGVpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclN0eWxlOjpsb2dpY2FsTWF4SGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclN0eWxlOjpib3JkZXJCZWZvcmVXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJT dHlsZTo6Ym9yZGVyQWZ0ZXJXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 Ym9yZGVyU3RhcnRXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6Ym9yZGVy RW5kV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6Om1hcmdpbkJlZm9yZSk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6bWFyZ2luQWZ0ZXIpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyU3R5bGU6Om1hcmdpblN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclN0eWxlOjptYXJnaW5FbmQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnBh ZGRpbmdCZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnBhZGRpbmdBZnRl cik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6cGFkZGluZ1N0YXJ0KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpwYWRkaW5nRW5kKToKKyAgICAgICAgKiByZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKwogMjAxMC0wOS0yMCAgRGF2aWQgSHlhdHQgIDxoeWF0 dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAJKHJldmlzaW9uIDY3ODYwKQor KysgV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMDY0LDQgKzEwNjQsMTcyIEBAIGNvbnN0IENvbG9yIFJlbmRlclN0eWxlOjp2aXNpdGVk RGVwZW5kZW4KICAgICByZXR1cm4gQ29sb3IodmlzaXRlZENvbG9yLnJlZCgpLCB2aXNpdGVkQ29s b3IuZ3JlZW4oKSwgdmlzaXRlZENvbG9yLmJsdWUoKSwgdW52aXNpdGVkQ29sb3IuYWxwaGEoKSk7 CiB9CiAKK0xlbmd0aCBSZW5kZXJTdHlsZTo6bG9naWNhbFdpZHRoKCkgY29uc3QKK3sKKyAgICBp ZiAoYmxvY2tGbG93KCkgPT0gVG9wVG9Cb3R0b21CbG9ja0Zsb3cgfHwgYmxvY2tGbG93KCkgPT0g Qm90dG9tVG9Ub3BCbG9ja0Zsb3cpCisgICAgICAgIHJldHVybiB3aWR0aCgpOworICAgIHJldHVy biBoZWlnaHQoKTsKK30KKworTGVuZ3RoIFJlbmRlclN0eWxlOjpsb2dpY2FsSGVpZ2h0KCkgY29u c3QKK3sKKyAgICBpZiAoYmxvY2tGbG93KCkgPT0gVG9wVG9Cb3R0b21CbG9ja0Zsb3cgfHwgYmxv Y2tGbG93KCkgPT0gQm90dG9tVG9Ub3BCbG9ja0Zsb3cpCisgICAgICAgIHJldHVybiBoZWlnaHQo KTsKKyAgICByZXR1cm4gd2lkdGgoKTsKK30KKworTGVuZ3RoIFJlbmRlclN0eWxlOjpsb2dpY2Fs TWluV2lkdGgoKSBjb25zdAoreworICAgIGlmIChibG9ja0Zsb3coKSA9PSBUb3BUb0JvdHRvbUJs b2NrRmxvdyB8fCBibG9ja0Zsb3coKSA9PSBCb3R0b21Ub1RvcEJsb2NrRmxvdykKKyAgICAgICAg cmV0dXJuIG1pbldpZHRoKCk7CisgICAgcmV0dXJuIG1pbkhlaWdodCgpOworfQorCitMZW5ndGgg UmVuZGVyU3R5bGU6OmxvZ2ljYWxNYXhXaWR0aCgpIGNvbnN0Cit7CisgICAgaWYgKGJsb2NrRmxv dygpID09IFRvcFRvQm90dG9tQmxvY2tGbG93IHx8IGJsb2NrRmxvdygpID09IEJvdHRvbVRvVG9w QmxvY2tGbG93KQorICAgICAgICByZXR1cm4gbWF4V2lkdGgoKTsKKyAgICByZXR1cm4gbWF4SGVp Z2h0KCk7Cit9CisKK0xlbmd0aCBSZW5kZXJTdHlsZTo6bG9naWNhbE1pbkhlaWdodCgpIGNvbnN0 Cit7CisgICAgaWYgKGJsb2NrRmxvdygpID09IFRvcFRvQm90dG9tQmxvY2tGbG93IHx8IGJsb2Nr RmxvdygpID09IEJvdHRvbVRvVG9wQmxvY2tGbG93KQorICAgICAgICByZXR1cm4gbWluSGVpZ2h0 KCk7CisgICAgcmV0dXJuIG1pbldpZHRoKCk7Cit9CisKK0xlbmd0aCBSZW5kZXJTdHlsZTo6bG9n aWNhbE1heEhlaWdodCgpIGNvbnN0Cit7CisgICAgaWYgKGJsb2NrRmxvdygpID09IFRvcFRvQm90 dG9tQmxvY2tGbG93IHx8IGJsb2NrRmxvdygpID09IEJvdHRvbVRvVG9wQmxvY2tGbG93KQorICAg ICAgICByZXR1cm4gbWF4SGVpZ2h0KCk7CisgICAgcmV0dXJuIG1heFdpZHRoKCk7Cit9CisKK3Vu c2lnbmVkIHNob3J0IFJlbmRlclN0eWxlOjpib3JkZXJCZWZvcmVXaWR0aCgpIGNvbnN0Cit7Cisg ICAgc3dpdGNoIChibG9ja0Zsb3coKSkgeworICAgIGNhc2UgVG9wVG9Cb3R0b21CbG9ja0Zsb3c6 CisgICAgICAgIHJldHVybiBib3JkZXJUb3BXaWR0aCgpOworICAgIGNhc2UgQm90dG9tVG9Ub3BC bG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBib3JkZXJCb3R0b21XaWR0aCgpOworICAgIGNhc2Ug TGVmdFRvUmlnaHRCbG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBib3JkZXJMZWZ0V2lkdGgoKTsK KyAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gYm9yZGVyUmlnaHRXaWR0aCgpOworICAgIH0K K30KKwordW5zaWduZWQgc2hvcnQgUmVuZGVyU3R5bGU6OmJvcmRlckFmdGVyV2lkdGgoKSBjb25z dAoreworICAgIHN3aXRjaCAoYmxvY2tGbG93KCkpIHsKKyAgICBjYXNlIFRvcFRvQm90dG9tQmxv Y2tGbG93OgorICAgICAgICByZXR1cm4gYm9yZGVyQm90dG9tV2lkdGgoKTsKKyAgICBjYXNlIEJv dHRvbVRvVG9wQmxvY2tGbG93OgorICAgICAgICByZXR1cm4gYm9yZGVyVG9wV2lkdGgoKTsKKyAg ICBjYXNlIExlZnRUb1JpZ2h0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4gYm9yZGVyUmlnaHRX aWR0aCgpOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiBib3JkZXJMZWZ0V2lkdGgoKTsK KyAgICB9Cit9CisKK3Vuc2lnbmVkIHNob3J0IFJlbmRlclN0eWxlOjpib3JkZXJTdGFydFdpZHRo KCkgY29uc3QKK3sKKyAgICBpZiAoYmxvY2tGbG93KCkgPT0gVG9wVG9Cb3R0b21CbG9ja0Zsb3cg fHwgYmxvY2tGbG93KCkgPT0gQm90dG9tVG9Ub3BCbG9ja0Zsb3cpCisgICAgICAgIHJldHVybiBk aXJlY3Rpb24oKSA9PSBMVFIgPyBib3JkZXJMZWZ0V2lkdGgoKSA6IGJvcmRlclJpZ2h0V2lkdGgo KTsKKyAgICByZXR1cm4gZGlyZWN0aW9uKCkgPT0gTFRSID8gYm9yZGVyVG9wV2lkdGgoKSA6IGJv cmRlckJvdHRvbVdpZHRoKCk7Cit9CisKK3Vuc2lnbmVkIHNob3J0IFJlbmRlclN0eWxlOjpib3Jk ZXJFbmRXaWR0aCgpIGNvbnN0Cit7CisgICAgaWYgKGJsb2NrRmxvdygpID09IFRvcFRvQm90dG9t QmxvY2tGbG93IHx8IGJsb2NrRmxvdygpID09IEJvdHRvbVRvVG9wQmxvY2tGbG93KQorICAgICAg ICByZXR1cm4gZGlyZWN0aW9uKCkgPT0gTFRSID8gYm9yZGVyUmlnaHRXaWR0aCgpIDogYm9yZGVy TGVmdFdpZHRoKCk7CisgICAgcmV0dXJuIGRpcmVjdGlvbigpID09IExUUiA/IGJvcmRlckJvdHRv bVdpZHRoKCkgOiBib3JkZXJUb3BXaWR0aCgpOworfQorICAgIAorTGVuZ3RoIFJlbmRlclN0eWxl OjptYXJnaW5CZWZvcmUoKSBjb25zdAoreworICAgIHN3aXRjaCAoYmxvY2tGbG93KCkpIHsKKyAg ICBjYXNlIFRvcFRvQm90dG9tQmxvY2tGbG93OgorICAgICAgICByZXR1cm4gbWFyZ2luVG9wKCk7 CisgICAgY2FzZSBCb3R0b21Ub1RvcEJsb2NrRmxvdzoKKyAgICAgICAgcmV0dXJuIG1hcmdpbkJv dHRvbSgpOworICAgIGNhc2UgTGVmdFRvUmlnaHRCbG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBt YXJnaW5MZWZ0KCk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIG1hcmdpblJpZ2h0KCk7 CisgICAgfQorfQorCitMZW5ndGggUmVuZGVyU3R5bGU6Om1hcmdpbkFmdGVyKCkgY29uc3QKK3sK KyAgICBzd2l0Y2ggKGJsb2NrRmxvdygpKSB7CisgICAgY2FzZSBUb3BUb0JvdHRvbUJsb2NrRmxv dzoKKyAgICAgICAgcmV0dXJuIG1hcmdpbkJvdHRvbSgpOworICAgIGNhc2UgQm90dG9tVG9Ub3BC bG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBtYXJnaW5Ub3AoKTsKKyAgICBjYXNlIExlZnRUb1Jp Z2h0QmxvY2tGbG93OgorICAgICAgICByZXR1cm4gbWFyZ2luUmlnaHQoKTsKKyAgICBkZWZhdWx0 OgorICAgICAgICByZXR1cm4gbWFyZ2luTGVmdCgpOworICAgIH0KK30KKworTGVuZ3RoIFJlbmRl clN0eWxlOjptYXJnaW5TdGFydCgpIGNvbnN0Cit7CisgICAgaWYgKGJsb2NrRmxvdygpID09IFRv cFRvQm90dG9tQmxvY2tGbG93IHx8IGJsb2NrRmxvdygpID09IEJvdHRvbVRvVG9wQmxvY2tGbG93 KQorICAgICAgICByZXR1cm4gZGlyZWN0aW9uKCkgPT0gTFRSID8gbWFyZ2luTGVmdCgpIDogbWFy Z2luUmlnaHQoKTsKKyAgICByZXR1cm4gZGlyZWN0aW9uKCkgPT0gTFRSID8gbWFyZ2luVG9wKCkg OiBtYXJnaW5Cb3R0b20oKTsKK30KKworTGVuZ3RoIFJlbmRlclN0eWxlOjptYXJnaW5FbmQoKSBj b25zdAoreworICAgIGlmIChibG9ja0Zsb3coKSA9PSBUb3BUb0JvdHRvbUJsb2NrRmxvdyB8fCBi bG9ja0Zsb3coKSA9PSBCb3R0b21Ub1RvcEJsb2NrRmxvdykKKyAgICAgICAgcmV0dXJuIGRpcmVj dGlvbigpID09IExUUiA/IG1hcmdpblJpZ2h0KCkgOiBtYXJnaW5MZWZ0KCk7CisgICAgcmV0dXJu IGRpcmVjdGlvbigpID09IExUUiA/IG1hcmdpbkJvdHRvbSgpIDogbWFyZ2luVG9wKCk7Cit9Cisg ICAgCitMZW5ndGggUmVuZGVyU3R5bGU6OnBhZGRpbmdCZWZvcmUoKSBjb25zdAoreworICAgIHN3 aXRjaCAoYmxvY2tGbG93KCkpIHsKKyAgICBjYXNlIFRvcFRvQm90dG9tQmxvY2tGbG93OgorICAg ICAgICByZXR1cm4gcGFkZGluZ1RvcCgpOworICAgIGNhc2UgQm90dG9tVG9Ub3BCbG9ja0Zsb3c6 CisgICAgICAgIHJldHVybiBwYWRkaW5nQm90dG9tKCk7CisgICAgY2FzZSBMZWZ0VG9SaWdodEJs b2NrRmxvdzoKKyAgICAgICAgcmV0dXJuIHBhZGRpbmdMZWZ0KCk7CisgICAgZGVmYXVsdDoKKyAg ICAgICAgcmV0dXJuIHBhZGRpbmdSaWdodCgpOworICAgIH0KK30KKworTGVuZ3RoIFJlbmRlclN0 eWxlOjpwYWRkaW5nQWZ0ZXIoKSBjb25zdAoreworICAgIHN3aXRjaCAoYmxvY2tGbG93KCkpIHsK KyAgICBjYXNlIFRvcFRvQm90dG9tQmxvY2tGbG93OgorICAgICAgICByZXR1cm4gcGFkZGluZ0Jv dHRvbSgpOworICAgIGNhc2UgQm90dG9tVG9Ub3BCbG9ja0Zsb3c6CisgICAgICAgIHJldHVybiBw YWRkaW5nVG9wKCk7CisgICAgY2FzZSBMZWZ0VG9SaWdodEJsb2NrRmxvdzoKKyAgICAgICAgcmV0 dXJuIHBhZGRpbmdSaWdodCgpOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiBwYWRkaW5n TGVmdCgpOworICAgIH0KK30KKworTGVuZ3RoIFJlbmRlclN0eWxlOjpwYWRkaW5nU3RhcnQoKSBj b25zdAoreworICAgIGlmIChibG9ja0Zsb3coKSA9PSBUb3BUb0JvdHRvbUJsb2NrRmxvdyB8fCBi bG9ja0Zsb3coKSA9PSBCb3R0b21Ub1RvcEJsb2NrRmxvdykKKyAgICAgICAgcmV0dXJuIGRpcmVj dGlvbigpID09IExUUiA/IHBhZGRpbmdMZWZ0KCkgOiBwYWRkaW5nUmlnaHQoKTsKKyAgICByZXR1 cm4gZGlyZWN0aW9uKCkgPT0gTFRSID8gcGFkZGluZ1RvcCgpIDogcGFkZGluZ0JvdHRvbSgpOwor fQorCitMZW5ndGggUmVuZGVyU3R5bGU6OnBhZGRpbmdFbmQoKSBjb25zdAoreworICAgIGlmIChi bG9ja0Zsb3coKSA9PSBUb3BUb0JvdHRvbUJsb2NrRmxvdyB8fCBibG9ja0Zsb3coKSA9PSBCb3R0 b21Ub1RvcEJsb2NrRmxvdykKKyAgICAgICAgcmV0dXJuIGRpcmVjdGlvbigpID09IExUUiA/IHBh ZGRpbmdSaWdodCgpIDogcGFkZGluZ0xlZnQoKTsKKyAgICByZXR1cm4gZGlyZWN0aW9uKCkgPT0g TFRSID8gcGFkZGluZ0JvdHRvbSgpIDogcGFkZGluZ1RvcCgpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlz aW9uIDY3ODYwKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29y a2luZyBjb3B5KQpAQCAtMzkwLDYgKzM5MCwxMyBAQCBwdWJsaWM6CiAgICAgTGVuZ3RoIG1heFdp ZHRoKCkgY29uc3QgeyByZXR1cm4gbV9ib3gtPm1heFdpZHRoKCk7IH0KICAgICBMZW5ndGggbWlu SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9ib3gtPm1pbkhlaWdodCgpOyB9CiAgICAgTGVuZ3Ro IG1heEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94LT5tYXhIZWlnaHQoKTsgfQorICAgIAor ICAgIExlbmd0aCBsb2dpY2FsV2lkdGgoKSBjb25zdDsKKyAgICBMZW5ndGggbG9naWNhbEhlaWdo dCgpIGNvbnN0OworICAgIExlbmd0aCBsb2dpY2FsTWluV2lkdGgoKSBjb25zdDsKKyAgICBMZW5n dGggbG9naWNhbE1heFdpZHRoKCkgY29uc3Q7CisgICAgTGVuZ3RoIGxvZ2ljYWxNaW5IZWlnaHQo KSBjb25zdDsKKyAgICBMZW5ndGggbG9naWNhbE1heEhlaWdodCgpIGNvbnN0OwogCiAgICAgY29u c3QgQm9yZGVyRGF0YSYgYm9yZGVyKCkgY29uc3QgeyByZXR1cm4gc3Vycm91bmQtPmJvcmRlcjsg fQogICAgIGNvbnN0IEJvcmRlclZhbHVlJiBib3JkZXJMZWZ0KCkgY29uc3QgeyByZXR1cm4gc3Vy cm91bmQtPmJvcmRlci5sZWZ0KCk7IH0KQEAgLTQxNyw2ICs0MjQsMTEgQEAgcHVibGljOgogICAg IHVuc2lnbmVkIHNob3J0IGJvcmRlckJvdHRvbVdpZHRoKCkgY29uc3QgeyByZXR1cm4gc3Vycm91 bmQtPmJvcmRlci5ib3JkZXJCb3R0b21XaWR0aCgpOyB9CiAgICAgRUJvcmRlclN0eWxlIGJvcmRl ckJvdHRvbVN0eWxlKCkgY29uc3QgeyByZXR1cm4gc3Vycm91bmQtPmJvcmRlci5ib3R0b20oKS5z dHlsZSgpOyB9CiAgICAgYm9vbCBib3JkZXJCb3R0b21Jc1RyYW5zcGFyZW50KCkgY29uc3QgeyBy ZXR1cm4gc3Vycm91bmQtPmJvcmRlci5ib3R0b20oKS5pc1RyYW5zcGFyZW50KCk7IH0KKyAgICAK KyAgICB1bnNpZ25lZCBzaG9ydCBib3JkZXJCZWZvcmVXaWR0aCgpIGNvbnN0OworICAgIHVuc2ln bmVkIHNob3J0IGJvcmRlckFmdGVyV2lkdGgoKSBjb25zdDsKKyAgICB1bnNpZ25lZCBzaG9ydCBi b3JkZXJTdGFydFdpZHRoKCkgY29uc3Q7CisgICAgdW5zaWduZWQgc2hvcnQgYm9yZGVyRW5kV2lk dGgoKSBjb25zdDsKIAogICAgIHVuc2lnbmVkIHNob3J0IG91dGxpbmVTaXplKCkgY29uc3QgeyBy ZXR1cm4gbWF4KDAsIG91dGxpbmVXaWR0aCgpICsgb3V0bGluZU9mZnNldCgpKTsgfQogICAgIHVu c2lnbmVkIHNob3J0IG91dGxpbmVXaWR0aCgpIGNvbnN0CkBAIC01ODIsMTIgKzU5NCwyMCBAQCBw dWJsaWM6CiAgICAgTGVuZ3RoIG1hcmdpbkJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIHN1cnJvdW5k LT5tYXJnaW4uYm90dG9tKCk7IH0KICAgICBMZW5ndGggbWFyZ2luTGVmdCgpIGNvbnN0IHsgcmV0 dXJuIHN1cnJvdW5kLT5tYXJnaW4ubGVmdCgpOyB9CiAgICAgTGVuZ3RoIG1hcmdpblJpZ2h0KCkg Y29uc3QgeyByZXR1cm4gc3Vycm91bmQtPm1hcmdpbi5yaWdodCgpOyB9CisgICAgTGVuZ3RoIG1h cmdpbkJlZm9yZSgpIGNvbnN0OworICAgIExlbmd0aCBtYXJnaW5BZnRlcigpIGNvbnN0OworICAg IExlbmd0aCBtYXJnaW5TdGFydCgpIGNvbnN0OworICAgIExlbmd0aCBtYXJnaW5FbmQoKSBjb25z dDsKIAogICAgIExlbmd0aEJveCBwYWRkaW5nQm94KCkgY29uc3QgeyByZXR1cm4gc3Vycm91bmQt PnBhZGRpbmc7IH0KICAgICBMZW5ndGggcGFkZGluZ1RvcCgpIGNvbnN0IHsgcmV0dXJuIHN1cnJv dW5kLT5wYWRkaW5nLnRvcCgpOyB9CiAgICAgTGVuZ3RoIHBhZGRpbmdCb3R0b20oKSBjb25zdCB7 IHJldHVybiBzdXJyb3VuZC0+cGFkZGluZy5ib3R0b20oKTsgfQogICAgIExlbmd0aCBwYWRkaW5n TGVmdCgpIGNvbnN0IHsgcmV0dXJuIHN1cnJvdW5kLT5wYWRkaW5nLmxlZnQoKTsgfQogICAgIExl bmd0aCBwYWRkaW5nUmlnaHQoKSBjb25zdCB7IHJldHVybiBzdXJyb3VuZC0+cGFkZGluZy5yaWdo dCgpOyB9CisgICAgTGVuZ3RoIHBhZGRpbmdCZWZvcmUoKSBjb25zdDsKKyAgICBMZW5ndGggcGFk ZGluZ0FmdGVyKCkgY29uc3Q7CisgICAgTGVuZ3RoIHBhZGRpbmdTdGFydCgpIGNvbnN0OworICAg IExlbmd0aCBwYWRkaW5nRW5kKCkgY29uc3Q7CiAKICAgICBFQ3Vyc29yIGN1cnNvcigpIGNvbnN0 IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVDdXJzb3I+KGluaGVyaXRlZF9mbGFncy5fY3Vyc29yX3N0 eWxlKTsgfQogCg==