14711 2007-07-22 04:19:22 -0700 RenderThemeGdk's buttons are state-agnostic (pressed, hovered) 2007-07-28 18:39:23 -0700 1 1 1 Unclassified WebKit New Bugs 523.x (Safari 3) PC Linux RESOLVED FIXED P2 Normal --- 0 nigel.tao.gnome webkit-unassigned oldest_to_newest 4089 0 nigel.tao.gnome 2007-07-22 04:19:22 -0700 On the GTK platform (built using "./build-webkit --gdk") the buttons don't look any different when pressed, or when hovered over, even though the GTK theme supports this. 4083 1 15618 nigel.tao.gnome 2007-07-22 04:20:41 -0700 Created attachment 15618 Simple Patch 4058 2 15618 aroben 2007-07-22 12:11:39 -0700 Comment on attachment 15618 Simple Patch + GtkStateType state_type = isHovered(o) + ? (isPressed(o) ? GTK_STATE_ACTIVE : GTK_STATE_PRELIGHT) + : GTK_STATE_NORMAL; I think this line would be clearer as: GtkStateType state_type = isPressed(o) ? GTK_STATE_ACTIVE : (isHovered(o) ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); ...or... GtkStateType state_type = GTK_STATE_NORMAL; if (isPressed(o)) state_type = GTK_STATE_ACTIVE; else if (isHovered(o)) state_type = GTK_STATE_PRELIGHT; I personally prefer the second one. Also, the variable name sould be `stateType` to adhere to our style guidelines <http://webkit.org/coding/coding-style.html> 3970 3 15647 nigel.tao.gnome 2007-07-23 05:32:19 -0700 Created attachment 15647 Better Simple Patch 3806 4 15666 alp 2007-07-24 11:23:28 -0700 Created attachment 15666 Make use of widget state in RenderThemeGdk 3802 5 15667 alp 2007-07-24 11:27:23 -0700 Created attachment 15667 Make use of widget state in RenderThemeGdk Indentation corrected in this revision. 3803 6 15666 aroben 2007-07-24 11:28:59 -0700 Comment on attachment 15666 Make use of widget state in RenderThemeGdk isChecked(o) ? GTK_SHADOW_IN : GTK_SHADOW_OUT Perhaps this code should become another helper function called `checkedState` (or shadowState if that makes more sense in Gtk terminology) r=me 3804 7 15667 aroben 2007-07-24 11:32:22 -0700 Comment on attachment 15667 Make use of widget state in RenderThemeGdk r=me to this one too, same comments as above. 3801 8 alp 2007-07-24 11:41:37 -0700 Fixed in r24595. 3686 9 nigel.tao.gnome 2007-07-26 06:15:38 -0700 It looks like Alp Toker's patch has landed in trunk, but the pushbuttons' backgrounds are still being (incorrectly) filled in. You can see the problem in the screenshot at http://blogs.gnome.org/nigeltao/files/2007/07/gdk-webkit-buttons.png You might want to apply this part of my patch: Index: WebCore/platform/gdk/RenderThemeGdk.cpp =================================================================== --- WebCore/platform/gdk/RenderThemeGdk.cpp (revision 24641) +++ WebCore/platform/gdk/RenderThemeGdk.cpp (working copy) @@ -288,7 +288,13 @@ { if (!m_container) { m_unmappedWindow = gtk_window_new(GTK_WINDOW_POPUP); - m_container = gtk_fixed_new(); + // Some GTK themes (i.e. Clearlooks) draw the buttons differently + // (in particular, call gtk_style_apply_default_background) if they + // are unallocated and are children of a GtkFixed widget, which is + // apparently what some "make Firefox buttons look like GTK" code + // does. To avoid this ugly look, we use a GtkHBox as a parent, + // rather than a GtkFixed. + m_container = gtk_hbox_new(false, 0); gtk_container_add(GTK_CONTAINER(m_unmappedWindow), m_container); gtk_widget_realize(m_unmappedWindow); } 3521 10 15721 alp 2007-07-28 18:25:01 -0700 Created attachment 15721 Follow-up for shadow state and theming bug workaround 3522 11 15722 alp 2007-07-28 18:27:35 -0700 Created attachment 15722 Follow-up for shadow state and theming bug workaround (take two) Remove the old code we're replacing this time. 3519 12 15722 mrowe 2007-07-28 18:32:03 -0700 Comment on attachment 15722 Follow-up for shadow state and theming bug workaround (take two) r=me 15618 2007-07-22 04:20:41 -0700 2007-07-23 05:32:19 -0700 Simple Patch RenderThemeGdk_button_state.diff text/plain 1786 nigel.tao.gnome SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5jcHAJKHJldmlzaW9uIDI0 NTEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMjcsMTIgKzIyNywxNCBAQAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9v bCBSZW5kZXJUaGVtZUdkazo6cGFpbnRCdXR0b24oUmVuZGVyT2JqZWN0KiwgY29uc3QgUmVuZGVy T2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHJlY3QpIAorYm9vbCBSZW5kZXJU aGVtZUdkazo6cGFpbnRCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6 OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsgCi0gICAgLy8gRklYTUU6IHNo b3VsZCB1c2UgdGhlbWUtYXdhcmUgZHJhd2luZy4gVGhpcyBzaG91bGQgaG9ub3IgdGhlIHN0YXRl IGFzIHdlbGwKICAgICBHdGtXaWRnZXQgKmJ1dHRvbiA9IGd0a0J1dHRvbigpOworICAgIEd0a1N0 YXRlVHlwZSBzdGF0ZV90eXBlID0gaXNIb3ZlcmVkKG8pCisgICAgICAgID8gKGlzUHJlc3NlZChv KSA/IEdUS19TVEFURV9BQ1RJVkUgOiBHVEtfU1RBVEVfUFJFTElHSFQpCisgICAgICAgIDogR1RL X1NUQVRFX05PUk1BTDsKICAgICBndGtfcGFpbnRfYm94KGJ1dHRvbi0+c3R5bGUsIGkuY29udGV4 dC0+Z2RrRHJhd2FibGUoKSwKLSAgICAgICAgICAgICAgICAgIEdUS19TVEFURV9OT1JNQUwsIEdU S19TSEFET1dfT1VULAorICAgICAgICAgICAgICAgICAgc3RhdGVfdHlwZSwgR1RLX1NIQURPV19P VVQsCiAgICAgICAgICAgICAgICAgICBOVUxMLCBidXR0b24sICJidXR0b24iLAogICAgICAgICAg ICAgICAgICAgcmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkp OwogICAgIHJldHVybiBmYWxzZTsKQEAgLTMwMCw3ICszMDIsMTMgQEAKIHsKICAgICBpZiAoIW1f Y29udGFpbmVyKSB7CiAgICAgICAgIG1fdW5tYXBwZWRXaW5kb3cgPSBndGtfd2luZG93X25ldyhH VEtfV0lORE9XX1BPUFVQKTsKLSAgICAgICAgbV9jb250YWluZXIgPSBndGtfZml4ZWRfbmV3KCk7 CisgICAgICAgIC8vIFNvbWUgR1RLIHRoZW1lcyAoaS5lLiBDbGVhcmxvb2tzKSBkcmF3IHRoZSBi dXR0b25zIGRpZmZlcmVudGx5CisgICAgICAgIC8vIChpbiBwYXJ0aWN1bGFyLCBjYWxsIGd0a19z dHlsZV9hcHBseV9kZWZhdWx0X2JhY2tncm91bmQpIGlmIHRoZXkKKyAgICAgICAgLy8gYXJlIHVu YWxsb2NhdGVkIGFuZCBhcmUgY2hpbGRyZW4gb2YgYSBHdGtGaXhlZCB3aWRnZXQsIHdoaWNoIGlz CisgICAgICAgIC8vIGFwcGFyZW50bHkgd2hhdCBzb21lICJtYWtlIEZpcmVmb3ggYnV0dG9ucyBs b29rIGxpa2UgR1RLIiBjb2RlCisgICAgICAgIC8vIGRvZXMuICBUbyBhdm9pZCB0aGlzIHVnbHkg bG9vaywgd2UgdXNlIGEgR3RrSEJveCBhcyBhIHBhcmVudCwKKyAgICAgICAgLy8gcmF0aGVyIHRo YW4gYSBHdGtGaXhlZC4KKyAgICAgICAgbV9jb250YWluZXIgPSBndGtfaGJveF9uZXcoZmFsc2Us IDApOwogICAgICAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKG1fdW5tYXBwZWRX aW5kb3cpLCBtX2NvbnRhaW5lcik7CiAgICAgICAgIGd0a193aWRnZXRfcmVhbGl6ZShtX3VubWFw cGVkV2luZG93KTsKICAgICB9Cg== 15647 2007-07-23 05:32:19 -0700 2007-07-23 05:32:19 -0700 Better Simple Patch RenderThemeGdk_button_state.diff text/plain 1825 nigel.tao.gnome SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5jcHAJKHJldmlzaW9uIDI0 NTEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMjcsMTIgKzIyNywxNiBAQAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9v bCBSZW5kZXJUaGVtZUdkazo6cGFpbnRCdXR0b24oUmVuZGVyT2JqZWN0KiwgY29uc3QgUmVuZGVy T2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHJlY3QpIAorYm9vbCBSZW5kZXJU aGVtZUdkazo6cGFpbnRCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6 OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsgCi0gICAgLy8gRklYTUU6IHNo b3VsZCB1c2UgdGhlbWUtYXdhcmUgZHJhd2luZy4gVGhpcyBzaG91bGQgaG9ub3IgdGhlIHN0YXRl IGFzIHdlbGwKICAgICBHdGtXaWRnZXQgKmJ1dHRvbiA9IGd0a0J1dHRvbigpOworICAgIEd0a1N0 YXRlVHlwZSBzdGF0ZVR5cGUgPSBHVEtfU1RBVEVfTk9STUFMOworICAgIGlmIChpc1ByZXNzZWQo bykpCisgICAgICAgIHN0YXRlVHlwZSA9IEdUS19TVEFURV9BQ1RJVkU7CisgICAgZWxzZSBpZiAo aXNIb3ZlcmVkKG8pKQorICAgICAgICBzdGF0ZVR5cGUgPSBHVEtfU1RBVEVfUFJFTElHSFQ7CiAg ICAgZ3RrX3BhaW50X2JveChidXR0b24tPnN0eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxlKCks Ci0gICAgICAgICAgICAgICAgICBHVEtfU1RBVEVfTk9STUFMLCBHVEtfU0hBRE9XX09VVCwKKyAg ICAgICAgICAgICAgICAgIHN0YXRlVHlwZSwgR1RLX1NIQURPV19PVVQsCiAgICAgICAgICAgICAg ICAgICBOVUxMLCBidXR0b24sICJidXR0b24iLAogICAgICAgICAgICAgICAgICAgcmVjdC54KCks IHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogICAgIHJldHVybiBmYWxz ZTsKQEAgLTMwMCw3ICszMDQsMTMgQEAKIHsKICAgICBpZiAoIW1fY29udGFpbmVyKSB7CiAgICAg ICAgIG1fdW5tYXBwZWRXaW5kb3cgPSBndGtfd2luZG93X25ldyhHVEtfV0lORE9XX1BPUFVQKTsK LSAgICAgICAgbV9jb250YWluZXIgPSBndGtfZml4ZWRfbmV3KCk7CisgICAgICAgIC8vIFNvbWUg R1RLIHRoZW1lcyAoaS5lLiBDbGVhcmxvb2tzKSBkcmF3IHRoZSBidXR0b25zIGRpZmZlcmVudGx5 CisgICAgICAgIC8vIChpbiBwYXJ0aWN1bGFyLCBjYWxsIGd0a19zdHlsZV9hcHBseV9kZWZhdWx0 X2JhY2tncm91bmQpIGlmIHRoZXkKKyAgICAgICAgLy8gYXJlIHVuYWxsb2NhdGVkIGFuZCBhcmUg Y2hpbGRyZW4gb2YgYSBHdGtGaXhlZCB3aWRnZXQsIHdoaWNoIGlzCisgICAgICAgIC8vIGFwcGFy ZW50bHkgd2hhdCBzb21lICJtYWtlIEZpcmVmb3ggYnV0dG9ucyBsb29rIGxpa2UgR1RLIiBjb2Rl CisgICAgICAgIC8vIGRvZXMuICBUbyBhdm9pZCB0aGlzIHVnbHkgbG9vaywgd2UgdXNlIGEgR3Rr SEJveCBhcyBhIHBhcmVudCwKKyAgICAgICAgLy8gcmF0aGVyIHRoYW4gYSBHdGtGaXhlZC4KKyAg ICAgICAgbV9jb250YWluZXIgPSBndGtfaGJveF9uZXcoZmFsc2UsIDApOwogICAgICAgICBndGtf Y29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKG1fdW5tYXBwZWRXaW5kb3cpLCBtX2NvbnRhaW5l cik7CiAgICAgICAgIGd0a193aWRnZXRfcmVhbGl6ZShtX3VubWFwcGVkV2luZG93KTsKICAgICB9 Cg== 15666 2007-07-24 11:23:28 -0700 2007-07-24 11:28:59 -0700 Make use of widget state in RenderThemeGdk theme-state.patch text/plain 6554 alp SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDU5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDctMDctMjQgIEFscCBUb2tlciAgPGFscC50b2tlckBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTEKKyAgICAgICAg UmVuZGVyVGhlbWVHZGsncyBidXR0b25zIGFyZSBzdGF0ZS1hZ25vc3RpYyAocHJlc3NlZCwgaG92 ZXJlZCkKKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgbGFiZWwgZnJvbSB3aWRnZXQgaW5z dGFuY2VzLgorICAgICAgICBSZW5kZXIgY2hlY2sgYW5kIHJhZGlvIHdpZGdldHMgY29ycmVjdGx5 LgorICAgICAgICBEZXRlcm1pbmUgdGhlIHdpZGdldCBzdGF0ZSBhbmQgcmVuZGVyIGl0IGFwcHJv cHJpYXRlbHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OmRldGVybWluZVN0YXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpwYWludENoZWNrYm94KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lR2RrOjpwYWludFJhZGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lR2RrOjpwYWludEJ1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZUdkazo6Z3RrQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpndGtD aGVja2JveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUdkazo6Z3RrUmFkaW9CdXR0 b24pOgorICAgICAgICAqIHBsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oOgorCiAyMDA3LTA3 LTI0ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwCShyZXZp c2lvbiAyNDU5NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNCw2ICs0LDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBs ZSBDb21wdXRlciwgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA2IE1pY2hhZWwgRW1tZWwgbWlr ZS5lbW1lbEBnbWFpbC5jb20gCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcgSG9sZ2VyIEhhbnMgUGV0 ZXIgRnJleXRoZXIKKyAqIENvcHlyaWdodCAoQykgMjAwNyBBbHAgVG9rZXIgPGFscC50b2tlckBj b2xsYWJvcmEuY28udWs+CiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGli cmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAg LTM0LDEzICszNSw2IEBACiAjZGVmaW5lIFRIRU1FX0NPTE9SIDIwNAogI2RlZmluZSBUSEVNRV9G T05UICAyMTAKIAotLy8gR2VuZXJpYyBzdGF0ZSBjb25zdGFudHMKLSNkZWZpbmUgVFNfTk9STUFM ICAgIDEKLSNkZWZpbmUgVFNfSE9WRVIgICAgIDIKLSNkZWZpbmUgVFNfQUNUSVZFICAgIDMKLSNk ZWZpbmUgVFNfRElTQUJMRUQgIDQKLSNkZWZpbmUgVFNfRk9DVVNFRCAgIDUKLQogLy8gQnV0dG9u IGNvbnN0YW50cwogI2RlZmluZSBCUF9CVVRUT04gICAgMQogI2RlZmluZSBCUF9SQURJTyAgICAg MgpAQCAtMTMxLDIxICsxMjUsMTUgQEAgYm9vbCBSZW5kZXJUaGVtZUdkazo6c3VwcG9ydHNGb2N1 cyhFQXBwZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdW5zaWduZWQgUmVuZGVyVGhlbWVHZGs6 OmRldGVybWluZVN0YXRlKFJlbmRlck9iamVjdCogbykKK0d0a1N0YXRlVHlwZSBSZW5kZXJUaGVt ZUdkazo6ZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2JqZWN0KiBvKQogewotICAgIHVuc2lnbmVkIHJl c3VsdCA9IFRTX05PUk1BTDsKKyAgICBHdGtTdGF0ZVR5cGUgcmVzdWx0ID0gR1RLX1NUQVRFX05P Uk1BTDsKICAgICBpZiAoIWlzRW5hYmxlZChvKSkKLSAgICAgICAgcmVzdWx0ID0gVFNfRElTQUJM RUQ7Ci0gICAgZWxzZSBpZiAoaXNSZWFkT25seUNvbnRyb2wobykpCi0gICAgICAgIHJlc3VsdCA9 IFRGU19SRUFET05MWTsgLy8gUmVhZG9ubHkgaXMgc3VwcG9ydGVkIG9uIHRleHRmaWVsZHMuCi0g ICAgZWxzZSBpZiAoc3VwcG9ydHNGb2N1cyhvLT5zdHlsZSgpLT5hcHBlYXJhbmNlKCkpICYmIGlz Rm9jdXNlZChvKSkKLSAgICAgICAgcmVzdWx0ID0gVFNfRk9DVVNFRDsKKyAgICAgICAgcmVzdWx0 ID0gR1RLX1NUQVRFX0lOU0VOU0lUSVZFOwogICAgIGVsc2UgaWYgKGlzUHJlc3NlZChvKSkKLSAg ICAgICAgcmVzdWx0ID0gVFNfQUNUSVZFOworICAgICAgICByZXN1bHQgPSBHVEtfU1RBVEVfQUNU SVZFOwogICAgIGVsc2UgaWYgKGlzSG92ZXJlZChvKSkKLSAgICAgICAgcmVzdWx0ID0gVFNfSE9W RVI7Ci0gICAgaWYgKGlzQ2hlY2tlZChvKSkKLSAgICAgICAgcmVzdWx0ICs9IDQ7IC8vIDQgdW5j aGVja2VkIHN0YXRlcywgNCBjaGVja2VkIHN0YXRlcy4KKyAgICAgICAgcmVzdWx0ID0gR1RLX1NU QVRFX1BSRUxJR0hUOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTE4NywxMCArMTc1LDEw IEBAIGJvb2wgUmVuZGVyVGhlbWVHZGs6OnBhaW50Q2hlY2tib3goUmVuZGUKIHsKICAgICAvLyBG SVhNRTogaXMgaXQgdGhlIHJpZ2h0IHRoaW5nIHRvIGRvPwogICAgIEd0a1dpZGdldCAqY2hlY2ti b3ggPSBndGtDaGVja2JveCgpOwotICAgIGd0a19wYWludF9ib3goY2hlY2tib3gtPnN0eWxlLCBp LmNvbnRleHQtPmdka0RyYXdhYmxlKCksCi0gICAgICAgICAgICAgICAgICBHVEtfU1RBVEVfTk9S TUFMLCBHVEtfU0hBRE9XX09VVCwKLSAgICAgICAgICAgICAgICAgIE5VTEwsIGNoZWNrYm94LCAi Y2hlY2tidXR0b24iLAotICAgICAgICAgICAgICAgICAgcmVjdC54KCksIHJlY3QueSgpLCByZWN0 LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGd0a19wYWludF9jaGVjayhjaGVja2JveC0+ c3R5bGUsIGkuY29udGV4dC0+Z2RrRHJhd2FibGUoKSwKKyAgICAgICAgICAgICAgICAgICAgZGV0 ZXJtaW5lU3RhdGUobyksIGlzQ2hlY2tlZChvKSA/IEdUS19TSEFET1dfSU4gOiBHVEtfU0hBRE9X X09VVCwKKyAgICAgICAgICAgICAgICAgICAgTlVMTCwgY2hlY2tib3gsICJjaGVja2J1dHRvbiIs CisgICAgICAgICAgICAgICAgICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCBy ZWN0LmhlaWdodCgpKTsKIAogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTIxOSwyMCArMjA3LDIw IEBAIGJvb2wgUmVuZGVyVGhlbWVHZGs6OnBhaW50UmFkaW8oUmVuZGVyT2IKIHsgCiAgICAgLy8g RklYTUU6IGlzIGl0IHRoZSByaWdodCB0aGluZyB0byBkbz8KICAgICBHdGtXaWRnZXQgKnJhZGlv ID0gZ3RrUmFkaW9CdXR0b24oKTsKLSAgICBndGtfcGFpbnRfYm94KHJhZGlvLT5zdHlsZSwgaS5j b250ZXh0LT5nZGtEcmF3YWJsZSgpLAotICAgICAgICAgICAgICAgICAgR1RLX1NUQVRFX05PUk1B TCwgR1RLX1NIQURPV19PVVQsCi0gICAgICAgICAgICAgICAgICBOVUxMLCByYWRpbywgInJhZGlv YnV0dG9uIiwKLSAgICAgICAgICAgICAgICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKTsKKyAgICBndGtfcGFpbnRfb3B0aW9uKHJhZGlvLT5zdHlsZSwg aS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAorICAgICAgICAgICAgICAgICAgICAgZGV0ZXJtaW5l U3RhdGUobyksIGlzQ2hlY2tlZChvKSA/IEdUS19TSEFET1dfSU4gOiBHVEtfU0hBRE9XX09VVCwK KyAgICAgICAgICAgICAgICAgICAgIE5VTEwsIHJhZGlvLCAicmFkaW9idXR0b24iLAorICAgICAg ICAgICAgICAgICAgICAgcmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVp Z2h0KCkpOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIFJlbmRlclRoZW1lR2RrOjpw YWludEJ1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYg aSwgY29uc3QgSW50UmVjdCYgcmVjdCkgCitib29sIFJlbmRlclRoZW1lR2RrOjpwYWludEJ1dHRv bihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBjb25z dCBJbnRSZWN0JiByZWN0KSAKIHsgCiAgICAgLy8gRklYTUU6IHNob3VsZCB1c2UgdGhlbWUtYXdh cmUgZHJhd2luZy4gVGhpcyBzaG91bGQgaG9ub3IgdGhlIHN0YXRlIGFzIHdlbGwKICAgICBHdGtX aWRnZXQgKmJ1dHRvbiA9IGd0a0J1dHRvbigpOwogICAgIGd0a19wYWludF9ib3goYnV0dG9uLT5z dHlsZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAotICAgICAgICAgICAgICAgICAgR1RLX1NU QVRFX05PUk1BTCwgR1RLX1NIQURPV19PVVQsCisgICAgICAgICAgICAgICAgICAgICBkZXRlcm1p bmVTdGF0ZShvKSwgaXNDaGVja2VkKG8pID8gR1RLX1NIQURPV19JTiA6IEdUS19TSEFET1dfT1VU LAogICAgICAgICAgICAgICAgICAgTlVMTCwgYnV0dG9uLCAiYnV0dG9uIiwKICAgICAgICAgICAg ICAgICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsK ICAgICByZXR1cm4gZmFsc2U7CkBAIC0yNjYsNyArMjU0LDcgQEAgdm9pZCBSZW5kZXJUaGVtZUdk azo6c3lzdGVtRm9udChpbnQgcHJvcAogR3RrV2lkZ2V0KiBSZW5kZXJUaGVtZUdkazo6Z3RrQnV0 dG9uKCkgY29uc3QKIHsKICAgICBpZiAoIW1fZ3RrQnV0dG9uKSB7Ci0gICAgICAgIG1fZ3RrQnV0 dG9uID0gZ3RrX2J1dHRvbl9uZXdfd2l0aF9sYWJlbCgiV2ViS2l0IHJvY2tzIik7CisgICAgICAg IG1fZ3RrQnV0dG9uID0gZ3RrX2J1dHRvbl9uZXcoKTsKICAgICAgICAgZ3RrX2NvbnRhaW5lcl9h ZGQoR1RLX0NPTlRBSU5FUihndGtXaW5kb3dDb250YWluZXIoKSksIG1fZ3RrQnV0dG9uKTsKICAg ICAgICAgZ3RrX3dpZGdldF9yZWFsaXplKG1fZ3RrQnV0dG9uKTsKICAgICB9CkBAIC0yNzcsNyAr MjY1LDcgQEAgR3RrV2lkZ2V0KiBSZW5kZXJUaGVtZUdkazo6Z3RrQnV0dG9uKCkgYwogR3RrV2lk Z2V0KiBSZW5kZXJUaGVtZUdkazo6Z3RrQ2hlY2tib3goKSBjb25zdAogewogICAgIGlmICghbV9n dGtDaGVja2JveCkgewotICAgICAgICBtX2d0a0NoZWNrYm94ID0gZ3RrX2NoZWNrX2J1dHRvbl9u ZXdfd2l0aF9sYWJlbCgiV2ViS2l0IHJvY2tzIik7IAorICAgICAgICBtX2d0a0NoZWNrYm94ID0g Z3RrX2NoZWNrX2J1dHRvbl9uZXcoKTsKICAgICAgICAgZ3RrX2NvbnRhaW5lcl9hZGQoR1RLX0NP TlRBSU5FUihndGtXaW5kb3dDb250YWluZXIoKSksIG1fZ3RrQ2hlY2tib3gpOwogICAgICAgICBn dGtfd2lkZ2V0X3JlYWxpemUobV9ndGtDaGVja2JveCk7CiAgICAgfQpAQCAtMjg4LDcgKzI3Niw3 IEBAIEd0a1dpZGdldCogUmVuZGVyVGhlbWVHZGs6Omd0a0NoZWNrYm94KCkKIEd0a1dpZGdldCog UmVuZGVyVGhlbWVHZGs6Omd0a1JhZGlvQnV0dG9uKCkgY29uc3QKIHsKICAgICBpZiAoIW1fZ3Rr UmFkaW9CdXR0b24pIHsKLSAgICAgICAgbV9ndGtSYWRpb0J1dHRvbiA9IGd0a19yYWRpb19idXR0 b25fbmV3X3dpdGhfbGFiZWwoTlVMTCwgIldlYktpdCByb2NrcyIpOworICAgICAgICBtX2d0a1Jh ZGlvQnV0dG9uID0gZ3RrX3JhZGlvX2J1dHRvbl9uZXcoTlVMTCk7CiAgICAgICAgIGd0a19jb250 YWluZXJfYWRkKEdUS19DT05UQUlORVIoZ3RrV2luZG93Q29udGFpbmVyKCkpLCBtX2d0a1JhZGlv QnV0dG9uKTsKICAgICAgICAgZ3RrX3dpZGdldF9yZWFsaXplKG1fZ3RrUmFkaW9CdXR0b24pOwog ICAgIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuaAkocmV2aXNpb24g MjQ1OTQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oCSh3b3JraW5n IGNvcHkpCkBAIC02OSw3ICs2OSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhZGRJbnRyaW5zaWNN YXJnaW5zKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAgdm9pZCBjbG9zZSgpOwogCi0gICAgdW5z aWduZWQgZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2JqZWN0Kik7CisgICAgR3RrU3RhdGVUeXBlIGRl dGVybWluZVN0YXRlKFJlbmRlck9iamVjdCopOwogICAgIGJvb2wgc3VwcG9ydHNGb2N1cyhFQXBw ZWFyYW5jZSk7CiAKICAgICBUaGVtZURhdGEgZ2V0VGhlbWVEYXRhKFJlbmRlck9iamVjdCopOwo= 15667 2007-07-24 11:27:23 -0700 2007-07-24 11:32:22 -0700 Make use of widget state in RenderThemeGdk theme-state-2.patch text/plain 6551 alp SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDU5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDctMDctMjQgIEFscCBUb2tlciAgPGFscC50b2tlckBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTEKKyAgICAgICAg UmVuZGVyVGhlbWVHZGsncyBidXR0b25zIGFyZSBzdGF0ZS1hZ25vc3RpYyAocHJlc3NlZCwgaG92 ZXJlZCkKKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgbGFiZWwgZnJvbSB3aWRnZXQgaW5z dGFuY2VzLgorICAgICAgICBSZW5kZXIgY2hlY2sgYW5kIHJhZGlvIHdpZGdldHMgY29ycmVjdGx5 LgorICAgICAgICBEZXRlcm1pbmUgdGhlIHdpZGdldCBzdGF0ZSBhbmQgcmVuZGVyIGl0IGFwcHJv cHJpYXRlbHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OmRldGVybWluZVN0YXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpwYWludENoZWNrYm94KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lR2RrOjpwYWludFJhZGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lR2RrOjpwYWludEJ1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZUdkazo6Z3RrQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpndGtD aGVja2JveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUdkazo6Z3RrUmFkaW9CdXR0 b24pOgorICAgICAgICAqIHBsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oOgorCiAyMDA3LTA3 LTI0ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwCShyZXZp c2lvbiAyNDU5NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNCw2ICs0LDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBs ZSBDb21wdXRlciwgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA2IE1pY2hhZWwgRW1tZWwgbWlr ZS5lbW1lbEBnbWFpbC5jb20gCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcgSG9sZ2VyIEhhbnMgUGV0 ZXIgRnJleXRoZXIKKyAqIENvcHlyaWdodCAoQykgMjAwNyBBbHAgVG9rZXIgPGFscC50b2tlckBj b2xsYWJvcmEuY28udWs+CiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGli cmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAg LTM0LDEzICszNSw2IEBACiAjZGVmaW5lIFRIRU1FX0NPTE9SIDIwNAogI2RlZmluZSBUSEVNRV9G T05UICAyMTAKIAotLy8gR2VuZXJpYyBzdGF0ZSBjb25zdGFudHMKLSNkZWZpbmUgVFNfTk9STUFM ICAgIDEKLSNkZWZpbmUgVFNfSE9WRVIgICAgIDIKLSNkZWZpbmUgVFNfQUNUSVZFICAgIDMKLSNk ZWZpbmUgVFNfRElTQUJMRUQgIDQKLSNkZWZpbmUgVFNfRk9DVVNFRCAgIDUKLQogLy8gQnV0dG9u IGNvbnN0YW50cwogI2RlZmluZSBCUF9CVVRUT04gICAgMQogI2RlZmluZSBCUF9SQURJTyAgICAg MgpAQCAtMTMxLDIxICsxMjUsMTUgQEAgYm9vbCBSZW5kZXJUaGVtZUdkazo6c3VwcG9ydHNGb2N1 cyhFQXBwZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdW5zaWduZWQgUmVuZGVyVGhlbWVHZGs6 OmRldGVybWluZVN0YXRlKFJlbmRlck9iamVjdCogbykKK0d0a1N0YXRlVHlwZSBSZW5kZXJUaGVt ZUdkazo6ZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2JqZWN0KiBvKQogewotICAgIHVuc2lnbmVkIHJl c3VsdCA9IFRTX05PUk1BTDsKKyAgICBHdGtTdGF0ZVR5cGUgcmVzdWx0ID0gR1RLX1NUQVRFX05P Uk1BTDsKICAgICBpZiAoIWlzRW5hYmxlZChvKSkKLSAgICAgICAgcmVzdWx0ID0gVFNfRElTQUJM RUQ7Ci0gICAgZWxzZSBpZiAoaXNSZWFkT25seUNvbnRyb2wobykpCi0gICAgICAgIHJlc3VsdCA9 IFRGU19SRUFET05MWTsgLy8gUmVhZG9ubHkgaXMgc3VwcG9ydGVkIG9uIHRleHRmaWVsZHMuCi0g ICAgZWxzZSBpZiAoc3VwcG9ydHNGb2N1cyhvLT5zdHlsZSgpLT5hcHBlYXJhbmNlKCkpICYmIGlz Rm9jdXNlZChvKSkKLSAgICAgICAgcmVzdWx0ID0gVFNfRk9DVVNFRDsKKyAgICAgICAgcmVzdWx0 ID0gR1RLX1NUQVRFX0lOU0VOU0lUSVZFOwogICAgIGVsc2UgaWYgKGlzUHJlc3NlZChvKSkKLSAg ICAgICAgcmVzdWx0ID0gVFNfQUNUSVZFOworICAgICAgICByZXN1bHQgPSBHVEtfU1RBVEVfQUNU SVZFOwogICAgIGVsc2UgaWYgKGlzSG92ZXJlZChvKSkKLSAgICAgICAgcmVzdWx0ID0gVFNfSE9W RVI7Ci0gICAgaWYgKGlzQ2hlY2tlZChvKSkKLSAgICAgICAgcmVzdWx0ICs9IDQ7IC8vIDQgdW5j aGVja2VkIHN0YXRlcywgNCBjaGVja2VkIHN0YXRlcy4KKyAgICAgICAgcmVzdWx0ID0gR1RLX1NU QVRFX1BSRUxJR0hUOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTE4NywxMCArMTc1LDEw IEBAIGJvb2wgUmVuZGVyVGhlbWVHZGs6OnBhaW50Q2hlY2tib3goUmVuZGUKIHsKICAgICAvLyBG SVhNRTogaXMgaXQgdGhlIHJpZ2h0IHRoaW5nIHRvIGRvPwogICAgIEd0a1dpZGdldCAqY2hlY2ti b3ggPSBndGtDaGVja2JveCgpOwotICAgIGd0a19wYWludF9ib3goY2hlY2tib3gtPnN0eWxlLCBp LmNvbnRleHQtPmdka0RyYXdhYmxlKCksCi0gICAgICAgICAgICAgICAgICBHVEtfU1RBVEVfTk9S TUFMLCBHVEtfU0hBRE9XX09VVCwKLSAgICAgICAgICAgICAgICAgIE5VTEwsIGNoZWNrYm94LCAi Y2hlY2tidXR0b24iLAotICAgICAgICAgICAgICAgICAgcmVjdC54KCksIHJlY3QueSgpLCByZWN0 LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGd0a19wYWludF9jaGVjayhjaGVja2JveC0+ c3R5bGUsIGkuY29udGV4dC0+Z2RrRHJhd2FibGUoKSwKKyAgICAgICAgICAgICAgICAgICAgZGV0 ZXJtaW5lU3RhdGUobyksIGlzQ2hlY2tlZChvKSA/IEdUS19TSEFET1dfSU4gOiBHVEtfU0hBRE9X X09VVCwKKyAgICAgICAgICAgICAgICAgICAgTlVMTCwgY2hlY2tib3gsICJjaGVja2J1dHRvbiIs CisgICAgICAgICAgICAgICAgICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCBy ZWN0LmhlaWdodCgpKTsKIAogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTIxOSwyMCArMjA3LDIw IEBAIGJvb2wgUmVuZGVyVGhlbWVHZGs6OnBhaW50UmFkaW8oUmVuZGVyT2IKIHsgCiAgICAgLy8g RklYTUU6IGlzIGl0IHRoZSByaWdodCB0aGluZyB0byBkbz8KICAgICBHdGtXaWRnZXQgKnJhZGlv ID0gZ3RrUmFkaW9CdXR0b24oKTsKLSAgICBndGtfcGFpbnRfYm94KHJhZGlvLT5zdHlsZSwgaS5j b250ZXh0LT5nZGtEcmF3YWJsZSgpLAotICAgICAgICAgICAgICAgICAgR1RLX1NUQVRFX05PUk1B TCwgR1RLX1NIQURPV19PVVQsCi0gICAgICAgICAgICAgICAgICBOVUxMLCByYWRpbywgInJhZGlv YnV0dG9uIiwKLSAgICAgICAgICAgICAgICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKTsKKyAgICBndGtfcGFpbnRfb3B0aW9uKHJhZGlvLT5zdHlsZSwg aS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAorICAgICAgICAgICAgICAgICAgICAgZGV0ZXJtaW5l U3RhdGUobyksIGlzQ2hlY2tlZChvKSA/IEdUS19TSEFET1dfSU4gOiBHVEtfU0hBRE9XX09VVCwK KyAgICAgICAgICAgICAgICAgICAgIE5VTEwsIHJhZGlvLCAicmFkaW9idXR0b24iLAorICAgICAg ICAgICAgICAgICAgICAgcmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVp Z2h0KCkpOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIFJlbmRlclRoZW1lR2RrOjpw YWludEJ1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYg aSwgY29uc3QgSW50UmVjdCYgcmVjdCkgCitib29sIFJlbmRlclRoZW1lR2RrOjpwYWludEJ1dHRv bihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBjb25z dCBJbnRSZWN0JiByZWN0KSAKIHsgCiAgICAgLy8gRklYTUU6IHNob3VsZCB1c2UgdGhlbWUtYXdh cmUgZHJhd2luZy4gVGhpcyBzaG91bGQgaG9ub3IgdGhlIHN0YXRlIGFzIHdlbGwKICAgICBHdGtX aWRnZXQgKmJ1dHRvbiA9IGd0a0J1dHRvbigpOwogICAgIGd0a19wYWludF9ib3goYnV0dG9uLT5z dHlsZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAotICAgICAgICAgICAgICAgICAgR1RLX1NU QVRFX05PUk1BTCwgR1RLX1NIQURPV19PVVQsCisgICAgICAgICAgICAgICAgICBkZXRlcm1pbmVT dGF0ZShvKSwgaXNDaGVja2VkKG8pID8gR1RLX1NIQURPV19JTiA6IEdUS19TSEFET1dfT1VULAog ICAgICAgICAgICAgICAgICAgTlVMTCwgYnV0dG9uLCAiYnV0dG9uIiwKICAgICAgICAgICAgICAg ICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKICAg ICByZXR1cm4gZmFsc2U7CkBAIC0yNjYsNyArMjU0LDcgQEAgdm9pZCBSZW5kZXJUaGVtZUdkazo6 c3lzdGVtRm9udChpbnQgcHJvcAogR3RrV2lkZ2V0KiBSZW5kZXJUaGVtZUdkazo6Z3RrQnV0dG9u KCkgY29uc3QKIHsKICAgICBpZiAoIW1fZ3RrQnV0dG9uKSB7Ci0gICAgICAgIG1fZ3RrQnV0dG9u ID0gZ3RrX2J1dHRvbl9uZXdfd2l0aF9sYWJlbCgiV2ViS2l0IHJvY2tzIik7CisgICAgICAgIG1f Z3RrQnV0dG9uID0gZ3RrX2J1dHRvbl9uZXcoKTsKICAgICAgICAgZ3RrX2NvbnRhaW5lcl9hZGQo R1RLX0NPTlRBSU5FUihndGtXaW5kb3dDb250YWluZXIoKSksIG1fZ3RrQnV0dG9uKTsKICAgICAg ICAgZ3RrX3dpZGdldF9yZWFsaXplKG1fZ3RrQnV0dG9uKTsKICAgICB9CkBAIC0yNzcsNyArMjY1 LDcgQEAgR3RrV2lkZ2V0KiBSZW5kZXJUaGVtZUdkazo6Z3RrQnV0dG9uKCkgYwogR3RrV2lkZ2V0 KiBSZW5kZXJUaGVtZUdkazo6Z3RrQ2hlY2tib3goKSBjb25zdAogewogICAgIGlmICghbV9ndGtD aGVja2JveCkgewotICAgICAgICBtX2d0a0NoZWNrYm94ID0gZ3RrX2NoZWNrX2J1dHRvbl9uZXdf d2l0aF9sYWJlbCgiV2ViS2l0IHJvY2tzIik7IAorICAgICAgICBtX2d0a0NoZWNrYm94ID0gZ3Rr X2NoZWNrX2J1dHRvbl9uZXcoKTsKICAgICAgICAgZ3RrX2NvbnRhaW5lcl9hZGQoR1RLX0NPTlRB SU5FUihndGtXaW5kb3dDb250YWluZXIoKSksIG1fZ3RrQ2hlY2tib3gpOwogICAgICAgICBndGtf d2lkZ2V0X3JlYWxpemUobV9ndGtDaGVja2JveCk7CiAgICAgfQpAQCAtMjg4LDcgKzI3Niw3IEBA IEd0a1dpZGdldCogUmVuZGVyVGhlbWVHZGs6Omd0a0NoZWNrYm94KCkKIEd0a1dpZGdldCogUmVu ZGVyVGhlbWVHZGs6Omd0a1JhZGlvQnV0dG9uKCkgY29uc3QKIHsKICAgICBpZiAoIW1fZ3RrUmFk aW9CdXR0b24pIHsKLSAgICAgICAgbV9ndGtSYWRpb0J1dHRvbiA9IGd0a19yYWRpb19idXR0b25f bmV3X3dpdGhfbGFiZWwoTlVMTCwgIldlYktpdCByb2NrcyIpOworICAgICAgICBtX2d0a1JhZGlv QnV0dG9uID0gZ3RrX3JhZGlvX2J1dHRvbl9uZXcoTlVMTCk7CiAgICAgICAgIGd0a19jb250YWlu ZXJfYWRkKEdUS19DT05UQUlORVIoZ3RrV2luZG93Q29udGFpbmVyKCkpLCBtX2d0a1JhZGlvQnV0 dG9uKTsKICAgICAgICAgZ3RrX3dpZGdldF9yZWFsaXplKG1fZ3RrUmFkaW9CdXR0b24pOwogICAg IH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuaAkocmV2aXNpb24gMjQ1 OTQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oCSh3b3JraW5nIGNv cHkpCkBAIC02OSw3ICs2OSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhZGRJbnRyaW5zaWNNYXJn aW5zKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAgdm9pZCBjbG9zZSgpOwogCi0gICAgdW5zaWdu ZWQgZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2JqZWN0Kik7CisgICAgR3RrU3RhdGVUeXBlIGRldGVy bWluZVN0YXRlKFJlbmRlck9iamVjdCopOwogICAgIGJvb2wgc3VwcG9ydHNGb2N1cyhFQXBwZWFy YW5jZSk7CiAKICAgICBUaGVtZURhdGEgZ2V0VGhlbWVEYXRhKFJlbmRlck9iamVjdCopOwo= 15721 2007-07-28 18:25:01 -0700 2007-07-28 18:27:35 -0700 Follow-up for shadow state and theming bug workaround theme-state-update.patch text/plain 4222 alp SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDc1NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDctMDctMjkgIEFscCBUb2tlciAgPGFscC50b2tlckBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTEgKHJldmlzaXRl ZCkKKyAgICAgICAgUmVuZGVyVGhlbWVHZGsncyBidXR0b25zIGFyZSBzdGF0ZS1hZ25vc3RpYyAo cHJlc3NlZCwgaG92ZXJlZCkKKworICAgICAgICBHZW5lcmFsaXplIHNoYWRvdyBzdGF0ZSBpbnRv IGEgZnVuY3Rpb24uCisgICAgICAgIHVzZSBhIEd0a0hCb3ggdG8gd29yayBhcm91bmQgYSB0aGVt ZSBidWcgKHRoYW5rcyB0byBOaWdlbCBUYW8pLgorCisgICAgICAgICogcGxhdGZvcm0vZ2RrL1Jl bmRlclRoZW1lR2RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpkZXRl cm1pbmVTaGFkb3cpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OnBhaW50Q2hl Y2tib3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OnBhaW50UmFkaW8pOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OnBhaW50QnV0dG9uKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpndGtXaW5kb3dDb250YWluZXIpOgorICAgICAgICAq IHBsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oOgorCiAyMDA3LTA3LTI3ICBBZGVsZSBQZXRl cnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4gCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwCShyZXZpc2lvbiAyNDc1 NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTM3LDYgKzEzNywxMSBAQCBHdGtTdGF0ZVR5cGUgUmVuZGVyVGhlbWVHZGs6OmRl dGVybWluZVN0CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAorR3RrU2hhZG93VHlwZSBSZW5kZXJU aGVtZUdkazo6ZGV0ZXJtaW5lU2hhZG93KFJlbmRlck9iamVjdCogbykKK3sKKyAgICByZXR1cm4g aXNDaGVja2VkKG8pID8gR1RLX1NIQURPV19JTiA6IEdUS19TSEFET1dfT1VUOworfQorCiBUaGVt ZURhdGEgUmVuZGVyVGhlbWVHZGs6OmdldFRoZW1lRGF0YShSZW5kZXJPYmplY3QqIG8pCiB7CiAg ICAgVGhlbWVEYXRhIHJlc3VsdDsKQEAgLTE3Niw3ICsxODEsNyBAQCBib29sIFJlbmRlclRoZW1l R2RrOjpwYWludENoZWNrYm94KFJlbmRlCiAgICAgLy8gRklYTUU6IGlzIGl0IHRoZSByaWdodCB0 aGluZyB0byBkbz8KICAgICBHdGtXaWRnZXQgKmNoZWNrYm94ID0gZ3RrQ2hlY2tib3goKTsKICAg ICBndGtfcGFpbnRfY2hlY2soY2hlY2tib3gtPnN0eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxl KCksCi0gICAgICAgICAgICAgICAgICAgIGRldGVybWluZVN0YXRlKG8pLCBpc0NoZWNrZWQobykg PyBHVEtfU0hBRE9XX0lOIDogR1RLX1NIQURPV19PVVQsCisgICAgICAgICAgICAgICAgICAgIGRl dGVybWluZVN0YXRlKG8pLCBkZXRlcm1pbmVTaGFkb3cobyksCiAgICAgICAgICAgICAgICAgICAg IE5VTEwsIGNoZWNrYm94LCAiY2hlY2tidXR0b24iLAogICAgICAgICAgICAgICAgICAgICByZWN0 LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CiAKQEAgLTIwOCw3 ICsyMTMsNyBAQCBib29sIFJlbmRlclRoZW1lR2RrOjpwYWludFJhZGlvKFJlbmRlck9iCiAgICAg Ly8gRklYTUU6IGlzIGl0IHRoZSByaWdodCB0aGluZyB0byBkbz8KICAgICBHdGtXaWRnZXQgKnJh ZGlvID0gZ3RrUmFkaW9CdXR0b24oKTsKICAgICBndGtfcGFpbnRfb3B0aW9uKHJhZGlvLT5zdHls ZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAotICAgICAgICAgICAgICAgICAgICAgZGV0ZXJt aW5lU3RhdGUobyksIGlzQ2hlY2tlZChvKSA/IEdUS19TSEFET1dfSU4gOiBHVEtfU0hBRE9XX09V VCwKKyAgICAgICAgICAgICAgICAgICAgIGRldGVybWluZVN0YXRlKG8pLCBkZXRlcm1pbmVTaGFk b3cobyksCiAgICAgICAgICAgICAgICAgICAgICBOVUxMLCByYWRpbywgInJhZGlvYnV0dG9uIiwK ICAgICAgICAgICAgICAgICAgICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCBy ZWN0LmhlaWdodCgpKTsKIApAQCAtMjIwLDcgKzIyNSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVHZGs6 OnBhaW50QnV0dG9uKFJlbmRlck8KICAgICAvLyBGSVhNRTogc2hvdWxkIHVzZSB0aGVtZS1hd2Fy ZSBkcmF3aW5nLiBUaGlzIHNob3VsZCBob25vciB0aGUgc3RhdGUgYXMgd2VsbAogICAgIEd0a1dp ZGdldCAqYnV0dG9uID0gZ3RrQnV0dG9uKCk7CiAgICAgZ3RrX3BhaW50X2JveChidXR0b24tPnN0 eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxlKCksCi0gICAgICAgICAgICAgICAgICBkZXRlcm1p bmVTdGF0ZShvKSwgaXNDaGVja2VkKG8pID8gR1RLX1NIQURPV19JTiA6IEdUS19TSEFET1dfT1VU LAorICAgICAgICAgICAgICAgICAgZGV0ZXJtaW5lU3RhdGUobyksIGRldGVybWluZVNoYWRvdyhv KSwKICAgICAgICAgICAgICAgICAgIE5VTEwsIGJ1dHRvbiwgImJ1dHRvbiIsCiAgICAgICAgICAg ICAgICAgICByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7 CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjg5LDYgKzI5NCwxMyBAQCBHdGtXaWRnZXQqIFJlbmRl clRoZW1lR2RrOjpndGtXaW5kb3dDb250CiAgICAgaWYgKCFtX2NvbnRhaW5lcikgewogICAgICAg ICBtX3VubWFwcGVkV2luZG93ID0gZ3RrX3dpbmRvd19uZXcoR1RLX1dJTkRPV19QT1BVUCk7CiAg ICAgICAgIG1fY29udGFpbmVyID0gZ3RrX2ZpeGVkX25ldygpOworICAgICAgICAvLyBTb21lIEdU SyB0aGVtZXMgKGkuZS4gQ2xlYXJsb29rcykgZHJhdyB0aGUgYnV0dG9ucyBkaWZmZXJlbnRseQor ICAgICAgICAvLyAoaW4gcGFydGljdWxhciwgY2FsbCBndGtfc3R5bGVfYXBwbHlfZGVmYXVsdF9i YWNrZ3JvdW5kKSBpZiB0aGV5CisgICAgICAgIC8vIGFyZSB1bmFsbG9jYXRlZCBhbmQgYXJlIGNo aWxkcmVuIG9mIGEgR3RrRml4ZWQgd2lkZ2V0LCB3aGljaCBpcworICAgICAgICAvLyBhcHBhcmVu dGx5IHdoYXQgc29tZSAibWFrZSBGaXJlZm94IGJ1dHRvbnMgbG9vayBsaWtlIEdUSyIgY29kZQor ICAgICAgICAvLyBkb2VzLiAgVG8gYXZvaWQgdGhpcyB1Z2x5IGxvb2ssIHdlIHVzZSBhIEd0a0hC b3ggYXMgYSBwYXJlbnQsCisgICAgICAgIC8vIHJhdGhlciB0aGFuIGEgR3RrRml4ZWQuCisgICAg ICAgIG1fY29udGFpbmVyID0gZ3RrX2hib3hfbmV3KGZhbHNlLCAwKTsKICAgICAgICAgZ3RrX2Nv bnRhaW5lcl9hZGQoR1RLX0NPTlRBSU5FUihtX3VubWFwcGVkV2luZG93KSwgbV9jb250YWluZXIp OwogICAgICAgICBndGtfd2lkZ2V0X3JlYWxpemUobV91bm1hcHBlZFdpbmRvdyk7CiAgICAgfQpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oCShyZXZpc2lvbiAyNDc1NSkK KysrIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmgJKHdvcmtpbmcgY29weSkK QEAgLTcwLDYgKzcwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNsb3NlKCk7CiAKICAgICBHdGtT dGF0ZVR5cGUgZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2JqZWN0Kik7CisgICAgR3RrU2hhZG93VHlw ZSBkZXRlcm1pbmVTaGFkb3coUmVuZGVyT2JqZWN0Kik7CiAgICAgYm9vbCBzdXBwb3J0c0ZvY3Vz KEVBcHBlYXJhbmNlKTsKIAogICAgIFRoZW1lRGF0YSBnZXRUaGVtZURhdGEoUmVuZGVyT2JqZWN0 Kik7Cg== 15722 2007-07-28 18:27:35 -0700 2007-07-28 18:32:03 -0700 Follow-up for shadow state and theming bug workaround (take two) theme-state-update-2.patch text/plain 4225 alp SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDc1NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDctMDctMjkgIEFscCBUb2tlciAgPGFscC50b2tlckBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTEgKHJldmlzaXRl ZCkKKyAgICAgICAgUmVuZGVyVGhlbWVHZGsncyBidXR0b25zIGFyZSBzdGF0ZS1hZ25vc3RpYyAo cHJlc3NlZCwgaG92ZXJlZCkKKworICAgICAgICBHZW5lcmFsaXplIHNoYWRvdyBzdGF0ZSBpbnRv IGEgZnVuY3Rpb24uCisgICAgICAgIHVzZSBhIEd0a0hCb3ggdG8gd29yayBhcm91bmQgYSB0aGVt ZSBidWcgKHRoYW5rcyB0byBOaWdlbCBUYW8pLgorCisgICAgICAgICogcGxhdGZvcm0vZ2RrL1Jl bmRlclRoZW1lR2RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpkZXRl cm1pbmVTaGFkb3cpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OnBhaW50Q2hl Y2tib3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OnBhaW50UmFkaW8pOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHZGs6OnBhaW50QnV0dG9uKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpndGtXaW5kb3dDb250YWluZXIpOgorICAgICAgICAq IHBsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oOgorCiAyMDA3LTA3LTI3ICBBZGVsZSBQZXRl cnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4gCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwCShyZXZpc2lvbiAyNDc1 NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTM3LDYgKzEzNywxMSBAQCBHdGtTdGF0ZVR5cGUgUmVuZGVyVGhlbWVHZGs6OmRl dGVybWluZVN0CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAorR3RrU2hhZG93VHlwZSBSZW5kZXJU aGVtZUdkazo6ZGV0ZXJtaW5lU2hhZG93KFJlbmRlck9iamVjdCogbykKK3sKKyAgICByZXR1cm4g aXNDaGVja2VkKG8pID8gR1RLX1NIQURPV19JTiA6IEdUS19TSEFET1dfT1VUOworfQorCiBUaGVt ZURhdGEgUmVuZGVyVGhlbWVHZGs6OmdldFRoZW1lRGF0YShSZW5kZXJPYmplY3QqIG8pCiB7CiAg ICAgVGhlbWVEYXRhIHJlc3VsdDsKQEAgLTE3Niw3ICsxODEsNyBAQCBib29sIFJlbmRlclRoZW1l R2RrOjpwYWludENoZWNrYm94KFJlbmRlCiAgICAgLy8gRklYTUU6IGlzIGl0IHRoZSByaWdodCB0 aGluZyB0byBkbz8KICAgICBHdGtXaWRnZXQgKmNoZWNrYm94ID0gZ3RrQ2hlY2tib3goKTsKICAg ICBndGtfcGFpbnRfY2hlY2soY2hlY2tib3gtPnN0eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxl KCksCi0gICAgICAgICAgICAgICAgICAgIGRldGVybWluZVN0YXRlKG8pLCBpc0NoZWNrZWQobykg PyBHVEtfU0hBRE9XX0lOIDogR1RLX1NIQURPV19PVVQsCisgICAgICAgICAgICAgICAgICAgIGRl dGVybWluZVN0YXRlKG8pLCBkZXRlcm1pbmVTaGFkb3cobyksCiAgICAgICAgICAgICAgICAgICAg IE5VTEwsIGNoZWNrYm94LCAiY2hlY2tidXR0b24iLAogICAgICAgICAgICAgICAgICAgICByZWN0 LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CiAKQEAgLTIwOCw3 ICsyMTMsNyBAQCBib29sIFJlbmRlclRoZW1lR2RrOjpwYWludFJhZGlvKFJlbmRlck9iCiAgICAg Ly8gRklYTUU6IGlzIGl0IHRoZSByaWdodCB0aGluZyB0byBkbz8KICAgICBHdGtXaWRnZXQgKnJh ZGlvID0gZ3RrUmFkaW9CdXR0b24oKTsKICAgICBndGtfcGFpbnRfb3B0aW9uKHJhZGlvLT5zdHls ZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAotICAgICAgICAgICAgICAgICAgICAgZGV0ZXJt aW5lU3RhdGUobyksIGlzQ2hlY2tlZChvKSA/IEdUS19TSEFET1dfSU4gOiBHVEtfU0hBRE9XX09V VCwKKyAgICAgICAgICAgICAgICAgICAgIGRldGVybWluZVN0YXRlKG8pLCBkZXRlcm1pbmVTaGFk b3cobyksCiAgICAgICAgICAgICAgICAgICAgICBOVUxMLCByYWRpbywgInJhZGlvYnV0dG9uIiwK ICAgICAgICAgICAgICAgICAgICAgIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCBy ZWN0LmhlaWdodCgpKTsKIApAQCAtMjIwLDcgKzIyNSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVHZGs6 OnBhaW50QnV0dG9uKFJlbmRlck8KICAgICAvLyBGSVhNRTogc2hvdWxkIHVzZSB0aGVtZS1hd2Fy ZSBkcmF3aW5nLiBUaGlzIHNob3VsZCBob25vciB0aGUgc3RhdGUgYXMgd2VsbAogICAgIEd0a1dp ZGdldCAqYnV0dG9uID0gZ3RrQnV0dG9uKCk7CiAgICAgZ3RrX3BhaW50X2JveChidXR0b24tPnN0 eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxlKCksCi0gICAgICAgICAgICAgICAgICBkZXRlcm1p bmVTdGF0ZShvKSwgaXNDaGVja2VkKG8pID8gR1RLX1NIQURPV19JTiA6IEdUS19TSEFET1dfT1VU LAorICAgICAgICAgICAgICAgICAgZGV0ZXJtaW5lU3RhdGUobyksIGRldGVybWluZVNoYWRvdyhv KSwKICAgICAgICAgICAgICAgICAgIE5VTEwsIGJ1dHRvbiwgImJ1dHRvbiIsCiAgICAgICAgICAg ICAgICAgICByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7 CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjg4LDcgKzI5MywxMyBAQCBHdGtXaWRnZXQqIFJlbmRl clRoZW1lR2RrOjpndGtXaW5kb3dDb250CiB7CiAgICAgaWYgKCFtX2NvbnRhaW5lcikgewogICAg ICAgICBtX3VubWFwcGVkV2luZG93ID0gZ3RrX3dpbmRvd19uZXcoR1RLX1dJTkRPV19QT1BVUCk7 Ci0gICAgICAgIG1fY29udGFpbmVyID0gZ3RrX2ZpeGVkX25ldygpOworICAgICAgICAvLyBTb21l IEdUSyB0aGVtZXMgKGkuZS4gQ2xlYXJsb29rcykgZHJhdyB0aGUgYnV0dG9ucyBkaWZmZXJlbnRs eQorICAgICAgICAvLyAoaW4gcGFydGljdWxhciwgY2FsbCBndGtfc3R5bGVfYXBwbHlfZGVmYXVs dF9iYWNrZ3JvdW5kKSBpZiB0aGV5CisgICAgICAgIC8vIGFyZSB1bmFsbG9jYXRlZCBhbmQgYXJl IGNoaWxkcmVuIG9mIGEgR3RrRml4ZWQgd2lkZ2V0LCB3aGljaCBpcworICAgICAgICAvLyBhcHBh cmVudGx5IHdoYXQgc29tZSAibWFrZSBGaXJlZm94IGJ1dHRvbnMgbG9vayBsaWtlIEdUSyIgY29k ZQorICAgICAgICAvLyBkb2VzLiAgVG8gYXZvaWQgdGhpcyB1Z2x5IGxvb2ssIHdlIHVzZSBhIEd0 a0hCb3ggYXMgYSBwYXJlbnQsCisgICAgICAgIC8vIHJhdGhlciB0aGFuIGEgR3RrRml4ZWQuCisg ICAgICAgIG1fY29udGFpbmVyID0gZ3RrX2hib3hfbmV3KGZhbHNlLCAwKTsKICAgICAgICAgZ3Rr X2NvbnRhaW5lcl9hZGQoR1RLX0NPTlRBSU5FUihtX3VubWFwcGVkV2luZG93KSwgbV9jb250YWlu ZXIpOwogICAgICAgICBndGtfd2lkZ2V0X3JlYWxpemUobV91bm1hcHBlZFdpbmRvdyk7CiAgICAg fQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5oCShyZXZpc2lvbiAyNDc1 NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmgJKHdvcmtpbmcgY29w eSkKQEAgLTcwLDYgKzcwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNsb3NlKCk7CiAKICAgICBH dGtTdGF0ZVR5cGUgZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2JqZWN0Kik7CisgICAgR3RrU2hhZG93 VHlwZSBkZXRlcm1pbmVTaGFkb3coUmVuZGVyT2JqZWN0Kik7CiAgICAgYm9vbCBzdXBwb3J0c0Zv Y3VzKEVBcHBlYXJhbmNlKTsKIAogICAgIFRoZW1lRGF0YSBnZXRUaGVtZURhdGEoUmVuZGVyT2Jq ZWN0Kik7Cg==