49396 2010-11-11 11:55:15 -0800 Make WebWidget actively notify client when compositing enables 2010-11-15 21:13:07 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 nduca webkit-unassigned commit-queue fishd oldest_to_newest 308039 0 nduca 2010-11-11 11:55:15 -0800 Right now, RenderWidget pasively determines when compositing enables based on checking isAcceleratedCompositingActive. This patch adds active notification for when compositing enables and disables. 308044 1 73633 nduca 2010-11-11 12:05:55 -0800 Created attachment 73633 Proposed patch 308830 2 73633 fishd 2010-11-12 16:26:33 -0800 Comment on attachment 73633 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=73633&action=review > WebKit/chromium/src/WebViewImpl.cpp:2383 > + m_layerRenderer->finish(); // finish all GL rendering before we hide the window? TODO(nduca) fixthisshit TODO(nduca) -> FIXME and leave a more descriptive comment for someone else who may be reading this code. > WebKit/chromium/src/WebViewImpl.cpp:2390 > + m_layerRenderer->resizeOnscreenContent(WebCore::IntSize(std::max(1, m_size.width), no need for the WebCore prefix. > WebKit/chromium/public/WebWidgetClient.h:54 > + virtual void didChangeAcceleratedCompositingActive(bool active) { } nit: how about didActivateAcceleratedCompositing(bool)? 309384 3 73919 nduca 2010-11-15 12:03:25 -0800 Created attachment 73919 Round 2 309439 4 73919 fishd 2010-11-15 13:57:17 -0800 Comment on attachment 73919 Round 2 View in context: https://bugs.webkit.org/attachment.cgi?id=73919&action=review > WebKit/chromium/src/WebViewImpl.cpp:-1022 > - m_layerRenderer->present(); nice to see this cleanup! > WebKit/chromium/public/WebWidgetClient.h:54 > + virtual void didAcceleratedCompositingEnable(bool active) { } why this over didActivateAcceleratedCompositing? when vangelis added the isAcceleratedCompositingActive, i suggested using "enabled" instead of "active" as the suffix, but he argued against "enable" since that sounds like the compile-time option (is the code enabled at all). so, we went with "active", and he used that throughout the codebase (both webkit and chrome). can we stick with "active"/"activate"? 309441 5 nduca 2010-11-15 14:06:33 -0800 > why this over didActivateAcceleratedCompositing? My bad. I made this change last Friday before I got your emailed ocmmets; the name I jotted down on the post-it was different. Will upload a new patch shortly. 309443 6 73929 nduca 2010-11-15 14:12:55 -0800 Created attachment 73929 Better name 309567 7 73929 commit-queue 2010-11-15 21:13:01 -0800 Comment on attachment 73929 Better name Clearing flags on attachment: 73929 Committed r72058: <http://trac.webkit.org/changeset/72058> 309568 8 commit-queue 2010-11-15 21:13:07 -0800 All reviewed patches have been landed. Closing bug. 73633 2010-11-11 12:05:55 -0800 2010-11-15 12:03:25 -0800 Proposed patch didEnable.patch text/plain 2919 nduca SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiA3MTgzOSkKKysr IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y MzgwLDE2ICsyMzgwLDIzIEBACiAKICAgICBpZiAoIWFjdGl2ZSkgewogICAgICAgICBtX2lzQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSA9IGZhbHNlOworICAgICAgICBtX2xheWVyUmVuZGVy ZXItPmZpbmlzaCgpOyAvLyBmaW5pc2ggYWxsIEdMIHJlbmRlcmluZyBiZWZvcmUgd2UgaGlkZSB0 aGUgd2luZG93PyBUT0RPKG5kdWNhKSBmaXh0aGlzc2hpdAorICAgICAgICBtX2NsaWVudC0+ZGlk Q2hhbmdlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShmYWxzZSk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKICAgICBpZiAobV9sYXllclJlbmRlcmVyKSB7CiAgICAgICAgIG1faXNBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlID0gdHJ1ZTsKKyAgICAgICAgbV9sYXllclJlbmRlcmVy LT5yZXNpemVPbnNjcmVlbkNvbnRlbnQoV2ViQ29yZTo6SW50U2l6ZShzdGQ6Om1heCgxLCBtX3Np emUud2lkdGgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKSk7CisKKyAgICAg ICAgbV9jbGllbnQtPmRpZENoYW5nZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUodHJ1ZSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+ IGNvbnRleHQgPSBtX3RlbXBvcmFyeU9uc2NyZWVuR3JhcGhpY3NDb250ZXh0M0QucmVsZWFzZSgp OwogICAgIGlmICghY29udGV4dCkgeworICAgICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSh0cnVlKTsKICAgICAgICAgY29udGV4dCA9IEdyYXBoaWNz Q29udGV4dDNEOjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMoKSwgbV9wYWdl LT5jaHJvbWUoKSwgR3JhcGhpY3NDb250ZXh0M0Q6OlJlbmRlckRpcmVjdGx5VG9Ib3N0V2luZG93 KTsKICAgICAgICAgaWYgKGNvbnRleHQpCiAgICAgICAgICAgICBjb250ZXh0LT5yZXNoYXBlKHN0 ZDo6bWF4KDEsIG1fc2l6ZS53aWR0aCksIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKTsKQEAg LTI0MDAsNiArMjQwNyw3IEBACiAgICAgICAgIG1fY29tcG9zaXRvckNyZWF0aW9uRmFpbGVkID0g ZmFsc2U7CiAgICAgfSBlbHNlIHsKICAgICAgICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdB Y3RpdmUgPSBmYWxzZTsKKyAgICAgICAgbV9jbGllbnQtPmRpZENoYW5nZUFjY2VsZXJhdGVkQ29t cG9zaXRpbmdBY3RpdmUoZmFsc2UpOwogICAgICAgICBtX2NvbXBvc2l0b3JDcmVhdGlvbkZhaWxl ZCA9IHRydWU7CiAgICAgfQogfQpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA3MTgzOSkKKysr IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBA QAorMjAxMC0xMS0xMSAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBNYWtlIFdl YldpZGdldCBhY3RpdmVseSBub3RpZnkgY2xpZW50IHdoZW4gY29tcG9zaXRpbmcgZW5hYmxlcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5Mzk2CisK KyAgICAgICAgKiBwdWJsaWMvV2ViV2lkZ2V0Q2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6Oldl YldpZGdldENsaWVudDo6ZGlkQ2hhbmdlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSk6Cisg ICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0lt cGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSk6CisKIDIwMTAtMTEtMTEgIEhh bnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBK ZXJlbXkgT3Jsb3cuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldENsaWVu dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50 LmgJKHJldmlzaW9uIDcxODM5KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXRD bGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsNiArNTAsOSBAQAogICAgIC8vIHNjcm9sbGVk IGJ5IHRoZSBzcGVjaWZpZWQgZHggYW5kIGR5IGFtb3VudHMuCiAgICAgdmlydHVhbCB2b2lkIGRp ZFNjcm9sbFJlY3QoaW50IGR4LCBpbnQgZHksIGNvbnN0IFdlYlJlY3QmIGNsaXBSZWN0KSB7IH0K IAorICAgIC8vIENhbGxlZCB3aGVuIHRoZSBjb21wb3NpdG9yIGVuYWJsZXMgb3IgZGlzYWJsZXMu CisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUo Ym9vbCBhY3RpdmUpIHsgfQorCiAgICAgLy8gQ2FsbGVkIHdoZW4gYSBjYWxsIHRvIFdlYldpZGdl dDo6Y29tcG9zaXRlIGlzIHJlcXVpcmVkCiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQ29tcG9z aXRlKCkgeyB9CiAK 73919 2010-11-15 12:03:25 -0800 2010-11-15 14:12:55 -0800 Round 2 didEnable.patch text/plain 5573 nduca SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiA3MTgzOSkKKysr IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 MzgsOCArOTM4LDggQEAKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgT1Mo REFSV0lOKQogICAgIGlmIChtX2xheWVyUmVuZGVyZXIpIHsKLSAgICAgICAgbV9sYXllclJlbmRl cmVyLT5yZXNpemVPbnNjcmVlbkNvbnRlbnQoV2ViQ29yZTo6SW50U2l6ZShzdGQ6Om1heCgxLCBt X3NpemUud2lkdGgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKSk7CisgICAg ICAgIG1fbGF5ZXJSZW5kZXJlci0+cmVzaXplT25zY3JlZW5Db250ZW50KEludFNpemUoc3RkOjpt YXgoMSwgbV9zaXplLndpZHRoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzdGQ6Om1heCgxLCBtX3NpemUuaGVpZ2h0KSkpOwogICAgIH0K ICNlbmRpZgogfQpAQCAtMTAxNiwxMCArMTAxNiw2IEBACiAgICAgICAgICAgICByZXNpemVSZWN0 LmludGVyc2VjdChJbnRSZWN0KEludFBvaW50KCksIG1fbGF5ZXJSZW5kZXJlci0+cm9vdExheWVy VGV4dHVyZVNpemUoKSkpOwogICAgICAgICAgICAgZG9QaXhlbFJlYWRiYWNrVG9DYW52YXMoY2Fu dmFzLCByZXNpemVSZWN0KTsKICAgICAgICAgfQotCi0gICAgICAgIC8vIFRlbXBvcmFyaWx5IHBy ZXNlbnQgc28gdGhlIGRvd25zdHJlYW0gQ2hyb21pdW0gcmVuZGVyd2lkZ2V0IHN0aWxsIHJlbmRl cnMuCi0gICAgICAgIC8vIEZJWE1FOiByZW1vdmUgdGhpcyBjYWxsIG9uY2UgdGhlIGNoYW5nZXMg dG8gQ2hyb21pdW0ncyByZW5kZXJ3aWRnZXQgaGF2ZSBsYW5kZWQuCi0gICAgICAgIG1fbGF5ZXJS ZW5kZXJlci0+cHJlc2VudCgpOwogI2VuZGlmCiAgICAgfSBlbHNlIHsKICAgICAgICAgV2ViRnJh bWVJbXBsKiB3ZWJmcmFtZSA9IG1haW5GcmFtZUltcGwoKTsKQEAgLTIyNzQsMjIgKzIyNzAsMTEg QEAKIHZvaWQgV2ViVmlld0ltcGw6OnNldFJvb3RMYXllck5lZWRzRGlzcGxheSgpCiB7CiAgICAg bV9jbGllbnQtPnNjaGVkdWxlQ29tcG9zaXRlKCk7Ci0gICAgLy8gRklYTUU6IFRvIGF2b2lkIGJy ZWFraW5nIHRoZSBkb3duc3RyZWFtIENocm9tZSByZW5kZXJfd2lkZ2V0IHdoaWxlIGRvd25zdHJl YW0KLSAgICAvLyBjaGFuZ2VzIGxhbmQsIHdlIGFsc28gaGF2ZSB0byBwYXNzIGEgMXgxIGludmFs aWRhdGUgdXAgdG8gdGhlIGNsaWVudAotICAgIHsKLSAgICAgICAgV2ViUmVjdCBkYW1hZ2VSZWN0 KDAsIDAsIDEsIDEpOwotICAgICAgICBtX2NsaWVudC0+ZGlkSW52YWxpZGF0ZVJlY3QoZGFtYWdl UmVjdCk7Ci0gICAgfQogfQogCiAKIHZvaWQgV2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJl Y3QoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KQog ewotICAgIC8vIEZJWE1FOiBUbyBhdm9pZCBicmVha2luZyB0aGUgQ2hyb21lIHJlbmRlcl93aWRn ZXQgd2hlbiB0aGUgbmV3IGNvbXBvc2l0b3IgcmVuZGVyCi0gICAgLy8gcGF0aCBpcyBub3QgY2hl Y2tlZCBpbiwgd2UgbXVzdCBzdGlsbCBwYXNzIHNjcm9sbCBkYW1hZ2UgdXAgdG8gdGhlIGNsaWVu dC4gVGhpcwotICAgIC8vIGNvZGUgd2lsbCBiZSBiYWNrZWQgb3V0IGluIGEgZm9sbG93dXAgQ0wg b25jZSB0aGUgQ2hyb21pdW0gY2hhbmdlcyBoYXZlIGxhbmRlZC4KLSAgICBtX2NsaWVudC0+ZGlk U2Nyb2xsUmVjdChzY3JvbGxEZWx0YS53aWR0aCgpLCBzY3JvbGxEZWx0YS5oZWlnaHQoKSwgY2xp cFJlY3QpOwotCiAgICAgQVNTRVJUKG1fbGF5ZXJSZW5kZXJlcik7CiAgICAgLy8gQ29tcHV0ZSB0 aGUgZGFtYWdlIHJlY3QgaW4gdmlld3BvcnQgc3BhY2UuCiAgICAgV2ViRnJhbWVJbXBsKiB3ZWJm cmFtZSA9IG1haW5GcmFtZUltcGwoKTsKQEAgLTIzNTYsMTEgKzIzNDEsNiBAQAogCiB2b2lkIFdl YlZpZXdJbXBsOjppbnZhbGlkYXRlUm9vdExheWVyUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQog ewotICAgIC8vIEZJWE1FOiBUbyBhdm9pZCBicmVha2luZyB0aGUgQ2hyb21lIHJlbmRlcl93aWRn ZXQgd2hlbiB0aGUgbmV3IGNvbXBvc2l0b3IgcmVuZGVyCi0gICAgLy8gcGF0aCBpcyBub3QgY2hl Y2tlZCBpbiwgd2UgbXVzdCBzdGlsbCBwYXNzIGRhbWFnZSB1cCB0byB0aGUgY2xpZW50LiBUaGlz Ci0gICAgLy8gY29kZSB3aWxsIGJlIGJhY2tlZCBvdXQgaW4gYSBmb2xsb3d1cCBDTCBvbmNlIHRo ZSBDaHJvbWl1bSBjaGFuZ2VzIGhhdmUgbGFuZGVkLgotICAgIG1fY2xpZW50LT5kaWRJbnZhbGlk YXRlUmVjdChyZWN0KTsKLQogICAgIEFTU0VSVChtX2xheWVyUmVuZGVyZXIpOwogCiAgICAgaWYg KCFwYWdlKCkpCkBAIC0yMzgwLDE2ICsyMzYwLDIzIEBACiAKICAgICBpZiAoIWFjdGl2ZSkgewog ICAgICAgICBtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSA9IGZhbHNlOworICAgICAg ICBtX2xheWVyUmVuZGVyZXItPmZpbmlzaCgpOyAvLyBmaW5pc2ggYWxsIEdMIHJlbmRlcmluZyBi ZWZvcmUgd2UgaGlkZSB0aGUgd2luZG93PworICAgICAgICBtX2NsaWVudC0+ZGlkQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZShmYWxzZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAg ICBpZiAobV9sYXllclJlbmRlcmVyKSB7CiAgICAgICAgIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQWN0aXZlID0gdHJ1ZTsKKyAgICAgICAgbV9sYXllclJlbmRlcmVyLT5yZXNpemVPbnNjcmVl bkNvbnRlbnQoV2ViQ29yZTo6SW50U2l6ZShzdGQ6Om1heCgxLCBtX3NpemUud2lkdGgpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKSk7CisKKyAgICAgICAgbV9jbGllbnQtPmRp ZEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGUodHJ1ZSk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKICAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNvbnRleHQgPSBtX3RlbXBvcmFy eU9uc2NyZWVuR3JhcGhpY3NDb250ZXh0M0QucmVsZWFzZSgpOwogICAgIGlmICghY29udGV4dCkg eworICAgICAgICBtX2NsaWVudC0+ZGlkQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZSh0cnVl KTsKICAgICAgICAgY29udGV4dCA9IEdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUoR3JhcGhpY3ND b250ZXh0M0Q6OkF0dHJpYnV0ZXMoKSwgbV9wYWdlLT5jaHJvbWUoKSwgR3JhcGhpY3NDb250ZXh0 M0Q6OlJlbmRlckRpcmVjdGx5VG9Ib3N0V2luZG93KTsKICAgICAgICAgaWYgKGNvbnRleHQpCiAg ICAgICAgICAgICBjb250ZXh0LT5yZXNoYXBlKHN0ZDo6bWF4KDEsIG1fc2l6ZS53aWR0aCksIHN0 ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKTsKQEAgLTI0MDAsNiArMjM4Nyw3IEBACiAgICAgICAg IG1fY29tcG9zaXRvckNyZWF0aW9uRmFpbGVkID0gZmFsc2U7CiAgICAgfSBlbHNlIHsKICAgICAg ICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUgPSBmYWxzZTsKKyAgICAgICAgbV9j bGllbnQtPmRpZEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGUoZmFsc2UpOwogICAgICAgICBt X2NvbXBvc2l0b3JDcmVhdGlvbkZhaWxlZCA9IHRydWU7CiAgICAgfQogfQpJbmRleDogV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCShyZXZpc2lvbiA3MjAxMikKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0xMS0xNSAgTmF0IER1Y2EgIDxuZHVjYUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW2Nocm9taXVtXSBNYWtlIFdlYldpZGdldCBhY3RpdmVseSBub3RpZnkgY2xpZW50IHdo ZW4gY29tcG9zaXRpbmcgZW5hYmxlcy4KKyAgICAgICAgUmVtb3ZlIHNjcm9sbC9pbnZhbGlkYXRl IGNhbGxiYWNrcyB0byBXZWJXaWRldCBzaW5jZSBDaHJvbWl1bS1zaWRlIGNvZGUgCisgICAgICAg IG5vIGxvbmdlciBuZWVkcyB0aGVtLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDkzOTYKKworICAgICAgICAqIHB1YmxpYy9XZWJXaWRnZXRDbGllbnQu aDoKKyAgICAgICAgKFdlYktpdDo6V2ViV2lkZ2V0Q2xpZW50OjpkaWRBY2NlbGVyYXRlZENvbXBv c2l0aW5nRW5hYmxlKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3SW1wbDo6cmVzaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0lt cGw6OnBhaW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldFJvb3RMYXllck5l ZWRzRGlzcGxheSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzY3JvbGxSb290TGF5 ZXJSZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmludmFsaWRhdGVSb290TGF5 ZXJSZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0FjdGl2ZSk6CisKIDIwMTAtMTEtMTUgIElseWEgU2hlcm1hbiAgPGlzaGVybWFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXRDbGllbnQuaAkocmV2aXNpb24gNzE4Mzkp CisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldENsaWVudC5oCSh3b3JraW5nIGNv cHkpCkBAIC01MCw2ICs1MCw5IEBACiAgICAgLy8gc2Nyb2xsZWQgYnkgdGhlIHNwZWNpZmllZCBk eCBhbmQgZHkgYW1vdW50cy4KICAgICB2aXJ0dWFsIHZvaWQgZGlkU2Nyb2xsUmVjdChpbnQgZHgs IGludCBkeSwgY29uc3QgV2ViUmVjdCYgY2xpcFJlY3QpIHsgfQogCisgICAgLy8gQ2FsbGVkIHdo ZW4gdGhlIGNvbXBvc2l0b3IgZW5hYmxlcyBvciBkaXNhYmxlcy4KKyAgICB2aXJ0dWFsIHZvaWQg ZGlkQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZShib29sIGFjdGl2ZSkgeyB9CisKICAgICAv LyBDYWxsZWQgd2hlbiBhIGNhbGwgdG8gV2ViV2lkZ2V0Ojpjb21wb3NpdGUgaXMgcmVxdWlyZWQK ICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVDb21wb3NpdGUoKSB7IH0KIAo= 73929 2010-11-15 14:12:55 -0800 2010-11-15 21:13:01 -0800 Better name didEnable.patch text/plain 5470 nduca SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiA3MTgzOSkKKysr IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 MzgsOCArOTM4LDggQEAKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgT1Mo REFSV0lOKQogICAgIGlmIChtX2xheWVyUmVuZGVyZXIpIHsKLSAgICAgICAgbV9sYXllclJlbmRl cmVyLT5yZXNpemVPbnNjcmVlbkNvbnRlbnQoV2ViQ29yZTo6SW50U2l6ZShzdGQ6Om1heCgxLCBt X3NpemUud2lkdGgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKSk7CisgICAg ICAgIG1fbGF5ZXJSZW5kZXJlci0+cmVzaXplT25zY3JlZW5Db250ZW50KEludFNpemUoc3RkOjpt YXgoMSwgbV9zaXplLndpZHRoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzdGQ6Om1heCgxLCBtX3NpemUuaGVpZ2h0KSkpOwogICAgIH0K ICNlbmRpZgogfQpAQCAtMTAxNiwxMCArMTAxNiw2IEBACiAgICAgICAgICAgICByZXNpemVSZWN0 LmludGVyc2VjdChJbnRSZWN0KEludFBvaW50KCksIG1fbGF5ZXJSZW5kZXJlci0+cm9vdExheWVy VGV4dHVyZVNpemUoKSkpOwogICAgICAgICAgICAgZG9QaXhlbFJlYWRiYWNrVG9DYW52YXMoY2Fu dmFzLCByZXNpemVSZWN0KTsKICAgICAgICAgfQotCi0gICAgICAgIC8vIFRlbXBvcmFyaWx5IHBy ZXNlbnQgc28gdGhlIGRvd25zdHJlYW0gQ2hyb21pdW0gcmVuZGVyd2lkZ2V0IHN0aWxsIHJlbmRl cnMuCi0gICAgICAgIC8vIEZJWE1FOiByZW1vdmUgdGhpcyBjYWxsIG9uY2UgdGhlIGNoYW5nZXMg dG8gQ2hyb21pdW0ncyByZW5kZXJ3aWRnZXQgaGF2ZSBsYW5kZWQuCi0gICAgICAgIG1fbGF5ZXJS ZW5kZXJlci0+cHJlc2VudCgpOwogI2VuZGlmCiAgICAgfSBlbHNlIHsKICAgICAgICAgV2ViRnJh bWVJbXBsKiB3ZWJmcmFtZSA9IG1haW5GcmFtZUltcGwoKTsKQEAgLTIyNzQsMjIgKzIyNzAsMTEg QEAKIHZvaWQgV2ViVmlld0ltcGw6OnNldFJvb3RMYXllck5lZWRzRGlzcGxheSgpCiB7CiAgICAg bV9jbGllbnQtPnNjaGVkdWxlQ29tcG9zaXRlKCk7Ci0gICAgLy8gRklYTUU6IFRvIGF2b2lkIGJy ZWFraW5nIHRoZSBkb3duc3RyZWFtIENocm9tZSByZW5kZXJfd2lkZ2V0IHdoaWxlIGRvd25zdHJl YW0KLSAgICAvLyBjaGFuZ2VzIGxhbmQsIHdlIGFsc28gaGF2ZSB0byBwYXNzIGEgMXgxIGludmFs aWRhdGUgdXAgdG8gdGhlIGNsaWVudAotICAgIHsKLSAgICAgICAgV2ViUmVjdCBkYW1hZ2VSZWN0 KDAsIDAsIDEsIDEpOwotICAgICAgICBtX2NsaWVudC0+ZGlkSW52YWxpZGF0ZVJlY3QoZGFtYWdl UmVjdCk7Ci0gICAgfQogfQogCiAKIHZvaWQgV2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJl Y3QoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KQog ewotICAgIC8vIEZJWE1FOiBUbyBhdm9pZCBicmVha2luZyB0aGUgQ2hyb21lIHJlbmRlcl93aWRn ZXQgd2hlbiB0aGUgbmV3IGNvbXBvc2l0b3IgcmVuZGVyCi0gICAgLy8gcGF0aCBpcyBub3QgY2hl Y2tlZCBpbiwgd2UgbXVzdCBzdGlsbCBwYXNzIHNjcm9sbCBkYW1hZ2UgdXAgdG8gdGhlIGNsaWVu dC4gVGhpcwotICAgIC8vIGNvZGUgd2lsbCBiZSBiYWNrZWQgb3V0IGluIGEgZm9sbG93dXAgQ0wg b25jZSB0aGUgQ2hyb21pdW0gY2hhbmdlcyBoYXZlIGxhbmRlZC4KLSAgICBtX2NsaWVudC0+ZGlk U2Nyb2xsUmVjdChzY3JvbGxEZWx0YS53aWR0aCgpLCBzY3JvbGxEZWx0YS5oZWlnaHQoKSwgY2xp cFJlY3QpOwotCiAgICAgQVNTRVJUKG1fbGF5ZXJSZW5kZXJlcik7CiAgICAgLy8gQ29tcHV0ZSB0 aGUgZGFtYWdlIHJlY3QgaW4gdmlld3BvcnQgc3BhY2UuCiAgICAgV2ViRnJhbWVJbXBsKiB3ZWJm cmFtZSA9IG1haW5GcmFtZUltcGwoKTsKQEAgLTIzNTYsMTEgKzIzNDEsNiBAQAogCiB2b2lkIFdl YlZpZXdJbXBsOjppbnZhbGlkYXRlUm9vdExheWVyUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQog ewotICAgIC8vIEZJWE1FOiBUbyBhdm9pZCBicmVha2luZyB0aGUgQ2hyb21lIHJlbmRlcl93aWRn ZXQgd2hlbiB0aGUgbmV3IGNvbXBvc2l0b3IgcmVuZGVyCi0gICAgLy8gcGF0aCBpcyBub3QgY2hl Y2tlZCBpbiwgd2UgbXVzdCBzdGlsbCBwYXNzIGRhbWFnZSB1cCB0byB0aGUgY2xpZW50LiBUaGlz Ci0gICAgLy8gY29kZSB3aWxsIGJlIGJhY2tlZCBvdXQgaW4gYSBmb2xsb3d1cCBDTCBvbmNlIHRo ZSBDaHJvbWl1bSBjaGFuZ2VzIGhhdmUgbGFuZGVkLgotICAgIG1fY2xpZW50LT5kaWRJbnZhbGlk YXRlUmVjdChyZWN0KTsKLQogICAgIEFTU0VSVChtX2xheWVyUmVuZGVyZXIpOwogCiAgICAgaWYg KCFwYWdlKCkpCkBAIC0yMzgwLDE2ICsyMzYwLDIzIEBACiAKICAgICBpZiAoIWFjdGl2ZSkgewog ICAgICAgICBtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSA9IGZhbHNlOworICAgICAg ICBtX2xheWVyUmVuZGVyZXItPmZpbmlzaCgpOyAvLyBmaW5pc2ggYWxsIEdMIHJlbmRlcmluZyBi ZWZvcmUgd2UgaGlkZSB0aGUgd2luZG93PworICAgICAgICBtX2NsaWVudC0+ZGlkQWN0aXZhdGVB Y2NlbGVyYXRlZENvbXBvc2l0aW5nKGZhbHNlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIGlmIChtX2xheWVyUmVuZGVyZXIpIHsKICAgICAgICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9z aXRpbmdBY3RpdmUgPSB0cnVlOworICAgICAgICBtX2xheWVyUmVuZGVyZXItPnJlc2l6ZU9uc2Ny ZWVuQ29udGVudChXZWJDb3JlOjpJbnRTaXplKHN0ZDo6bWF4KDEsIG1fc2l6ZS53aWR0aCksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RkOjptYXgoMSwgbV9zaXplLmhlaWdodCkpKTsKKworICAgICAgICBtX2NsaWVudC0+ ZGlkQWN0aXZhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKHRydWUpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCiAgICAgUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBjb250ZXh0ID0gbV90ZW1w b3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29udGV4dDNELnJlbGVhc2UoKTsKICAgICBpZiAoIWNvbnRl eHQpIHsKKyAgICAgICAgbV9jbGllbnQtPmRpZEFjdGl2YXRlQWNjZWxlcmF0ZWRDb21wb3NpdGlu Zyh0cnVlKTsKICAgICAgICAgY29udGV4dCA9IEdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUoR3Jh cGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMoKSwgbV9wYWdlLT5jaHJvbWUoKSwgR3JhcGhpY3ND b250ZXh0M0Q6OlJlbmRlckRpcmVjdGx5VG9Ib3N0V2luZG93KTsKICAgICAgICAgaWYgKGNvbnRl eHQpCiAgICAgICAgICAgICBjb250ZXh0LT5yZXNoYXBlKHN0ZDo6bWF4KDEsIG1fc2l6ZS53aWR0 aCksIHN0ZDo6bWF4KDEsIG1fc2l6ZS5oZWlnaHQpKTsKQEAgLTI0MDAsNiArMjM4Nyw3IEBACiAg ICAgICAgIG1fY29tcG9zaXRvckNyZWF0aW9uRmFpbGVkID0gZmFsc2U7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUgPSBmYWxzZTsKKyAgICAg ICAgbV9jbGllbnQtPmRpZEFjdGl2YXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZyhmYWxzZSk7CiAg ICAgICAgIG1fY29tcG9zaXRvckNyZWF0aW9uRmFpbGVkID0gdHJ1ZTsKICAgICB9CiB9CkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDcyMDEyKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEwLTExLTE1ICBOYXQgRHVjYSAg PG5kdWNhQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbY2hyb21pdW1dIE1ha2UgV2ViV2lkZ2V0IGFjdGl2ZWx5IG5vdGlmeSBj bGllbnQgd2hlbiBjb21wb3NpdGluZyBlbmFibGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkzOTYKKworICAgICAgICAqIHB1YmxpYy9XZWJXaWRn ZXRDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViV2lkZ2V0Q2xpZW50OjpkaWRBY2NlbGVy YXRlZENvbXBvc2l0aW5nRW5hYmxlKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cmVzaXplKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OnBhaW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldFJv b3RMYXllck5lZWRzRGlzcGxheSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzY3Jv bGxSb290TGF5ZXJSZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmludmFsaWRh dGVSb290TGF5ZXJSZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldElzQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSk6CisKIDIwMTAtMTEtMTUgIElseWEgU2hlcm1hbiAg PGlzaGVybWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVy YS4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXRDbGllbnQuaAkocmV2aXNp b24gNzE4MzkpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldENsaWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC01MCw2ICs1MCw5IEBACiAgICAgLy8gc2Nyb2xsZWQgYnkgdGhlIHNw ZWNpZmllZCBkeCBhbmQgZHkgYW1vdW50cy4KICAgICB2aXJ0dWFsIHZvaWQgZGlkU2Nyb2xsUmVj dChpbnQgZHgsIGludCBkeSwgY29uc3QgV2ViUmVjdCYgY2xpcFJlY3QpIHsgfQogCisgICAgLy8g Q2FsbGVkIHdoZW4gdGhlIGNvbXBvc2l0b3IgZW5hYmxlcyBvciBkaXNhYmxlcy4KKyAgICB2aXJ0 dWFsIHZvaWQgZGlkQWN0aXZhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKGJvb2wgYWN0aXZlKSB7 IH0KKwogICAgIC8vIENhbGxlZCB3aGVuIGEgY2FsbCB0byBXZWJXaWRnZXQ6OmNvbXBvc2l0ZSBp cyByZXF1aXJlZAogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZUNvbXBvc2l0ZSgpIHsgfQogCg==