102299 2012-11-14 16:38:52 -0800 Add a new shared class WebCoreFullScreenWarningView which presents a styled warning message. 2012-11-27 16:24:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 102300 1 jer.noble jer.noble oldest_to_newest 767449 0 jer.noble 2012-11-14 16:38:52 -0800 Add a new shared class WebCoreFullScreenWarningView which presents a styled warning message. 767478 1 174290 jer.noble 2012-11-14 16:59:06 -0800 Created attachment 174290 Patch 769602 2 174290 ap 2012-11-16 12:58:12 -0800 Comment on attachment 174290 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174290&action=review I don't know why anyone in the world would do layout with anything other than HTML :-p r=style bot > Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm:28 > +#include "WebCoreFullScreenWarningView.h" > +#include "LocalizedStrings.h" There should be a blank line between these. > Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm:45 > +static const NSTimeInterval WarningViewHideDelay = 3.0; You got all of them right, except for this one, should be just "3". > Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm:66 > + RetainPtr<NSFont> textFont = [NSFont boldSystemFontOfSize:WarningViewTextSize]; No good in retaining it, just refcount churn. > Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm:67 > + RetainPtr<NSColor> textColor = [NSColor colorWithCalibratedWhite:WarningViewTextWhite alpha:WarningViewTextAlpha]; No good in retaining it, just refcount churn. > Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm:91 > + RetainPtr<NSColor> backgroundColor = [NSColor colorWithCalibratedWhite:WarningViewBackgroundWhite alpha:WarningViewBackgroundAlpha]; No good in retaining it, just refcount churn. > Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm:99 > + RetainPtr<NSColor> shadowColor = [NSColor colorWithCalibratedWhite:WarningViewShadowWhite alpha:WarningViewShadowAlpha]; No good in retaining it, just refcount churn. 777343 3 jer.noble 2012-11-27 16:24:42 -0800 Committed r135937: <http://trac.webkit.org/changeset/135937> 174290 2012-11-14 16:59:06 -0800 2012-11-16 12:58:12 -0800 Patch bug-102299-20121114165705.patch text/plain 14520 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2MzMGYwOTk4NDJjMTZl N2ZkNTJjNjRiNGI3ODgyY2ZjNDA3YjNiNy4uMDZhOTA4N2RiYTM3OWY5NDIxMTdjOTA0MGU3MjVk ODA1ZDExMTVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTE0ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIG5ldyBzaGFyZWQg Y2xhc3MgV2ViQ29yZUZ1bGxTY3JlZW5XYXJuaW5nVmlldyB3aGljaCBwcmVzZW50cyBhIHN0eWxl ZCB3YXJuaW5nIG1lc3NhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDIyOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgYSBzaGFyZWQgaW1wbGVtZW50YXRpb24gb2YgYSB3YXJuaW5nIHZpZXcg Zm9yIHVzZSBpbiBXZWJLaXQgYW5kIFdlYktpdDIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv V2ViQ29yZUZ1bGxTY3JlZW5XYXJuaW5nVmlldy5oOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvV2ViQ29yZUZ1bGxTY3JlZW5XYXJuaW5nVmlldy5tbTogQWRkZWQuCisgICAgICAgICgt W1dlYkNvcmVGdWxsU2NyZWVuV2FybmluZ1ZpZXcgaW5pdFdpdGhUaXRsZTpdKTogQ3JlYXRlIHRo ZSB2aWV3LgorCisgICAgICAgIEFkZCB0aGUgbmV3IGZpbGVzIHRvIHRoZSBwcm9qZWN0IGFuZCBl eHBvcnRzIGxpc3Q6CisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDEyLTExLTE0ICBFcmlrIEFydmlkc3Nv biAgPGFydkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVXBkYXRlIERPTUV4Y2VwdGlvbiBuYW1l OiBJblVzZUF0dHJpYnV0ZUVycm9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNo Lmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9q L0xvY2FsaXphYmxlLnN0cmluZ3MKaW5kZXggYTBhODc2NjE3MGNlZjZiNzE3MjIzNDkwZjhmMjU3 M2M5ZDkwNjJiZC4uOGM2NTVkNjE5ZjFkZDExMDZhMmZiYWQwMzY5N2NhMDk3YTkxYWZlMiAxMDA2 NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAyMTIKemNtWEBHa05MPn48XyErX01IdXVNdj18Zl5k PksrMWloKGVaQSlPKDBhKUdrRVlaNX5kTHEwPH1QJUlWNVFVSjB0Cno4UylyWHoreGE/MjJlWj9D PUw8QEBselIrN194ITk1K0U7KXBfQ3k5Mm8pdzVjIzBlOTBZJFdjX0haI01GKnBONwpmR1p+VkJE aXdlI15NUGI0TGpATEhsRFl+RXdtQDBwYjt0biNAb3ArJAoKZGVsdGEgOQpRY21hRUlmY2R+YTxf IStfMFU2VC1feTdPXgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu IGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggYmFjNmFhYTMyOGI3YWU2MGVh OGVkZWFlZGQzMGQ1ODZiODFjYTcxYy4uYWJlMTc3MTY2MmMxY2U4NmVjMjY0ZmMwYWE4YWE2ODVh NGI0YjU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTE2MjMsNiArMTYyMyw3IEBAIF93a1Np Z25hbENGUmVhZFN0cmVhbUhhc0J5dGVzCiAub2JqY19jbGFzc19uYW1lX0RPTVN0eWxlU2hlZXQK IC5vYmpjX2NsYXNzX25hbWVfRE9NU3R5bGVTaGVldExpc3QKIC5vYmpjX2NsYXNzX25hbWVfRE9N VHJlZVdhbGtlcgorLm9iamNfY2xhc3NfbmFtZV9XZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3 CiAub2JqY19jbGFzc19uYW1lX1dlYkNvcmVGdWxsU2NyZWVuV2luZG93CiAub2JqY19jbGFzc19u YW1lX1dlYkhUTUxDb252ZXJ0ZXIKIC5vYmpjX2NsYXNzX25hbWVfV2ViV2luZG93RmFkZUFuaW1h dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCmluZGV4IDZjNGEyMjdlN2Y3OTA2MmM2MWZmZmI5NGU1ZDczN2QwZGIzZjVmMjkuLjU4MjZl ZTE3NmE5NTRiN2I0MzA4MTRmZDgyZWYyYzIzMDZjZjMxNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTU5MDQsNiArNTkwNCw4 IEBACiAJCUNEQjg1OUY3MTYwRDQ4QTQwMEU1QjA3RiAvKiBNZWRpYUtleUV2ZW50LmNwcCBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENEQjg1OUY0MTYwRDQ4 OTkwMEU1QjA3RiAvKiBNZWRpYUtleUV2ZW50LmNwcCAqLzsgfTsKIAkJQ0RCODU5RkExNjBENDk0 OTAwRTVCMDdGIC8qIEpTTWVkaWFLZXlFdmVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDREI4NTlGODE2MEQ0OTNFMDBFNUIwN0YgLyogSlNNZWRp YUtleUV2ZW50LmNwcCAqLzsgfTsKIAkJQ0RCODU5RkIxNjBENDk0RjAwRTVCMDdGIC8qIEpTTWVk aWFLZXlFcnJvci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBDREI4NTlGMDE2MEQ0MkREMDBFNUIwN0YgLyogSlNNZWRpYUtleUVycm9yLmNwcCAqLzsg fTsKKwkJQ0RDNjlERDYxNjMyMDI2QzAwN0MzOERGIC8qIFdlYkNvcmVGdWxsU2NyZWVuV2Fybmlu Z1ZpZXcuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENE QzY5REQ0MTYzMjAyNkMwMDdDMzhERiAvKiBXZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3Lmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJQ0RDNjlE RDcxNjMyMDI2QzAwN0MzOERGIC8qIFdlYkNvcmVGdWxsU2NyZWVuV2FybmluZ1ZpZXcubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDREM2OURENTE2MzIw MjZDMDA3QzM4REYgLyogV2ViQ29yZUZ1bGxTY3JlZW5XYXJuaW5nVmlldy5tbSAqLzsgfTsKIAkJ Q0RENTI1RDcxNDVCNkREMDAwOEQyMDREIC8qIEpTSFRNTE1lZGlhRWxlbWVudEN1c3RvbS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDREY2NUNDQzE0 NUI2QUZFMDBDNEM3QUEgLyogSlNIVE1MTWVkaWFFbGVtZW50Q3VzdG9tLmNwcCAqLzsgfTsKIAkJ Q0RFQTc2MzAxNDYwOEE1MzAwOEIzMUYxIC8qIFBsYXRmb3JtQ2xvY2tDQS5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDREVBNzYyRTE0NjA4NERFMDA4 QjMxRjEgLyogUGxhdGZvcm1DbG9ja0NBLmNwcCAqLzsgfTsKIAkJQ0RFQTc2MzQxNDYwQjU2RjAw OEIzMUYxIC8qIENsb2NrR2VuZXJpYy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBDREVBNzYzMjE0NjBBRTI5MDA4QjMxRjEgLyogQ2xvY2tHZW5lcmlj LmNwcCAqLzsgfTsKQEAgLTEzMjk2LDYgKzEzMjk4LDggQEAKIAkJQ0RCODU5RjgxNjBENDkzRTAw RTVCMDdGIC8qIEpTTWVkaWFLZXlFdmVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBKU01lZGlhS2V5RXZlbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQlDREI4NTlGOTE2MEQ0OTNFMDBFNUIwN0YgLyogSlNNZWRpYUtleUV2ZW50LmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTTWVkaWFLZXlFdmVudC5oOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQlDREJEOTNCQTEzMzNCRDRCMDAyNTcwRTMgLyogZnVsbHNjcmVl blF1aWNrVGltZS5jc3MgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0LmNzczsgcGF0aCA9IGZ1bGxzY3JlZW5RdWlj a1RpbWUuY3NzOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQlDREM2OURENDE2MzIwMjZD MDA3QzM4REYgLyogV2ViQ29yZUZ1bGxTY3JlZW5XYXJuaW5nVmlldy5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IHBhdGggPSBXZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3Lmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUNEQzY5REQ1MTYzMjAyNkMwMDdDMzhERiAvKiBXZWJD b3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2Jq Y3BwOyBwYXRoID0gV2ViQ29yZUZ1bGxTY3JlZW5XYXJuaW5nVmlldy5tbTsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJQ0RDRTVDRDAxNDYzM0JDOTAwRDQ3Q0NBIC8qIEV2ZW50VGFyZ2V0 RmFjdG9yeS5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBFdmVudFRhcmdldEZhY3RvcnkuaW47 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUNERUE3NjJDMTQ2MDgyMjQwMDhCMzFGMSAv KiBDbG9jay5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDbG9jay5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDREVBNzYyRTE0NjA4NERFMDA4QjMxRjEgLyogUGxh dGZvcm1DbG9ja0NBLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBs YXRmb3JtQ2xvY2tDQS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xNTgwNCw2 ICsxNTgwOCw4IEBACiAJCQkJQkNFNjU5RTUwRUE5MkZCMjAwN0U0NTMzIC8qIFRoZW1lTWFjLmgg Ki8sCiAJCQkJQkNFNjU5RTgwRUE5MkZGQTAwN0U0NTMzIC8qIFRoZW1lTWFjLm1tICovLAogCQkJ CTUxREY2RDdGMEI5MkExOEUwMEMyREM4NSAvKiBUaHJlYWRDaGVjay5tbSAqLywKKwkJCQlDREM2 OURENDE2MzIwMjZDMDA3QzM4REYgLyogV2ViQ29yZUZ1bGxTY3JlZW5XYXJuaW5nVmlldy5oICov LAorCQkJCUNEQzY5REQ1MTYzMjAyNkMwMDdDMzhERiAvKiBXZWJDb3JlRnVsbFNjcmVlbldhcm5p bmdWaWV3Lm1tICovLAogCQkJCUNEMTI3REVBMTRGMzA5NzkwMEU4NDc3OSAvKiBXZWJDb3JlRnVs bFNjcmVlbldpbmRvdy5oICovLAogCQkJCUNEMTI3REVCMTRGMzA5NzkwMEU4NDc3OSAvKiBXZWJD b3JlRnVsbFNjcmVlbldpbmRvdy5tbSAqLywKIAkJCQkzNzE5NDE5NTE1NjZCMzcyMDBBMjc2RDgg LyogV2ViQ29yZU5TQ2VsbEV4dHJhcy5oICovLApAQCAtMjU1NTEsNiArMjU1NTcsNyBAQAogCQkJ CUZENTgxRkI1MTUyMEY5M0IwMDNBN0E3NSAvKiBXYXZlVGFibGUuaCBpbiBIZWFkZXJzICovLAog CQkJCTI5QTgxMjQ5MEZCQjlDQTkwMDUxMDI5MyAvKiBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJOTNGMTk5QTgwODI0NUU1OTAwMUU5QUJDIC8qIFdl YkNvcmVGcmFtZVZpZXcuaCBpbiBIZWFkZXJzICovLAorCQkJCUNEQzY5REQ2MTYzMjAyNkMwMDdD MzhERiAvKiBXZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3LmggaW4gSGVhZGVycyAqLywKIAkJ CQlDRDEyN0RFRTE0RjMwOTg0MDBFODQ3NzkgLyogV2ViQ29yZUZ1bGxTY3JlZW5XaW5kb3cuaCBp biBIZWFkZXJzICovLAogCQkJCUJDNTNEOTExMTE0MzEwQ0MwMDBEODE3RSAvKiBXZWJDb3JlSlND bGllbnREYXRhLmggaW4gSGVhZGVycyAqLywKIAkJCQk5M0YxOTlCQjA4MjQ1RTU5MDAxRTlBQkMg LyogV2ViQ29yZUtleWJvYXJkVUlNb2RlLmggaW4gSGVhZGVycyAqLywKQEAgLTI4NjUzLDYgKzI4 NjYwLDcgQEAKIAkJCQlGRDdGMjk5NjEzRDRDMENCMDBBRDk1MzUgLyogV2F2ZVNoYXBlclByb2Nl c3Nvci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlGRDU4MUZCNDE1MjBGOTNCMDAzQTdBNzUgLyog V2F2ZVRhYmxlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTI5QTgxMjRBMEZCQjlDQTkwMDUxMDI5 MyAvKiBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbSBpbiBTb3VyY2VzICovLAorCQkJ CUNEQzY5REQ3MTYzMjAyNkMwMDdDMzhERiAvKiBXZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3 Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQ0QxMjdERUQxNEYzMDk3RDAwRTg0Nzc5IC8qIFdlYkNv cmVGdWxsU2NyZWVuV2luZG93Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJRjNCRkM5RDMxNUMxNzdF QzAwNDI0NEU1IC8qIFdlYkNvcmVNZW1vcnlJbnN0cnVtZW50YXRpb24uY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJMzcxOTQxOTYxNTY2QjM3MjAwQTI3NkQ4IC8qIFdlYkNvcmVOU0NlbGxFeHRyYXMu bSBpbiBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1dlYkNvcmVGdWxsU2NyZWVuV2FybmluZ1ZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9XZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3LmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjZlYTlhZDc4 NGVhZTJkZTA5NWQxZTMwZWRkN2MwYzU0ZmE2Y2NjZAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3LmgKQEAg LTAsMCArMSw0MSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgV2ViQ29yZUZ1bGxTY3JlZW5XYXJu aW5nVmlld19oCisjZGVmaW5lIFdlYkNvcmVGdWxsU2NyZWVuV2FybmluZ1ZpZXdfaAorCisjaWYg RU5BQkxFKEZVTExTQ1JFRU5fQVBJKQorCisjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorCitA aW50ZXJmYWNlICBXZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3IDogTlNCb3ggeworICAgIFJl dGFpblB0cjxOU1RleHRGaWVsZD4gX3RleHRGaWVsZDsKK30KKy0gKGlkKWluaXRXaXRoVGl0bGU6 KE5TU3RyaW5nKil0aXRsZTsKK0BlbmQKKworI2VuZGlmCisKKyNlbmRpZiAvLyBXZWJDb3JlRnVs bFNjcmVlbldhcm5pbmdWaWV3X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9XZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1dlYkNvcmVGdWxsU2NyZWVuV2FybmluZ1ZpZXcubW0KbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2Vk OThjMTg5MWU2NDVjMDVmYjQxZjUyMWNlOGE2OTZjYWQ2ZGNkMwotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlRnVsbFNjcmVlbldhcm5pbmdWaWV3 Lm1tCkBAIC0wLDAgKzEsMTA3IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEyIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwor ICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisg KiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICog QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgor I2luY2x1ZGUgIldlYkNvcmVGdWxsU2NyZWVuV2FybmluZ1ZpZXcuaCIKKyNpbmNsdWRlICJMb2Nh bGl6ZWRTdHJpbmdzLmgiCisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CisKK3N0YXRp YyBjb25zdCBDR0Zsb2F0IFdhcm5pbmdWaWV3VGV4dFdoaXRlID0gMC45Oworc3RhdGljIGNvbnN0 IENHRmxvYXQgV2FybmluZ1ZpZXdUZXh0QWxwaGEgPSAxOworc3RhdGljIGNvbnN0IENHRmxvYXQg V2FybmluZ1ZpZXdUZXh0U2l6ZSA9IDQ4Oworc3RhdGljIGNvbnN0IENHRmxvYXQgV2FybmluZ1Zp ZXdQYWRkaW5nID0gMjA7CitzdGF0aWMgY29uc3QgQ0dGbG9hdCBXYXJuaW5nVmlld0Nvcm5lclJh ZGl1cyA9IDEwOworc3RhdGljIGNvbnN0IENHRmxvYXQgV2FybmluZ1ZpZXdCb3JkZXJXaGl0ZSA9 IDAuOTsKK3N0YXRpYyBjb25zdCBDR0Zsb2F0IFdhcm5pbmdWaWV3Qm9yZGVyQWxwaGEgPSAwLjI7 CitzdGF0aWMgY29uc3QgQ0dGbG9hdCBXYXJuaW5nVmlld0JhY2tncm91bmRXaGl0ZSA9IDAuMTsK K3N0YXRpYyBjb25zdCBDR0Zsb2F0IFdhcm5pbmdWaWV3QmFja2dyb3VuZEFscGhhID0gMC45Owor c3RhdGljIGNvbnN0IENHRmxvYXQgV2FybmluZ1ZpZXdTaGFkb3dXaGl0ZSA9IDAuMTsKK3N0YXRp YyBjb25zdCBDR0Zsb2F0IFdhcm5pbmdWaWV3U2hhZG93QWxwaGEgPSAxOworc3RhdGljIGNvbnN0 IGZsb2F0IFdhcm5pbmdWaWV3U2hhZG93T3BhY2l0eSA9IDAuMjU7CitzdGF0aWMgY29uc3QgQ0dT aXplIFdhcm5pbmdWaWV3U2hhZG93T2Zmc2V0ID0gezAsIC0yfTsKK3N0YXRpYyBjb25zdCBDR0Zs b2F0IFdhcm5pbmdWaWV3U2hhZG93UmFkaXVzID0gNTsKK3N0YXRpYyBjb25zdCBOU1RpbWVJbnRl cnZhbCBXYXJuaW5nVmlld0hpZGVEZWxheSA9IDMuMDsKK3N0YXRpYyBjb25zdCBOU1RpbWVJbnRl cnZhbCBXYXJuaW5nVmlld0ZhZGVEdXJhdGlvbiA9IDAuNTsKKworQGltcGxlbWVudGF0aW9uIFdl YkNvcmVGdWxsU2NyZWVuV2FybmluZ1ZpZXcKKworLSAoaWQpaW5pdFdpdGhUaXRsZTooTlNTdHJp bmcqKXRpdGxlCit7CisgICAgc2VsZiA9IFtzdXBlciBpbml0V2l0aEZyYW1lOk5TWmVyb1JlY3Rd OworICAgIGlmICghc2VsZikKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIFtzZWxmIHNldEF1 dG9yZXNpemluZ01hc2s6KE5TVmlld01pblhNYXJnaW4gfCBOU1ZpZXdNYXhYTWFyZ2luIHwgTlNW aWV3TWluWU1hcmdpbiB8IE5TVmlld01heFlNYXJnaW4pXTsKKyAgICBbc2VsZiBzZXRCb3hUeXBl Ok5TQm94Q3VzdG9tXTsKKyAgICBbc2VsZiBzZXRUaXRsZVBvc2l0aW9uOk5TTm9UaXRsZV07CisK KyAgICBfdGV4dEZpZWxkID0gYWRvcHROUyhbW05TVGV4dEZpZWxkIGFsbG9jXSBpbml0V2l0aEZy YW1lOk5TWmVyb1JlY3RdKTsKKyAgICBbX3RleHRGaWVsZC5nZXQoKSBzZXRFZGl0YWJsZTpOT107 CisgICAgW190ZXh0RmllbGQuZ2V0KCkgc2V0U2VsZWN0YWJsZTpOT107CisgICAgW190ZXh0Rmll bGQuZ2V0KCkgc2V0Qm9yZGVyZWQ6Tk9dOworICAgIFtfdGV4dEZpZWxkLmdldCgpIHNldERyYXdz QmFja2dyb3VuZDpOT107CisKKyAgICBSZXRhaW5QdHI8TlNGb250PiB0ZXh0Rm9udCA9IFtOU0Zv bnQgYm9sZFN5c3RlbUZvbnRPZlNpemU6V2FybmluZ1ZpZXdUZXh0U2l6ZV07CisgICAgUmV0YWlu UHRyPE5TQ29sb3I+IHRleHRDb2xvciA9IFtOU0NvbG9yIGNvbG9yV2l0aENhbGlicmF0ZWRXaGl0 ZTpXYXJuaW5nVmlld1RleHRXaGl0ZSBhbHBoYTpXYXJuaW5nVmlld1RleHRBbHBoYV07CisgICAg UmV0YWluUHRyPE5TRGljdGlvbmFyeT4gYXR0cmlidXRlcyA9IGFkb3B0TlMoW1tOU0RpY3Rpb25h cnkgYWxsb2NdIGluaXRXaXRoT2JqZWN0c0FuZEtleXM6CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRleHRGb250LmdldCgpLCBOU0ZvbnRBdHRyaWJ1 dGVOYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0ZXh0Q29sb3IuZ2V0KCksIE5TRm9yZWdyb3VuZENvbG9yQXR0cmlidXRlTmFtZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsXSk7CisgICAg UmV0YWluUHRyPE5TQXR0cmlidXRlZFN0cmluZz4gdGV4dCA9IGFkb3B0TlMoW1tOU0F0dHJpYnV0 ZWRTdHJpbmcgYWxsb2NdIGluaXRXaXRoU3RyaW5nOnRpdGxlIGF0dHJpYnV0ZXM6YXR0cmlidXRl cy5nZXQoKV0pOworICAgIFtfdGV4dEZpZWxkLmdldCgpIHNldEF0dHJpYnV0ZWRTdHJpbmdWYWx1 ZTp0ZXh0LmdldCgpXTsKKyAgICBbX3RleHRGaWVsZC5nZXQoKSBzaXplVG9GaXRdOworICAgIE5T UmVjdCB0ZXh0RmllbGRGcmFtZSA9IFtfdGV4dEZpZWxkLmdldCgpIGZyYW1lXTsKKyAgICBOU1Np emUgZnJhbWVTaXplID0gdGV4dEZpZWxkRnJhbWUuc2l6ZTsKKyAgICBmcmFtZVNpemUud2lkdGgg Kz0gV2FybmluZ1ZpZXdQYWRkaW5nICogMjsKKyAgICBmcmFtZVNpemUuaGVpZ2h0ICs9IFdhcm5p bmdWaWV3UGFkZGluZyAqIDI7CisgICAgW3NlbGYgc2V0RnJhbWVTaXplOmZyYW1lU2l6ZV07CisK KyAgICB0ZXh0RmllbGRGcmFtZS5vcmlnaW4gPSBOU01ha2VQb2ludCgKKyAgICAgICAgKGZyYW1l U2l6ZS53aWR0aCAtIHRleHRGaWVsZEZyYW1lLnNpemUud2lkdGgpIC8gMiwKKyAgICAgICAgKGZy YW1lU2l6ZS5oZWlnaHQgLSB0ZXh0RmllbGRGcmFtZS5zaXplLmhlaWdodCkgLyAyKTsKKworICAg IC8vIE9mZnNldCB0aGUgb3JpZ2luIGJ5IHRoZSBmb250J3MgZGVzY2VuZGVyLCB0byBjZW50ZXIg dGhlIHRleHQgZmllbGQgYWJvdXQgdGhlIGJhc2VsaW5lOgorICAgIHRleHRGaWVsZEZyYW1lLm9y aWdpbi55ICs9IFtbX3RleHRGaWVsZC5nZXQoKSBmb250XSBkZXNjZW5kZXJdOworCisgICAgW190 ZXh0RmllbGQuZ2V0KCkgc2V0RnJhbWU6TlNJbnRlZ3JhbFJlY3QodGV4dEZpZWxkRnJhbWUpXTsK KyAgICBbc2VsZiBhZGRTdWJ2aWV3Ol90ZXh0RmllbGQuZ2V0KCldOworCisgICAgUmV0YWluUHRy PE5TQ29sb3I+IGJhY2tncm91bmRDb2xvciA9IFtOU0NvbG9yIGNvbG9yV2l0aENhbGlicmF0ZWRX aGl0ZTpXYXJuaW5nVmlld0JhY2tncm91bmRXaGl0ZSBhbHBoYTpXYXJuaW5nVmlld0JhY2tncm91 bmRBbHBoYV07CisgICAgW3NlbGYgc2V0RmlsbENvbG9yOmJhY2tncm91bmRDb2xvci5nZXQoKV07 CisgICAgW3NlbGYgc2V0Q29ybmVyUmFkaXVzOldhcm5pbmdWaWV3Q29ybmVyUmFkaXVzXTsKKwor ICAgIFJldGFpblB0cjxOU0NvbG9yPiBib3JkZXJDb2xvciA9IFtOU0NvbG9yIGNvbG9yV2l0aENh bGlicmF0ZWRXaGl0ZTpXYXJuaW5nVmlld0JvcmRlcldoaXRlIGFscGhhOldhcm5pbmdWaWV3Qm9y ZGVyQWxwaGFdOworICAgIFtzZWxmIHNldEJvcmRlckNvbG9yOmJvcmRlckNvbG9yLmdldCgpXTsK KworICAgIFJldGFpblB0cjxOU1NoYWRvdz4gc2hhZG93ID0gYWRvcHROUyhbW05TU2hhZG93IGFs bG9jXSBpbml0XSk7CisgICAgUmV0YWluUHRyPE5TQ29sb3I+IHNoYWRvd0NvbG9yID0gW05TQ29s b3IgY29sb3JXaXRoQ2FsaWJyYXRlZFdoaXRlOldhcm5pbmdWaWV3U2hhZG93V2hpdGUgYWxwaGE6 V2FybmluZ1ZpZXdTaGFkb3dBbHBoYV07CisgICAgW3NoYWRvdy5nZXQoKSBzZXRTaGFkb3dDb2xv cjpzaGFkb3dDb2xvci5nZXQoKV07CisgICAgW3NoYWRvdy5nZXQoKSBzZXRTaGFkb3dPZmZzZXQ6 V2FybmluZ1ZpZXdTaGFkb3dPZmZzZXRdOworICAgIFtzaGFkb3cuZ2V0KCkgc2V0U2hhZG93Qmx1 clJhZGl1czpXYXJuaW5nVmlld1NoYWRvd1JhZGl1c107CisgICAgW3NlbGYgc2V0U2hhZG93OnNo YWRvdy5nZXQoKV07CisKKyAgICByZXR1cm4gc2VsZjsKK30KK0BlbmQK