129704 2014-03-04 14:20:20 -0800 WKPage's pageExtendedBackgroundColor API exposed through WKView/WKWebView should support NSColor 2014-03-04 16:21:16 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac Unspecified RESOLVED FIXED P2 Normal --- 129120 1 conrad_shultz conrad_shultz bdakin commit-queue oldest_to_newest 986973 0 conrad_shultz 2014-03-04 14:20:20 -0800 WKPage's pageExtendedBackgroundColor API exposed through WKView/WKWebView should support NSColor 986982 1 225816 conrad_shultz 2014-03-04 14:31:20 -0800 Created attachment 225816 Patch 987004 2 225816 conrad_shultz 2014-03-04 15:08:49 -0800 Comment on attachment 225816 Patch Copy/paste error; will repost. 987008 3 225821 conrad_shultz 2014-03-04 15:15:33 -0800 Created attachment 225821 Patch 987013 4 225821 bdakin 2014-03-04 15:31:27 -0800 Comment on attachment 225821 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225821&action=review r=me, but you should simplify those return statements with nsColor(). > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:852 > + return [NSColor colorWithDeviceRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)]; You can actually use the convenient nsColor() here, just like in the underlayColor method in the same class. return nsColor(color); > Source/WebKit2/UIProcess/API/mac/WKView.mm:3269 > + return [NSColor colorWithDeviceRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)]; Similarly, you can use nsColor() here I think. 987019 5 225826 conrad_shultz 2014-03-04 15:48:36 -0800 Created attachment 225826 Patch 987025 6 225826 commit-queue 2014-03-04 16:21:14 -0800 Comment on attachment 225826 Patch Clearing flags on attachment: 225826 Committed r165083: <http://trac.webkit.org/changeset/165083> 987026 7 commit-queue 2014-03-04 16:21:16 -0800 All reviewed patches have been landed. Closing bug. 225816 2014-03-04 14:31:20 -0800 2014-03-04 15:08:49 -0800 Patch bug-129704-20140304143120.patch text/plain 4434 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmI3YjVjNDhhNGFmYjRj ZTU2ZDU1NTFhODgwOWU3NTM1ZTQxZTc4NC4uNDM4ZWE4NzBjZmVhYTk0NTk2YzQzNmVlYTI0ODhk Zjc0NmM3NWRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTA0ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgV0tQYWdlJ3Mg cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yIEFQSSBleHBvc2VkIHRocm91Z2ggV0tWaWV3L1dL V2ViVmlldyBzaG91bGQgc3VwcG9ydCBOU0NvbG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgTlNDb2xvci1yZXR1cm5pbmcgbWV0aG9kcyB0byBj b21wbGVtZW50IHRoZSBleGlzdGluZyBVSUNvbG9yLXJldHVybmluZyBtZXRob2RzLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6CisgICAgICAgIERlY2xh cmUgX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciBmb3Igbm9uLVRBUkdFVF9PU19JUEhPTkUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JdKToKKyAgICAgICAgUmV0 dXJuIGFuIE5TQ29sb3IgY3JlYXRlZCBmcm9tIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoK KyAgICAgICAgRGVjbGFyZSBfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yIGZvciBub24tVEFS R0VUX09TX0lQSE9ORS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToK KyAgICAgICAgKC1bV0tWaWV3IF9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JdKToKKyAgICAg ICAgUmV0dXJuIGFuIE5TQ29sb3IgY3JlYXRlZCBmcm9tIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3Jv dW5kQ29sb3IuCisKIDIwMTQtMDMtMDMgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNv bT4KIAogICAgICAgICBbV0syXSBTZWxlY3Rpb24gcmVtYWlucyBhZnRlciByZWxvYWQuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCmlu ZGV4IDk3MmZkNTMxODJlZjA5ZDYzNzI4MWM1MGVlMmYyYjUxYTM2MmQxYWMuLmQ3YTVlMzA3Y2Fk YmFhMjBhN2IwNmRlNjVhOTRkY2ZhYmUxMjFlMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCkBAIC04MSw2ICs4MSw3IEBACiBA cHJvcGVydHkgKHJlYWR3cml0ZSkgZG91YmxlIG1hZ25pZmljYXRpb247CiBAcHJvcGVydHkgKHJl YWR3cml0ZSkgQk9PTCBhbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczsKIAorQHBy b3BlcnR5IChyZWFkb25seSkgTlNDb2xvciAqX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsK IEBwcm9wZXJ0eShjb3B5LCBub25hdG9taWMpIE5TQ29sb3IgKnVuZGVybGF5Q29sb3I7CiAKIC0g KE5TVmlldyopZnVsbFNjcmVlblBsYWNlaG9sZGVyVmlldzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggYjQwMWIzMDk4YTgwNDBmYmZk ZGMyZWU4N2M4YzgxNGYzNmRlZGM1Yi4uOWJhNzA2MWIwODEzMWFjMTFjZTBmOWY4OGIzMzdiOTA0 NGMwOGRkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KQEAgLTgzOSw2ICs4MzksMTkgQEAgc3RhdGljIGlubGluZSBXZWJDb3JlOjpMYXlv dXRNaWxlc3RvbmVzIGxheW91dE1pbGVzdG9uZXMoX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmUKICAg ICBbc2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c1dpdGhTdGFibGVTdGF0ZTpZRVNdOwog fQogCisjZWxzZQorCisjcHJhZ21hIG1hcmsgLSBPUyBYLXNwZWNpZmljIG1ldGhvZHMKKworLSAo TlNDb2xvciAqKV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IKK3sKKyAgICBXZWJDb3JlOjpD b2xvciBjb2xvciA9IF9wYWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsKKyAgICBp ZiAoIWNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJldHVybiBb TlNDb2xvciBjb2xvcldpdGhSZWQ6KGNvbG9yLnJlZCgpIC8gMjU1LjApIGdyZWVuOihjb2xvci5n cmVlbigpIC8gMjU1LjApIGJsdWU6KGNvbG9yLmJsdWUoKSAvIDI1NS4wKSBhbHBoYTooY29sb3Iu YWxwaGEoKSAvIDI1NS4wKV07Cit9CisKICNlbmRpZgogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4IGE5 OTE2OTZhNDU0YmRmOWE0ODNmYzgxODYzNDc5NWY1NGYzZjUzMzkuLjQ3ZDVhNWIxNzYyYzdjNjUz NWFjYmE5MDVkYzkzZDczMDRkZDlhN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC03NCw2ICs3NCw4IEBAIHR5 cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50cykg ewogCiAtICh2b2lkKV9iZWdpbkludGVyYWN0aXZlT2JzY3VyZWRJbnNldHNDaGFuZ2U7CiAtICh2 b2lkKV9lbmRJbnRlcmFjdGl2ZU9ic2N1cmVkSW5zZXRzQ2hhbmdlOworI2Vsc2UKK0Bwcm9wZXJ0 eSAocmVhZG9ubHkpIE5TQ29sb3IgKl9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7CiAjZW5k aWYKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv V0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmlu ZGV4IDc3ZDY5Y2RjMTY5ODMzMDM4ODNmYzMwZTRhYzFhYzJkNWU4NzM4MGEuLjA1YzM3NzI1OTc3 NmYzMjg1ODc4NDE4YzU3ZjU4M2EyYThlOGFkNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTMyNjAsNiArMzI2MCwxNSBAQCBzdGF0aWMgTlNTdHJp bmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5nICpwYXRoKQogICAgIHJl dHVybiBfZGF0YS0+X2FsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOwogfQogCist IChOU0NvbG9yICopX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgoreworICAgIFdlYkNvcmU6 OkNvbG9yIGNvbG9yID0gX2RhdGEtPl9wYWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3Io KTsKKyAgICBpZiAoIWNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAg IHJldHVybiBbTlNDb2xvciBjb2xvcldpdGhSZWQ6KGNvbG9yLnJlZCgpIC8gMjU1LjApIGdyZWVu Oihjb2xvci5ncmVlbigpIC8gMjU1LjApIGJsdWU6KGNvbG9yLmJsdWUoKSAvIDI1NS4wKSBhbHBo YTooY29sb3IuYWxwaGEoKSAvIDI1NS4wKV07Cit9CisKIC8vIFRoaXMgbWV0aG9kIGZvcmNlcyBh IGRyYXdpbmcgYXJlYSBnZW9tZXRyeSB1cGRhdGUsIGV2ZW4gaWYgZnJhbWUgc2l6ZSB1cGRhdGVz IGFyZSBkaXNhYmxlZC4KIC8vIFRoZSB1cGRhdGVkIGlzIHBlcmZvcm1lZCBhc3luY2hyb25vdXNs eTsgd2UgZG9uJ3Qgd2FpdCBmb3IgdGhlIGdlb21ldHJ5IHVwZGF0ZSBiZWZvcmUgcmV0dXJuaW5n LgogLy8gVGhlIGFyZWEgZHJhd24gbmVlZCBub3QgbWF0Y2ggdGhlIGN1cnJlbnQgZnJhbWUgc2l6 ZSAtIGlmIGl0IGRpZmZlcnMgaXQgd2lsbCBiZSBhbmNob3JlZCB0byB0aGUK 225821 2014-03-04 15:15:33 -0800 2014-03-04 15:48:35 -0800 Patch bug-129704-20140304151533.patch text/plain 4446 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmI3YjVjNDhhNGFmYjRj ZTU2ZDU1NTFhODgwOWU3NTM1ZTQxZTc4NC4uNDM4ZWE4NzBjZmVhYTk0NTk2YzQzNmVlYTI0ODhk Zjc0NmM3NWRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTA0ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgV0tQYWdlJ3Mg cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yIEFQSSBleHBvc2VkIHRocm91Z2ggV0tWaWV3L1dL V2ViVmlldyBzaG91bGQgc3VwcG9ydCBOU0NvbG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgTlNDb2xvci1yZXR1cm5pbmcgbWV0aG9kcyB0byBj b21wbGVtZW50IHRoZSBleGlzdGluZyBVSUNvbG9yLXJldHVybmluZyBtZXRob2RzLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6CisgICAgICAgIERlY2xh cmUgX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciBmb3Igbm9uLVRBUkdFVF9PU19JUEhPTkUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JdKToKKyAgICAgICAgUmV0 dXJuIGFuIE5TQ29sb3IgY3JlYXRlZCBmcm9tIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoK KyAgICAgICAgRGVjbGFyZSBfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yIGZvciBub24tVEFS R0VUX09TX0lQSE9ORS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToK KyAgICAgICAgKC1bV0tWaWV3IF9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JdKToKKyAgICAg ICAgUmV0dXJuIGFuIE5TQ29sb3IgY3JlYXRlZCBmcm9tIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3Jv dW5kQ29sb3IuCisKIDIwMTQtMDMtMDMgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNv bT4KIAogICAgICAgICBbV0syXSBTZWxlY3Rpb24gcmVtYWlucyBhZnRlciByZWxvYWQuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCmlu ZGV4IDk3MmZkNTMxODJlZjA5ZDYzNzI4MWM1MGVlMmYyYjUxYTM2MmQxYWMuLmQ3YTVlMzA3Y2Fk YmFhMjBhN2IwNmRlNjVhOTRkY2ZhYmUxMjFlMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCkBAIC04MSw2ICs4MSw3IEBACiBA cHJvcGVydHkgKHJlYWR3cml0ZSkgZG91YmxlIG1hZ25pZmljYXRpb247CiBAcHJvcGVydHkgKHJl YWR3cml0ZSkgQk9PTCBhbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczsKIAorQHBy b3BlcnR5IChyZWFkb25seSkgTlNDb2xvciAqX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsK IEBwcm9wZXJ0eShjb3B5LCBub25hdG9taWMpIE5TQ29sb3IgKnVuZGVybGF5Q29sb3I7CiAKIC0g KE5TVmlldyopZnVsbFNjcmVlblBsYWNlaG9sZGVyVmlldzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggYjQwMWIzMDk4YTgwNDBmYmZk ZGMyZWU4N2M4YzgxNGYzNmRlZGM1Yi4uZDNjNzY0MDc2NDIxN2IzNzVmMTdmNmRkZWU2NjM5NmVl ZjNlZWRiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KQEAgLTgzOSw2ICs4MzksMTkgQEAgc3RhdGljIGlubGluZSBXZWJDb3JlOjpMYXlv dXRNaWxlc3RvbmVzIGxheW91dE1pbGVzdG9uZXMoX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmUKICAg ICBbc2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c1dpdGhTdGFibGVTdGF0ZTpZRVNdOwog fQogCisjZWxzZQorCisjcHJhZ21hIG1hcmsgLSBPUyBYLXNwZWNpZmljIG1ldGhvZHMKKworLSAo TlNDb2xvciAqKV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IKK3sKKyAgICBXZWJDb3JlOjpD b2xvciBjb2xvciA9IF9wYWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsKKyAgICBp ZiAoIWNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJldHVybiBb TlNDb2xvciBjb2xvcldpdGhEZXZpY2VSZWQ6KGNvbG9yLnJlZCgpIC8gMjU1LjApIGdyZWVuOihj b2xvci5ncmVlbigpIC8gMjU1LjApIGJsdWU6KGNvbG9yLmJsdWUoKSAvIDI1NS4wKSBhbHBoYToo Y29sb3IuYWxwaGEoKSAvIDI1NS4wKV07Cit9CisKICNlbmRpZgogCiBAZW5kCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmlu ZGV4IGE5OTE2OTZhNDU0YmRmOWE0ODNmYzgxODYzNDc5NWY1NGYzZjUzMzkuLjQ3ZDVhNWIxNzYy YzdjNjUzNWFjYmE5MDVkYzkzZDczMDRkZDlhN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC03NCw2ICs3NCw4 IEBAIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2 ZW50cykgewogCiAtICh2b2lkKV9iZWdpbkludGVyYWN0aXZlT2JzY3VyZWRJbnNldHNDaGFuZ2U7 CiAtICh2b2lkKV9lbmRJbnRlcmFjdGl2ZU9ic2N1cmVkSW5zZXRzQ2hhbmdlOworI2Vsc2UKK0Bw cm9wZXJ0eSAocmVhZG9ubHkpIE5TQ29sb3IgKl9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7 CiAjZW5kaWYKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 Lm1tCmluZGV4IDc3ZDY5Y2RjMTY5ODMzMDM4ODNmYzMwZTRhYzFhYzJkNWU4NzM4MGEuLmZhMjFm OTliY2ZkNzE3MGEyYzMwYmRhYTRiZjM4YTBkNTE3Mjk1NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTMyNjAsNiArMzI2MCwxNSBAQCBzdGF0aWMg TlNTdHJpbmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5nICpwYXRoKQog ICAgIHJldHVybiBfZGF0YS0+X2FsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOwog fQogCistIChOU0NvbG9yICopX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgoreworICAgIFdl YkNvcmU6OkNvbG9yIGNvbG9yID0gX2RhdGEtPl9wYWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5k Q29sb3IoKTsKKyAgICBpZiAoIWNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsK KworICAgIHJldHVybiBbTlNDb2xvciBjb2xvcldpdGhEZXZpY2VSZWQ6KGNvbG9yLnJlZCgpIC8g MjU1LjApIGdyZWVuOihjb2xvci5ncmVlbigpIC8gMjU1LjApIGJsdWU6KGNvbG9yLmJsdWUoKSAv IDI1NS4wKSBhbHBoYTooY29sb3IuYWxwaGEoKSAvIDI1NS4wKV07Cit9CisKIC8vIFRoaXMgbWV0 aG9kIGZvcmNlcyBhIGRyYXdpbmcgYXJlYSBnZW9tZXRyeSB1cGRhdGUsIGV2ZW4gaWYgZnJhbWUg c2l6ZSB1cGRhdGVzIGFyZSBkaXNhYmxlZC4KIC8vIFRoZSB1cGRhdGVkIGlzIHBlcmZvcm1lZCBh c3luY2hyb25vdXNseTsgd2UgZG9uJ3Qgd2FpdCBmb3IgdGhlIGdlb21ldHJ5IHVwZGF0ZSBiZWZv cmUgcmV0dXJuaW5nLgogLy8gVGhlIGFyZWEgZHJhd24gbmVlZCBub3QgbWF0Y2ggdGhlIGN1cnJl bnQgZnJhbWUgc2l6ZSAtIGlmIGl0IGRpZmZlcnMgaXQgd2lsbCBiZSBhbmNob3JlZCB0byB0aGUK 225826 2014-03-04 15:48:36 -0800 2014-03-04 16:21:14 -0800 Patch bug-129704-20140304154836.patch text/plain 4334 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmI3YjVjNDhhNGFmYjRj ZTU2ZDU1NTFhODgwOWU3NTM1ZTQxZTc4NC4uNDM4ZWE4NzBjZmVhYTk0NTk2YzQzNmVlYTI0ODhk Zjc0NmM3NWRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTA0ICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgV0tQYWdlJ3Mg cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yIEFQSSBleHBvc2VkIHRocm91Z2ggV0tWaWV3L1dL V2ViVmlldyBzaG91bGQgc3VwcG9ydCBOU0NvbG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgTlNDb2xvci1yZXR1cm5pbmcgbWV0aG9kcyB0byBj b21wbGVtZW50IHRoZSBleGlzdGluZyBVSUNvbG9yLXJldHVybmluZyBtZXRob2RzLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmg6CisgICAgICAgIERlY2xh cmUgX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciBmb3Igbm9uLVRBUkdFVF9PU19JUEhPTkUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JdKToKKyAgICAgICAgUmV0 dXJuIGFuIE5TQ29sb3IgY3JlYXRlZCBmcm9tIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoK KyAgICAgICAgRGVjbGFyZSBfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yIGZvciBub24tVEFS R0VUX09TX0lQSE9ORS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToK KyAgICAgICAgKC1bV0tWaWV3IF9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JdKToKKyAgICAg ICAgUmV0dXJuIGFuIE5TQ29sb3IgY3JlYXRlZCBmcm9tIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3Jv dW5kQ29sb3IuCisKIDIwMTQtMDMtMDMgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNv bT4KIAogICAgICAgICBbV0syXSBTZWxlY3Rpb24gcmVtYWlucyBhZnRlciByZWxvYWQuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCmlu ZGV4IDk3MmZkNTMxODJlZjA5ZDYzNzI4MWM1MGVlMmYyYjUxYTM2MmQxYWMuLmQ3YTVlMzA3Y2Fk YmFhMjBhN2IwNmRlNjVhOTRkY2ZhYmUxMjFlMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCkBAIC04MSw2ICs4MSw3IEBACiBA cHJvcGVydHkgKHJlYWR3cml0ZSkgZG91YmxlIG1hZ25pZmljYXRpb247CiBAcHJvcGVydHkgKHJl YWR3cml0ZSkgQk9PTCBhbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczsKIAorQHBy b3BlcnR5IChyZWFkb25seSkgTlNDb2xvciAqX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsK IEBwcm9wZXJ0eShjb3B5LCBub25hdG9taWMpIE5TQ29sb3IgKnVuZGVybGF5Q29sb3I7CiAKIC0g KE5TVmlldyopZnVsbFNjcmVlblBsYWNlaG9sZGVyVmlldzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggYjQwMWIzMDk4YTgwNDBmYmZk ZGMyZWU4N2M4YzgxNGYzNmRlZGM1Yi4uMzllYzk3MjU4MWYyNWVkZTliNWMxNmI4ODU3NGM4ZDJk OTVmMGQ4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KQEAgLTY3LDYgKzY3LDcgQEAKIAogI2lmIFBMQVRGT1JNKE1BQykKICNpbXBvcnQg IldLVmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxXZWJDb3JlL0NvbG9yTWFjLmg+CiAjZW5kaWYK IAogQGltcGxlbWVudGF0aW9uIFdLV2ViVmlldyB7CkBAIC04MzksNiArODQwLDE5IEBAIHN0YXRp YyBpbmxpbmUgV2ViQ29yZTo6TGF5b3V0TWlsZXN0b25lcyBsYXlvdXRNaWxlc3RvbmVzKF9XS1Jl bmRlcmluZ1Byb2dyZXNzRXZlCiAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNX aXRoU3RhYmxlU3RhdGU6WUVTXTsKIH0KIAorI2Vsc2UKKworI3ByYWdtYSBtYXJrIC0gT1MgWC1z cGVjaWZpYyBtZXRob2RzCisKKy0gKE5TQ29sb3IgKilfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENv bG9yCit7CisgICAgV2ViQ29yZTo6Q29sb3IgY29sb3IgPSBfcGFnZS0+cGFnZUV4dGVuZGVkQmFj a2dyb3VuZENvbG9yKCk7CisgICAgaWYgKCFjb2xvci5pc1ZhbGlkKCkpCisgICAgICAgIHJldHVy biBuaWw7CisKKyAgICByZXR1cm4gbnNDb2xvcihjb2xvcik7Cit9CisKICNlbmRpZgogCiBAZW5k CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll d1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 UHJpdmF0ZS5oCmluZGV4IGE5OTE2OTZhNDU0YmRmOWE0ODNmYzgxODYzNDc5NWY1NGYzZjUzMzku LjQ3ZDVhNWIxNzYyYzdjNjUzNWFjYmE5MDVkYzkzZDczMDRkZDlhN2YgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBA IC03NCw2ICs3NCw4IEBAIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tSZW5kZXJp bmdQcm9ncmVzc0V2ZW50cykgewogCiAtICh2b2lkKV9iZWdpbkludGVyYWN0aXZlT2JzY3VyZWRJ bnNldHNDaGFuZ2U7CiAtICh2b2lkKV9lbmRJbnRlcmFjdGl2ZU9ic2N1cmVkSW5zZXRzQ2hhbmdl OworI2Vsc2UKK0Bwcm9wZXJ0eSAocmVhZG9ubHkpIE5TQ29sb3IgKl9wYWdlRXh0ZW5kZWRCYWNr Z3JvdW5kQ29sb3I7CiAjZW5kaWYKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3Lm1tCmluZGV4IDc3ZDY5Y2RjMTY5ODMzMDM4ODNmYzMwZTRhYzFhYzJkNWU4 NzM4MGEuLjUwNzA0NmU4MDg1YTFhN2Y3NjBlMTI0ZGQyZWFlYWE2ZjhiMGZhYmEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTMyNjAsNiArMzI2MCwx NSBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3Ry aW5nICpwYXRoKQogICAgIHJldHVybiBfZGF0YS0+X2FsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlv bkdlc3R1cmVzOwogfQogCistIChOU0NvbG9yICopX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xv cgoreworICAgIFdlYkNvcmU6OkNvbG9yIGNvbG9yID0gX2RhdGEtPl9wYWdlLT5wYWdlRXh0ZW5k ZWRCYWNrZ3JvdW5kQ29sb3IoKTsKKyAgICBpZiAoIWNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAg cmV0dXJuIG5pbDsKKworICAgIHJldHVybiBuc0NvbG9yKGNvbG9yKTsKK30KKwogLy8gVGhpcyBt ZXRob2QgZm9yY2VzIGEgZHJhd2luZyBhcmVhIGdlb21ldHJ5IHVwZGF0ZSwgZXZlbiBpZiBmcmFt ZSBzaXplIHVwZGF0ZXMgYXJlIGRpc2FibGVkLgogLy8gVGhlIHVwZGF0ZWQgaXMgcGVyZm9ybWVk IGFzeW5jaHJvbm91c2x5OyB3ZSBkb24ndCB3YWl0IGZvciB0aGUgZ2VvbWV0cnkgdXBkYXRlIGJl Zm9yZSByZXR1cm5pbmcuCiAvLyBUaGUgYXJlYSBkcmF3biBuZWVkIG5vdCBtYXRjaCB0aGUgY3Vy cmVudCBmcmFtZSBzaXplIC0gaWYgaXQgZGlmZmVycyBpdCB3aWxsIGJlIGFuY2hvcmVkIHRvIHRo ZQo=