37313 2010-04-09 01:29:37 -0700 [Qt] Fix or remove the runtime flag for accelerated compositing. 2010-04-26 03:25:34 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All CLOSED FIXED Qt P2 Normal --- 35784 1 jturcotte noam benjamin commit-queue hausmann kenneth noam simon.fraser tonikitoo oldest_to_newest 210629 0 jturcotte 2010-04-09 01:29:37 -0700 Right now there is two ways to enable/disable accelerated compositing for the QGraphicsWebView: - WTF_USE_ACCELERATED_COMPOSITING at compile time - QWebSettings::AcceleratedCompositingEnabled at runtime Since this needs Settings::setAcceleratedCompositingEnabled(true) to work in WebCore, and that it needs to be disabled for QWebView, the setting is disabled on the page when QWebView::setPage is called. The problem is that the runtime flags API currently allows the user to mess up WebCore by setting the flag on a QWebPage already associated with a QWebView. The bug is currently present in QtLauncher by going on maps.google.com. Zooming in/out on the map will result on the map being drawn white during the animation. To disable the setting and see the correct behavior you have to: - Enable QGraphicsWebView to enable the accelerated composition menu - Disable accelerated composition - Disable QGraphicsWebView We were wondering if we actually need the runtime flag since: - Once accelerated composition works correctly, there will be few cases where the developer would want to disable it for specific pages - The QWebSettings api is have effects on QWebPage, however this api feels to fit more on QGraphicsWebView. How should this be handled when the developer implements its own view over QWebPage? And arguments to keep the runtime flag: - Accelerated composition might require additional resources and memory to operate. A developer might want to save these resources for some page and enable it for slimer pages needing faster animations without having two version of QtWebKit compiled for each scenario. If we keep the flag then I think we should verify in QWebSettings that a compatible web view is attached to the QWebPage before forwarding the call to WebCore. 210726 1 noam 2010-04-09 08:19:03 -0700 I think the runtime flag is necessary. It's a "browser-space" decision: e.g. WRT or the browser should decide whether or not to use AC. Also at least for now it's extremely useful for testing. We can put some cleverness that disables that option completely for QWebView if we're worried about people messing with it in that way. 210735 2 benjamin 2010-04-09 08:38:07 -0700 (In reply to comment #1) > I think the runtime flag is necessary. It's a "browser-space" decision: e.g. > WRT or the browser should decide whether or not to use AC. What are the use case to disable it at runtime? I think it might add unneeded complexity for developers, especially if it is uncommon to disable it. We should probably move this discussions outside of this bug report :) 210789 3 kenneth 2010-04-09 10:22:20 -0700 (In reply to comment #2) > (In reply to comment #1) > > I think the runtime flag is necessary. It's a "browser-space" decision: e.g. > > WRT or the browser should decide whether or not to use AC. > > What are the use case to disable it at runtime? > I think it might add unneeded complexity for developers, especially if it is > uncommon to disable it. > > We should probably move this discussions outside of this bug report :) It is not essential at runtime, but a per app basis, thus we need a setting for it. Enabling/disabling it at runtime is mostly useful for debugging. 214239 4 53719 noam 2010-04-19 14:08:51 -0700 Created attachment 53719 Added a way for the chrome-client to disable compositing even if it's enabled in settings Since this adds some API to ChromeClient, and additional code in the path to decide which layers to composite, it will need some more eyes... 214274 5 53726 noam 2010-04-19 15:05:15 -0700 Created attachment 53726 changed some names, and moved the chrome-client check to the settings-cache phase. it still works :) 214313 6 53726 simon.fraser 2010-04-19 16:10:27 -0700 Comment on attachment 53726 changed some names, and moved the chrome-client check to the settings-cache phase. it still works :) We already have Settings::acceleratedCompositingEnabled(), and a build flag. Do we need yet another way to control this? 214322 7 simon.fraser 2010-04-19 16:20:57 -0700 Also, the way we did this on Mac was to override the Settings value: http://trac.webkit.org/changeset/55100 214326 8 53726 simon.fraser 2010-04-19 16:29:53 -0700 Comment on attachment 53726 changed some names, and moved the chrome-client check to the settings-cache phase. it still works :) > diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h > index b710c91..d47134d 100644 > --- a/WebCore/page/ChromeClient.h > +++ b/WebCore/page/ChromeClient.h > @@ -214,6 +214,9 @@ namespace WebCore { > // Sets a flag to specify that the view needs to be updated, so we need > // to do an eager layout before the drawing. > virtual void scheduleCompositingLayerSync() = 0; > + // return whether or not the client can render the composited layer, > + // regardless of the settings > + virtual bool canRenderCompositedLayers() { return true; } Rename to allowsAcceleratedCompositing(), and make it |const|. > diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp > index 9430613..2d707b3 100644 > --- a/WebCore/rendering/RenderLayerCompositor.cpp > +++ b/WebCore/rendering/RenderLayerCompositor.cpp > @@ -131,6 +131,15 @@ void RenderLayerCompositor::cacheAcceleratedCompositingFlags() > showRepaintCounter = settings->showRepaintCounter(); > } > > + // we allow the chrome to override the settings, in case the page is rendered > + // on a chrome that doesn't allow accelerated compositing Sentence case, and terminating period please. r=me with those changes. 214329 9 53726 noam 2010-04-19 16:33:56 -0700 Comment on attachment 53726 changed some names, and moved the chrome-client check to the settings-cache phase. it still works :) even though the settings approach might work for the current use case - in the future we might better granularity for the chrome to decide whether or not to allow AC (e.g. allow it only on a GL viewport) 214353 10 53745 noam 2010-04-19 17:12:15 -0700 Created attachment 53745 name changes, better punctuation grammar :) applied feedback from Simon Fraser; re-uploading 214358 11 53745 simon.fraser 2010-04-19 17:19:07 -0700 Comment on attachment 53745 name changes, better punctuation grammar :) > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index 36db5d8..d796d7b 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,29 @@ > +2010-04-19 No'am Rosenthal <noam.rosenthal@nokia.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [Qt] Fix or remove the runtime flag for accelerated compositing. > + > + This adds a way for a chrome client to disallow layers from becoming composited, > + even if the settings enable AC. Please expand AC. You're the only people who use that contraction :) > diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h > @@ -214,6 +214,9 @@ namespace WebCore { > // Sets a flag to specify that the view needs to be updated, so we need > // to do an eager layout before the drawing. > virtual void scheduleCompositingLayerSync() = 0; > + // Returns whether or not the client can render the composited layer, > + // regardless of the settings. > + virtual bool allowsAcceleratedCompositing() { return true; } Method should be |const| > diff --git a/WebCore/platform/qt/QWebPageClient.h b/WebCore/platform/qt/QWebPageClient.h > index f03ff08..491a9f3 100644 > --- a/WebCore/platform/qt/QWebPageClient.h > +++ b/WebCore/platform/qt/QWebPageClient.h > @@ -55,6 +55,7 @@ public: > // if scheduleSync is true, we schedule a sync ourselves. otherwise, > // we wait for the next update and sync the layers then. > virtual void markForSync(bool scheduleSync = false) {} > + virtual bool allowsAcceleratedCompositing() { return false; } Fix this to match the constness in the API. > diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp > index 9430613..6f856b0 100644 > --- a/WebCore/rendering/RenderLayerCompositor.cpp > +++ b/WebCore/rendering/RenderLayerCompositor.cpp > @@ -131,6 +131,15 @@ void RenderLayerCompositor::cacheAcceleratedCompositingFlags() > showRepaintCounter = settings->showRepaintCounter(); > } > > + // We allow the chrome to override the settings, in case the page is rendered > + // on a chrome that doesn't allow accelerated compositing. I think a comment like: // Allow the ChromeClient to veto use of accelerated compositing. would be clearer. 214363 12 53746 noam 2010-04-19 17:24:45 -0700 Created attachment 53746 AC -> accelerated compositing de-acronymed 214370 13 53746 simon.fraser 2010-04-19 17:33:25 -0700 Comment on attachment 53746 AC -> accelerated compositing Not all my suggestions were responded to. 214381 14 53749 noam 2010-04-19 17:42:19 -0700 Created attachment 53749 take 4: /me was being sloppy with const should hopefully be ok now - I triple checked it for style, consts etc. 215213 15 53749 commit-queue 2010-04-21 03:09:57 -0700 Comment on attachment 53749 take 4: /me was being sloppy with const Clearing flags on attachment: 53749 Committed r57961: <http://trac.webkit.org/changeset/57961> 215214 16 commit-queue 2010-04-21 03:10:04 -0700 All reviewed patches have been landed. Closing bug. 216963 17 hausmann 2010-04-26 03:25:22 -0700 Revision r57961 cherry-picked into qtwebkit-2.0 with commit 003263d41f7ac488a40904fdc1b8ee91261853d5 53719 2010-04-19 14:08:51 -0700 2010-04-19 15:05:15 -0700 Added a way for the chrome-client to disable compositing even if it's enabled in settings patch-37313-1.diff text/plain 6723 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzZkYjVkOC4uNDNlYmJmMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNC0xOSAgTm8nYW0gUm9zZW50 aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9yIHJlbW92ZSB0aGUgcnVudGltZSBm bGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKworICAgICAgICBUaGlzIGFkZHMgYSB3 YXkgZm9yIGEgY2hyb21lIGNsaWVudCB0byBkaXNhbGxvdyBsYXllcnMgZnJvbSBiZWNvbWluZyBj b21wb3NpdGVkLAorICAgICAgICBldmVuIGlmIHRoZSBzZXR0aW5ncyBlbmFibGUgQUMuIFRoaXMg aXMgbmVjZXNzYXJ5IGZvciBwbGF0Zm9ybXMgd2hlcmUgZGlmZmVyZW50CisgICAgICAgIHZpZXdz IGNhbiBiZSBhcHBsaWVkIHdpdGggdGhlIHNhbWUgc2V0dGluZ3MgdG8gdGhlIHNhbWUgcGFnZS4K KworICAgICAgICBXZSBlbmFibGUgYW4gQVBJIHRocm91Z2ggQ2hyb21lQ2xpZW50IHRvIGFzayB0 aGUgY2hyb21lLWNsaWVudCB3aGV0aGVyIG9yIG5vdAorICAgICAgICBpdCBjYW4gcmVuZGVyIGNv bXBvc2l0ZWQgbGF5ZXJzLCB3aGljaCBpcyB0YWtlbiBpbnRvIGFjY291bnQgd2hlbiB0aGUgY29t cG9zaXRvcgorICAgICAgICBkZWNpZGVzIHdoZXRoZXIgb3Igbm90IHRvIHN0YXJ0IGNvbXBvc2l0 aW5nLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzMxMworCisgICAgICAgIFBhZ2VzIHVuZGVyIExheW91dFRlc3RzL2NvbXBvc2l0aW5nIG5vdyB3 b3JrIHVuZGVyIFFXZWJWaWV3LCBldmVuIHdoZW4KKyAgICAgICAgUVdlYlNldHRpbmdzOjpBY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCBpcyBvbi4KKworICAgICAgICAqIHBhZ2UvQ2hyb21l Q2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnQ6OmNhblJlbmRlckFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50 Lmg6CisgICAgICAgIChRV2ViUGFnZUNsaWVudDo6Y2FuUmVuZGVyQWNjZWxlcmF0ZWRDb21wb3Np dGluZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhbkJlQ29tcG9zaXRlZCk6 CisKIDIwMTAtMDQtMTkgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0Nocm9t ZUNsaWVudC5oIGIvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCmluZGV4IGI3MTBjOTEuLjVk YjBiMDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysgYi9XZWJD b3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKQEAgLTIxNCw2ICsyMTQsOSBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIC8vIFNldHMgYSBmbGFnIHRvIHNwZWNpZnkgdGhhdCB0aGUgdmlldyBu ZWVkcyB0byBiZSB1cGRhdGVkLCBzbyB3ZSBuZWVkCiAgICAgICAgIC8vIHRvIGRvIGFuIGVhZ2Vy IGxheW91dCBiZWZvcmUgdGhlIGRyYXdpbmcuCiAgICAgICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVs ZUNvbXBvc2l0aW5nTGF5ZXJTeW5jKCkgPSAwOworICAgICAgICAvLyByZXR1cm4gd2hldGhlciBv ciBub3QgdGhlIGNsaWVudCBjYW4gcmVuZGVyIHRoZSBjb21wb3NpdGVkIGxheWVyLAorICAgICAg ICAvLyByZWdhcmRsZXNzIG9mIHRoZSBzZXR0aW5ncworICAgICAgICB2aXJ0dWFsIGJvb2wgY2Fu UmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIHsgcmV0dXJuIHRydWU7IH0KICNlbmRpZgog CiAgICAgICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IE5v ZGUqKSB7IHJldHVybiBmYWxzZTsgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9R V2ViUGFnZUNsaWVudC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCmlu ZGV4IGYwM2ZmMDguLjVmYTZlOGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdl YlBhZ2VDbGllbnQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgK QEAgLTU1LDYgKzU1LDcgQEAgcHVibGljOgogICAgIC8vIGlmIHNjaGVkdWxlU3luYyBpcyB0cnVl LCB3ZSBzY2hlZHVsZSBhIHN5bmMgb3Vyc2VsdmVzLiBvdGhlcndpc2UsCiAgICAgLy8gd2Ugd2Fp dCBmb3IgdGhlIG5leHQgdXBkYXRlIGFuZCBzeW5jIHRoZSBsYXllcnMgdGhlbi4KICAgICB2aXJ0 dWFsIHZvaWQgbWFya0ZvclN5bmMoYm9vbCBzY2hlZHVsZVN5bmMgPSBmYWxzZSkge30KKyAgICB2 aXJ0dWFsIGJvb2wgY2FuUmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIHsgcmV0dXJuIGZh bHNlOyB9CiAjZW5kaWYKIAogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA2MDAKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDk0MzA2MTMuLmEzYWI2ZDcg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK KysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtOTgz LDcgKzk4MywxMSBAQCBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3Np dGluZ0xheWVyKGNvbnN0IFJlbmRlckxheWVyKiBsYXllcikgYwogCiBib29sIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6Y2FuQmVDb21wb3NpdGVkKGNvbnN0IFJlbmRlckxheWVyKiBsYXllcikgY29u c3QKIHsKLSAgICByZXR1cm4gbV9oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nICYmIGxheWVyLT5p c1NlbGZQYWludGluZ0xheWVyKCk7CisgICAgLy8gaW4gc29tZSBjYXNlcyB0aGUgbGF5ZXIgY2Fu IGJlIGNvbXBvc2l0ZWQsIHRoZSBzZXR0aW5ncyBhbGxvdyBmb3IgY29tcG9zaXRpbmcKKyAgICAv LyBidXQgdGhlIGN1cnJlbnQgdmlldyBjYW5ub3QgcmVuZGVyIGNvbXBvc2l0ZWQgbGF5ZXJzLgor ICAgIHJldHVybiBtX2hhc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcKKyAgICAgICAgICAgICYmIGxh eWVyLT5pc1NlbGZQYWludGluZ0xheWVyKCkKKyAgICAgICAgICAgICYmIG1fcmVuZGVyVmlldy0+ ZnJhbWVWaWV3KCktPmZyYW1lKCktPnBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5jYW5SZW5k ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCk7CiB9CiAKIC8vIFJldHVybiB0cnVlIGlmIHRoZSBn aXZlbiBsYXllciBoYXMgc29tZSBhbmNlc3RvciBpbiB0aGUgUmVuZGVyTGF5ZXIgaGllcmFyY2h5 IHRoYXQgY2xpcHMsCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcu Y3BwIGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAppbmRleCA5MTlhMTBhLi43 ZmNjODNkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCisr KyBiL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKQEAgLTEyMiw2ICsxMjIsOSBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFJvb3RHcmFwaGljc0xheWVyKFFHcmFwaGlj c0l0ZW0qIGxheWVyKTsKICAgICB2aXJ0dWFsIHZvaWQgbWFya0ZvclN5bmMoYm9vbCBzY2hlZHVs ZVN5bmMpOwogICAgIHZvaWQgdXBkYXRlQ29tcG9zaXRpbmdTY3JvbGxQb3NpdGlvbigpOworCisg ICAgLy8gUUdyYXBoaWNzV2ViVmlldyBjYW4gcmVuZGVyIGNvbXBvc2l0ZWQgbGF5ZXJzCisgICAg dmlydHVhbCBib29sIGNhblJlbmRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSB7IHJldHVybiB0 cnVlOyB9CiAjZW5kaWYKIAogICAgIHZvaWQgdXBkYXRlUmVzaXplc1RvQ29udGVudHNGb3JQYWdl KCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcCBiL1dlYktpdC9xdC9B cGkvcXdlYnZpZXcuY3BwCmluZGV4IGZjZDFmNGIuLjNiYTE2NzggMTAwNjQ0Ci0tLSBhL1dlYktp dC9xdC9BcGkvcXdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCkBA IC00MTUsOSArNDE1LDYgQEAgdm9pZCBRV2ViVmlldzo6c2V0UGFnZShRV2ViUGFnZSogcGFnZSkK ICAgICAgICAgICAgICAgICB0aGlzLCBTTE9UKHVwZGF0ZU1pY3JvRm9jdXMoKSkpOwogICAgICAg ICBjb25uZWN0KGQtPnBhZ2UsIFNJR05BTChkZXN0cm95ZWQoKSksCiAgICAgICAgICAgICAgICAg dGhpcywgU0xPVChfcV9wYWdlRGVzdHJveWVkKCkpKTsKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCi0gICAgICAgIGQtPnBhZ2UtPmQtPnBhZ2UtPnNldHRpbmdzKCktPnNldEFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKGZhbHNlKTsKLSNlbmRpZgogICAgIH0KICAgICBzZXRB dHRyaWJ1dGUoUXQ6OldBX09wYXF1ZVBhaW50RXZlbnQsIGQtPnBhZ2UpOwogICAgIHVwZGF0ZSgp OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cK aW5kZXggNjFlODhhMi4uNTkyNTM5ZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZwor KysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDQtMTkgIE5v J2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEZpeCBvciByZW1vdmUgdGhl IHJ1bnRpbWUgZmxhZyBmb3IgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzMxMworCisgICAgICAgIFRoaXMg bGV0cyB0aGUgUVdlYlBhZ2VDbGllbnQgInZldG8iIHRoZSBzZXR0aW5ncyB2YWx1ZSBmb3IgQUMu CisgICAgICAgIEluIHRoaXMgY2FzZSB3ZSBhbGxvdyBBQyBvbmx5IG9uIFFHcmFwaGljc1dlYlZp ZXcuCisKKyAgICAgICAgKiBBcGkvcWdyYXBoaWNzd2Vidmlldy5jcHA6CisgICAgICAgIChRR3Jh cGhpY3NXZWJWaWV3UHJpdmF0ZTo6Y2FuUmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZyk6Cisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q2hyb21lQ2xpZW50UXQ6OmNhblJlbmRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmcpOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0Lmg6CisKIDIwMTAtMDQtMTkg IEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50UXQuY3BwCmluZGV4IGNlZDQwZmEuLjIxNzdlNDAgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcApAQCAtNTU0LDYgKzU1NCwxMiBAQCB2 b2lkIENocm9tZUNsaWVudFF0OjpzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJTeW5jKCkKICAgICBp ZiAocGxhdGZvcm1QYWdlQ2xpZW50KCkpCiAgICAgICAgIHBsYXRmb3JtUGFnZUNsaWVudCgpLT5t YXJrRm9yU3luYyh0cnVlKTsKIH0KKworYm9vbCBDaHJvbWVDbGllbnRRdDo6Y2FuUmVuZGVyQWNj ZWxlcmF0ZWRDb21wb3NpdGluZygpCit7CisgICAgcmV0dXJuIChwbGF0Zm9ybVBhZ2VDbGllbnQo KSAmJiBwbGF0Zm9ybVBhZ2VDbGllbnQoKS0+Y2FuUmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZygpKTsKK30KKwogI2VuZGlmCiAKIFF0QWJzdHJhY3RXZWJQb3B1cCogQ2hyb21lQ2xpZW50UXQ6 OmNyZWF0ZVNlbGVjdFBvcHVwKCkKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9DaHJvbWVDbGllbnRRdC5oIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dFF0LmgKaW5kZXggNGY4MGY4OS4uM2IyOWYyMSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmgKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudFF0LmgKQEAgLTE0MSw2ICsxNDEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hSb290R3JhcGhpY3NMYXllcihGcmFtZSosIEdy YXBoaWNzTGF5ZXIqKTsKICAgICAgICAgdmlydHVhbCB2b2lkIHNldE5lZWRzT25lU2hvdERyYXdp bmdTeW5jaHJvbml6YXRpb24oKTsKICAgICAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQ29tcG9z aXRpbmdMYXllclN5bmMoKTsKKyAgICAgICAgdmlydHVhbCBib29sIGNhblJlbmRlckFjY2VsZXJh dGVkQ29tcG9zaXRpbmcoKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykK 53726 2010-04-19 15:05:15 -0700 2010-04-19 17:12:15 -0700 changed some names, and moved the chrome-client check to the settings-cache phase. it still works :) patch-37313-2.diff text/plain 6770 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzZkYjVkOC4uNDNlYmJmMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNC0xOSAgTm8nYW0gUm9zZW50 aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9yIHJlbW92ZSB0aGUgcnVudGltZSBm bGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKworICAgICAgICBUaGlzIGFkZHMgYSB3 YXkgZm9yIGEgY2hyb21lIGNsaWVudCB0byBkaXNhbGxvdyBsYXllcnMgZnJvbSBiZWNvbWluZyBj b21wb3NpdGVkLAorICAgICAgICBldmVuIGlmIHRoZSBzZXR0aW5ncyBlbmFibGUgQUMuIFRoaXMg aXMgbmVjZXNzYXJ5IGZvciBwbGF0Zm9ybXMgd2hlcmUgZGlmZmVyZW50CisgICAgICAgIHZpZXdz IGNhbiBiZSBhcHBsaWVkIHdpdGggdGhlIHNhbWUgc2V0dGluZ3MgdG8gdGhlIHNhbWUgcGFnZS4K KworICAgICAgICBXZSBlbmFibGUgYW4gQVBJIHRocm91Z2ggQ2hyb21lQ2xpZW50IHRvIGFzayB0 aGUgY2hyb21lLWNsaWVudCB3aGV0aGVyIG9yIG5vdAorICAgICAgICBpdCBjYW4gcmVuZGVyIGNv bXBvc2l0ZWQgbGF5ZXJzLCB3aGljaCBpcyB0YWtlbiBpbnRvIGFjY291bnQgd2hlbiB0aGUgY29t cG9zaXRvcgorICAgICAgICBkZWNpZGVzIHdoZXRoZXIgb3Igbm90IHRvIHN0YXJ0IGNvbXBvc2l0 aW5nLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzMxMworCisgICAgICAgIFBhZ2VzIHVuZGVyIExheW91dFRlc3RzL2NvbXBvc2l0aW5nIG5vdyB3 b3JrIHVuZGVyIFFXZWJWaWV3LCBldmVuIHdoZW4KKyAgICAgICAgUVdlYlNldHRpbmdzOjpBY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCBpcyBvbi4KKworICAgICAgICAqIHBhZ2UvQ2hyb21l Q2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnQ6OmNhblJlbmRlckFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50 Lmg6CisgICAgICAgIChRV2ViUGFnZUNsaWVudDo6Y2FuUmVuZGVyQWNjZWxlcmF0ZWRDb21wb3Np dGluZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhbkJlQ29tcG9zaXRlZCk6 CisKIDIwMTAtMDQtMTkgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0Nocm9t ZUNsaWVudC5oIGIvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCmluZGV4IGI3MTBjOTEuLmQ0 NzEzNGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysgYi9XZWJD b3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKQEAgLTIxNCw2ICsyMTQsOSBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIC8vIFNldHMgYSBmbGFnIHRvIHNwZWNpZnkgdGhhdCB0aGUgdmlldyBu ZWVkcyB0byBiZSB1cGRhdGVkLCBzbyB3ZSBuZWVkCiAgICAgICAgIC8vIHRvIGRvIGFuIGVhZ2Vy IGxheW91dCBiZWZvcmUgdGhlIGRyYXdpbmcuCiAgICAgICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVs ZUNvbXBvc2l0aW5nTGF5ZXJTeW5jKCkgPSAwOworICAgICAgICAvLyByZXR1cm4gd2hldGhlciBv ciBub3QgdGhlIGNsaWVudCBjYW4gcmVuZGVyIHRoZSBjb21wb3NpdGVkIGxheWVyLAorICAgICAg ICAvLyByZWdhcmRsZXNzIG9mIHRoZSBzZXR0aW5ncworICAgICAgICB2aXJ0dWFsIGJvb2wgY2Fu UmVuZGVyQ29tcG9zaXRlZExheWVycygpIHsgcmV0dXJuIHRydWU7IH0KICNlbmRpZgogCiAgICAg ICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IE5vZGUqKSB7 IHJldHVybiBmYWxzZTsgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFn ZUNsaWVudC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCmluZGV4IGYw M2ZmMDguLmZiNjYyYzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VD bGllbnQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgKQEAgLTU1 LDYgKzU1LDcgQEAgcHVibGljOgogICAgIC8vIGlmIHNjaGVkdWxlU3luYyBpcyB0cnVlLCB3ZSBz Y2hlZHVsZSBhIHN5bmMgb3Vyc2VsdmVzLiBvdGhlcndpc2UsCiAgICAgLy8gd2Ugd2FpdCBmb3Ig dGhlIG5leHQgdXBkYXRlIGFuZCBzeW5jIHRoZSBsYXllcnMgdGhlbi4KICAgICB2aXJ0dWFsIHZv aWQgbWFya0ZvclN5bmMoYm9vbCBzY2hlZHVsZVN5bmMgPSBmYWxzZSkge30KKyAgICB2aXJ0dWFs IGJvb2wgY2FuUmVuZGVyQ29tcG9zaXRlZExheWVycygpIHsgcmV0dXJuIGZhbHNlOyB9CiAjZW5k aWYKIAogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA2MDAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDk0MzA2MTMuLjJkNzA3YjMgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTMxLDYgKzEzMSwxNSBA QCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2FjaGVBY2NlbGVyYXRlZENvbXBvc2l0aW5n RmxhZ3MoKQogICAgICAgICBzaG93UmVwYWludENvdW50ZXIgPSBzZXR0aW5ncy0+c2hvd1JlcGFp bnRDb3VudGVyKCk7CiAgICAgfQogCisgICAgLy8gd2UgYWxsb3cgdGhlIGNocm9tZSB0byBvdmVy cmlkZSB0aGUgc2V0dGluZ3MsIGluIGNhc2UgdGhlIHBhZ2UgaXMgcmVuZGVyZWQKKyAgICAvLyBv biBhIGNocm9tZSB0aGF0IGRvZXNuJ3QgYWxsb3cgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcKKyAg ICBpZiAoaGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZykgeworICAgICAgICBGcmFtZSogZnJhbWUg PSBtX3JlbmRlclZpZXctPmZyYW1lVmlldygpLT5mcmFtZSgpOworICAgICAgICBQYWdlKiBwYWdl ID0gZnJhbWUgPyBmcmFtZS0+cGFnZSgpIDogMDsKKyAgICAgICAgaWYgKHBhZ2UpCisgICAgICAg ICAgICBoYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nID0gcGFnZS0+Y2hyb21lKCktPmNsaWVudCgp LT5jYW5SZW5kZXJDb21wb3NpdGVkTGF5ZXJzKCk7CisgICAgfQorCiAgICAgaWYgKGhhc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmcgIT0gbV9oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nIHx8IHNob3dE ZWJ1Z0JvcmRlcnMgIT0gbV9zaG93RGVidWdCb3JkZXJzIHx8IHNob3dSZXBhaW50Q291bnRlciAh PSBtX3Nob3dSZXBhaW50Q291bnRlcikKICAgICAgICAgc2V0Q29tcG9zaXRpbmdMYXllcnNOZWVk UmVidWlsZCgpOwogICAgICAgICAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNz d2Vidmlldy5jcHAgYi9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDkx OWExMGEuLjdmY2M4M2QgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmll dy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMTIyLDYg KzEyMiw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0Um9vdEdyYXBoaWNzTGF5ZXIo UUdyYXBoaWNzSXRlbSogbGF5ZXIpOwogICAgIHZpcnR1YWwgdm9pZCBtYXJrRm9yU3luYyhib29s IHNjaGVkdWxlU3luYyk7CiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ1Njcm9sbFBvc2l0aW9u KCk7CisKKyAgICAvLyBRR3JhcGhpY3NXZWJWaWV3IGNhbiByZW5kZXIgY29tcG9zaXRlZCBsYXll cnMKKyAgICB2aXJ0dWFsIGJvb2wgY2FuUmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIHsg cmV0dXJuIHRydWU7IH0KICNlbmRpZgogCiAgICAgdm9pZCB1cGRhdGVSZXNpemVzVG9Db250ZW50 c0ZvclBhZ2UoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIvV2Vi S2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKaW5kZXggZmNkMWY0Yi4uM2JhMTY3OCAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmll dy5jcHAKQEAgLTQxNSw5ICs0MTUsNiBAQCB2b2lkIFFXZWJWaWV3OjpzZXRQYWdlKFFXZWJQYWdl KiBwYWdlKQogICAgICAgICAgICAgICAgIHRoaXMsIFNMT1QodXBkYXRlTWljcm9Gb2N1cygpKSk7 CiAgICAgICAgIGNvbm5lY3QoZC0+cGFnZSwgU0lHTkFMKGRlc3Ryb3llZCgpKSwKICAgICAgICAg ICAgICAgICB0aGlzLCBTTE9UKF9xX3BhZ2VEZXN0cm95ZWQoKSkpOwotI2lmIFVTRShBQ0NFTEVS QVRFRF9DT01QT1NJVElORykKLSAgICAgICAgZC0+cGFnZS0+ZC0+cGFnZS0+c2V0dGluZ3MoKS0+ c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoZmFsc2UpOwotI2VuZGlmCiAgICAgfQog ICAgIHNldEF0dHJpYnV0ZShRdDo6V0FfT3BhcXVlUGFpbnRFdmVudCwgZC0+cGFnZSk7CiAgICAg dXBkYXRlKCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0No YW5nZUxvZwppbmRleCA2MWU4OGEyLi41OTI1MzlmIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hh bmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0w NC0xOSAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9yIHJl bW92ZSB0aGUgcnVudGltZSBmbGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MzEzCisKKyAgICAg ICAgVGhpcyBsZXRzIHRoZSBRV2ViUGFnZUNsaWVudCAidmV0byIgdGhlIHNldHRpbmdzIHZhbHVl IGZvciBBQy4KKyAgICAgICAgSW4gdGhpcyBjYXNlIHdlIGFsbG93IEFDIG9ubHkgb24gUUdyYXBo aWNzV2ViVmlldy4KKworICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAg ICAgKFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjpjYW5SZW5kZXJBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6Y2FuUmVuZGVyQWNjZWxlcmF0ZWRDb21wb3Np dGluZyk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaDoKKwogMjAx MC0wNC0xOSAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKaW5kZXggY2VkNDBmYS4uZTNlZmZlYyAxMDA2NDQK LS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcAorKysgYi9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCkBAIC01NTQsNiArNTU0 LDEyIEBAIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OnNjaGVkdWxlQ29tcG9zaXRpbmdMYXllclN5bmMo KQogICAgIGlmIChwbGF0Zm9ybVBhZ2VDbGllbnQoKSkKICAgICAgICAgcGxhdGZvcm1QYWdlQ2xp ZW50KCktPm1hcmtGb3JTeW5jKHRydWUpOwogfQorCitib29sIENocm9tZUNsaWVudFF0OjpjYW5S ZW5kZXJDb21wb3NpdGVkTGF5ZXJzKCkKK3sKKyAgICByZXR1cm4gKHBsYXRmb3JtUGFnZUNsaWVu dCgpICYmIHBsYXRmb3JtUGFnZUNsaWVudCgpLT5jYW5SZW5kZXJDb21wb3NpdGVkTGF5ZXJzKCkp OworfQorCiAjZW5kaWYKIAogUXRBYnN0cmFjdFdlYlBvcHVwKiBDaHJvbWVDbGllbnRRdDo6Y3Jl YXRlU2VsZWN0UG9wdXAoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudFF0LmggYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQu aAppbmRleCA0ZjgwZjg5Li45ZThmNDYyIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50UXQuaAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hy b21lQ2xpZW50UXQuaApAQCAtMTQxLDYgKzE0MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgdmlydHVhbCB2b2lkIGF0dGFjaFJvb3RHcmFwaGljc0xheWVyKEZyYW1lKiwgR3JhcGhp Y3NMYXllciopOwogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNPbmVTaG90RHJhd2luZ1N5 bmNocm9uaXphdGlvbigpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVDb21wb3NpdGlu Z0xheWVyU3luYygpOworICAgICAgICB2aXJ0dWFsIGJvb2wgY2FuUmVuZGVyQ29tcG9zaXRlZExh eWVycygpOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQo= 53745 2010-04-19 17:12:15 -0700 2010-04-19 17:24:45 -0700 name changes, better punctuation grammar :) patch-37313-3.diff text/plain 6776 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzZkYjVkOC4uZDc5NmQ3YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNC0xOSAgTm8nYW0gUm9zZW50 aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9yIHJlbW92ZSB0aGUgcnVudGltZSBm bGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKworICAgICAgICBUaGlzIGFkZHMgYSB3 YXkgZm9yIGEgY2hyb21lIGNsaWVudCB0byBkaXNhbGxvdyBsYXllcnMgZnJvbSBiZWNvbWluZyBj b21wb3NpdGVkLAorICAgICAgICBldmVuIGlmIHRoZSBzZXR0aW5ncyBlbmFibGUgQUMuIFRoaXMg aXMgbmVjZXNzYXJ5IGZvciBwbGF0Zm9ybXMgd2hlcmUgZGlmZmVyZW50CisgICAgICAgIHZpZXdz IGNhbiBiZSBhcHBsaWVkIHdpdGggdGhlIHNhbWUgc2V0dGluZ3MgdG8gdGhlIHNhbWUgcGFnZS4K KworICAgICAgICBXZSBlbmFibGUgYW4gQVBJIHRocm91Z2ggQ2hyb21lQ2xpZW50IHRvIGFzayB0 aGUgY2hyb21lLWNsaWVudCB3aGV0aGVyIG9yIG5vdAorICAgICAgICBpdCBjYW4gcmVuZGVyIGNv bXBvc2l0ZWQgbGF5ZXJzLCB3aGljaCBpcyB0YWtlbiBpbnRvIGFjY291bnQgd2hlbiB0aGUgY29t cG9zaXRvcgorICAgICAgICBkZWNpZGVzIHdoZXRoZXIgb3Igbm90IHRvIHN0YXJ0IGNvbXBvc2l0 aW5nLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzMxMworCisgICAgICAgIFBhZ2VzIHVuZGVyIExheW91dFRlc3RzL2NvbXBvc2l0aW5nIG5vdyB3 b3JrIHVuZGVyIFFXZWJWaWV3LCBldmVuIHdoZW4KKyAgICAgICAgUVdlYlNldHRpbmdzOjpBY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCBpcyBvbi4KKworICAgICAgICAqIHBhZ2UvQ2hyb21l Q2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnQ6OmFsbG93c0FjY2VsZXJh dGVkQ29tcG9zaXRpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50Lmg6 CisgICAgICAgIChRV2ViUGFnZUNsaWVudDo6YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZyk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhbkJlQ29tcG9zaXRlZCk6CisKIDIw MTAtMDQtMTkgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVu dC5oIGIvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCmluZGV4IGI3MTBjOTEuLmMyOTNlYTMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysgYi9XZWJDb3JlL3Bh Z2UvQ2hyb21lQ2xpZW50LmgKQEAgLTIxNCw2ICsyMTQsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIC8vIFNldHMgYSBmbGFnIHRvIHNwZWNpZnkgdGhhdCB0aGUgdmlldyBuZWVkcyB0 byBiZSB1cGRhdGVkLCBzbyB3ZSBuZWVkCiAgICAgICAgIC8vIHRvIGRvIGFuIGVhZ2VyIGxheW91 dCBiZWZvcmUgdGhlIGRyYXdpbmcuCiAgICAgICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZUNvbXBv c2l0aW5nTGF5ZXJTeW5jKCkgPSAwOworICAgICAgICAvLyBSZXR1cm5zIHdoZXRoZXIgb3Igbm90 IHRoZSBjbGllbnQgY2FuIHJlbmRlciB0aGUgY29tcG9zaXRlZCBsYXllciwKKyAgICAgICAgLy8g cmVnYXJkbGVzcyBvZiB0aGUgc2V0dGluZ3MuCisgICAgICAgIHZpcnR1YWwgYm9vbCBhbGxvd3NB Y2NlbGVyYXRlZENvbXBvc2l0aW5nKCkgeyByZXR1cm4gdHJ1ZTsgfQogI2VuZGlmCiAKICAgICAg ICAgdmlydHVhbCBib29sIHN1cHBvcnRzRnVsbHNjcmVlbkZvck5vZGUoY29uc3QgTm9kZSopIHsg cmV0dXJuIGZhbHNlOyB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdl Q2xpZW50LmggYi9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgKaW5kZXggZjAz ZmYwOC4uNDkxYTlmMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNs aWVudC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaApAQCAtNTUs NiArNTUsNyBAQCBwdWJsaWM6CiAgICAgLy8gaWYgc2NoZWR1bGVTeW5jIGlzIHRydWUsIHdlIHNj aGVkdWxlIGEgc3luYyBvdXJzZWx2ZXMuIG90aGVyd2lzZSwKICAgICAvLyB3ZSB3YWl0IGZvciB0 aGUgbmV4dCB1cGRhdGUgYW5kIHN5bmMgdGhlIGxheWVycyB0aGVuLgogICAgIHZpcnR1YWwgdm9p ZCBtYXJrRm9yU3luYyhib29sIHNjaGVkdWxlU3luYyA9IGZhbHNlKSB7fQorICAgIHZpcnR1YWwg Ym9vbCBhbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkgeyByZXR1cm4gZmFsc2U7IH0KICNl bmRpZgogCiAjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOTQzMDYxMy4uNmY4NTZiMCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xMzEsNiArMTMxLDE1 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjYWNoZUFjY2VsZXJhdGVkQ29tcG9zaXRp bmdGbGFncygpCiAgICAgICAgIHNob3dSZXBhaW50Q291bnRlciA9IHNldHRpbmdzLT5zaG93UmVw YWludENvdW50ZXIoKTsKICAgICB9CiAKKyAgICAvLyBXZSBhbGxvdyB0aGUgY2hyb21lIHRvIG92 ZXJyaWRlIHRoZSBzZXR0aW5ncywgaW4gY2FzZSB0aGUgcGFnZSBpcyByZW5kZXJlZAorICAgIC8v IG9uIGEgY2hyb21lIHRoYXQgZG9lc24ndCBhbGxvdyBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4K KyAgICBpZiAoaGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZykgeworICAgICAgICBGcmFtZSogZnJh bWUgPSBtX3JlbmRlclZpZXctPmZyYW1lVmlldygpLT5mcmFtZSgpOworICAgICAgICBQYWdlKiBw YWdlID0gZnJhbWUgPyBmcmFtZS0+cGFnZSgpIDogMDsKKyAgICAgICAgaWYgKHBhZ2UpCisgICAg ICAgICAgICBoYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nID0gcGFnZS0+Y2hyb21lKCktPmNsaWVu dCgpLT5hbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCk7CisgICAgfQorCiAgICAgaWYgKGhh c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcgIT0gbV9oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nIHx8 IHNob3dEZWJ1Z0JvcmRlcnMgIT0gbV9zaG93RGVidWdCb3JkZXJzIHx8IHNob3dSZXBhaW50Q291 bnRlciAhPSBtX3Nob3dSZXBhaW50Q291bnRlcikKICAgICAgICAgc2V0Q29tcG9zaXRpbmdMYXll cnNOZWVkUmVidWlsZCgpOwogICAgICAgICAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdy YXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmlu ZGV4IDkxOWExMGEuLjYyYTJkZDUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNz d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAt MTIyLDYgKzEyMiw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0Um9vdEdyYXBoaWNz TGF5ZXIoUUdyYXBoaWNzSXRlbSogbGF5ZXIpOwogICAgIHZpcnR1YWwgdm9pZCBtYXJrRm9yU3lu Yyhib29sIHNjaGVkdWxlU3luYyk7CiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ1Njcm9sbFBv c2l0aW9uKCk7CisKKyAgICAvLyBRR3JhcGhpY3NXZWJWaWV3IGNhbiByZW5kZXIgY29tcG9zaXRl ZCBsYXllcnMKKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygp IHsgcmV0dXJuIHRydWU7IH0KICNlbmRpZgogCiAgICAgdm9pZCB1cGRhdGVSZXNpemVzVG9Db250 ZW50c0ZvclBhZ2UoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIv V2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKaW5kZXggZmNkMWY0Yi4uM2JhMTY3OCAxMDA2NDQK LS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vi dmlldy5jcHAKQEAgLTQxNSw5ICs0MTUsNiBAQCB2b2lkIFFXZWJWaWV3OjpzZXRQYWdlKFFXZWJQ YWdlKiBwYWdlKQogICAgICAgICAgICAgICAgIHRoaXMsIFNMT1QodXBkYXRlTWljcm9Gb2N1cygp KSk7CiAgICAgICAgIGNvbm5lY3QoZC0+cGFnZSwgU0lHTkFMKGRlc3Ryb3llZCgpKSwKICAgICAg ICAgICAgICAgICB0aGlzLCBTTE9UKF9xX3BhZ2VEZXN0cm95ZWQoKSkpOwotI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKLSAgICAgICAgZC0+cGFnZS0+ZC0+cGFnZS0+c2V0dGluZ3Mo KS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoZmFsc2UpOwotI2VuZGlmCiAgICAg fQogICAgIHNldEF0dHJpYnV0ZShRdDo6V0FfT3BhcXVlUGFpbnRFdmVudCwgZC0+cGFnZSk7CiAg ICAgdXBkYXRlKCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0 L0NoYW5nZUxvZwppbmRleCA2MWU4OGEyLi5kNzY4NzFlIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQv Q2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAx MC0wNC0xOSAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9y IHJlbW92ZSB0aGUgcnVudGltZSBmbGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MzEzCisKKyAg ICAgICAgVGhpcyBsZXRzIHRoZSBRV2ViUGFnZUNsaWVudCAidmV0byIgdGhlIHNldHRpbmdzIHZh bHVlIGZvciBBQy4KKyAgICAgICAgSW4gdGhpcyBjYXNlIHdlIGFsbG93IEFDIG9ubHkgb24gUUdy YXBoaWNzV2ViVmlldy4KKworICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAg ICAgICAgKFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjphbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGlu Zyk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaDoKKwogMjAxMC0w NC0xOSAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKaW5kZXggY2VkNDBmYS4uOGYxY2IzYiAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcAorKysgYi9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCkBAIC01NTQsNiArNTU0LDEy IEBAIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OnNjaGVkdWxlQ29tcG9zaXRpbmdMYXllclN5bmMoKQog ICAgIGlmIChwbGF0Zm9ybVBhZ2VDbGllbnQoKSkKICAgICAgICAgcGxhdGZvcm1QYWdlQ2xpZW50 KCktPm1hcmtGb3JTeW5jKHRydWUpOwogfQorCitib29sIENocm9tZUNsaWVudFF0OjphbGxvd3NB Y2NlbGVyYXRlZENvbXBvc2l0aW5nKCkKK3sKKyAgICByZXR1cm4gKHBsYXRmb3JtUGFnZUNsaWVu dCgpICYmIHBsYXRmb3JtUGFnZUNsaWVudCgpLT5hbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5n KCkpOworfQorCiAjZW5kaWYKIAogUXRBYnN0cmFjdFdlYlBvcHVwKiBDaHJvbWVDbGllbnRRdDo6 Y3JlYXRlU2VsZWN0UG9wdXAoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudFF0LmggYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 UXQuaAppbmRleCA0ZjgwZjg5Li45MDYxZDE0IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50UXQuaApAQCAtMTQxLDYgKzE0MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgdmlydHVhbCB2b2lkIGF0dGFjaFJvb3RHcmFwaGljc0xheWVyKEZyYW1lKiwgR3Jh cGhpY3NMYXllciopOwogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNPbmVTaG90RHJhd2lu Z1N5bmNocm9uaXphdGlvbigpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVDb21wb3Np dGluZ0xheWVyU3luYygpOworICAgICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRD b21wb3NpdGluZygpOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQo= 53746 2010-04-19 17:24:45 -0700 2010-04-19 17:42:19 -0700 AC -> accelerated compositing patch-37313-3.diff text/plain 6843 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzZkYjVkOC4uZDc5NmQ3YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNC0xOSAgTm8nYW0gUm9zZW50 aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9yIHJlbW92ZSB0aGUgcnVudGltZSBm bGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKworICAgICAgICBUaGlzIGFkZHMgYSB3 YXkgZm9yIGEgY2hyb21lIGNsaWVudCB0byBkaXNhbGxvdyBsYXllcnMgZnJvbSBiZWNvbWluZyBj b21wb3NpdGVkLAorICAgICAgICBldmVuIGlmIHRoZSBzZXR0aW5ncyBlbmFibGUgYWNjZWxlcmF0 ZWQgY29tcG9zaXRpbmcuIFRoaXMgaXMgbmVjZXNzYXJ5IGZvciBwbGF0Zm9ybXMKKyAgICAgICAg d2hlcmUgZGlmZmVyZW50IHZpZXdzIGNhbiBiZSBhcHBsaWVkIHdpdGggdGhlIHNhbWUgc2V0dGlu Z3MgdG8gdGhlIHNhbWUgcGFnZS4KKworICAgICAgICBXZSBlbmFibGUgYW4gQVBJIHRocm91Z2gg Q2hyb21lQ2xpZW50IHRvIGFzayB0aGUgY2hyb21lLWNsaWVudCB3aGV0aGVyIG9yIG5vdAorICAg ICAgICBpdCBjYW4gcmVuZGVyIGNvbXBvc2l0ZWQgbGF5ZXJzLCB3aGljaCBpcyB0YWtlbiBpbnRv IGFjY291bnQgd2hlbiB0aGUgY29tcG9zaXRvcgorICAgICAgICBkZWNpZGVzIHdoZXRoZXIgb3Ig bm90IHRvIHN0YXJ0IGNvbXBvc2l0aW5nLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zNzMxMworCisgICAgICAgIFBhZ2VzIHVuZGVyIExheW91dFRl c3RzL2NvbXBvc2l0aW5nIG5vdyB3b3JrIHVuZGVyIFFXZWJWaWV3LCBldmVuIHdoZW4KKyAgICAg ICAgUVdlYlNldHRpbmdzOjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCBpcyBvbi4KKwor ICAgICAgICAqIHBhZ2UvQ2hyb21lQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVD bGllbnQ6OmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcpOgorICAgICAgICAqIHBsYXRmb3Jt L3F0L1FXZWJQYWdlQ2xpZW50Lmg6CisgICAgICAgIChRV2ViUGFnZUNsaWVudDo6YWxsb3dzQWNj ZWxlcmF0ZWRDb21wb3NpdGluZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNh bkJlQ29tcG9zaXRlZCk6CisKIDIwMTAtMDQtMTkgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wYWdlL0Nocm9tZUNsaWVudC5oIGIvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCmlu ZGV4IGI3MTBjOTEuLmMyOTNlYTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGll bnQuaAorKysgYi9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKQEAgLTIxNCw2ICsyMTQsOSBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIFNldHMgYSBmbGFnIHRvIHNwZWNpZnkg dGhhdCB0aGUgdmlldyBuZWVkcyB0byBiZSB1cGRhdGVkLCBzbyB3ZSBuZWVkCiAgICAgICAgIC8v IHRvIGRvIGFuIGVhZ2VyIGxheW91dCBiZWZvcmUgdGhlIGRyYXdpbmcuCiAgICAgICAgIHZpcnR1 YWwgdm9pZCBzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJTeW5jKCkgPSAwOworICAgICAgICAvLyBS ZXR1cm5zICAgICB3aGV0aGVyIG9yIG5vdCB0aGUgY2xpZW50IGNhbiByZW5kZXIgdGhlIGNvbXBv c2l0ZWQgbGF5ZXIsCisgICAgICAgIC8vIHJlZ2FyZGxlc3Mgb2YgdGhlIHNldHRpbmdzLgorICAg ICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIHsgcmV0dXJu IHRydWU7IH0KICNlbmRpZgogCiAgICAgICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3Jl ZW5Gb3JOb2RlKGNvbnN0IE5vZGUqKSB7IHJldHVybiBmYWxzZTsgfQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9R V2ViUGFnZUNsaWVudC5oCmluZGV4IGYwM2ZmMDguLjQ5MWE5ZjMgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3F0 L1FXZWJQYWdlQ2xpZW50LmgKQEAgLTU1LDYgKzU1LDcgQEAgcHVibGljOgogICAgIC8vIGlmIHNj aGVkdWxlU3luYyBpcyB0cnVlLCB3ZSBzY2hlZHVsZSBhIHN5bmMgb3Vyc2VsdmVzLiBvdGhlcndp c2UsCiAgICAgLy8gd2Ugd2FpdCBmb3IgdGhlIG5leHQgdXBkYXRlIGFuZCBzeW5jIHRoZSBsYXll cnMgdGhlbi4KICAgICB2aXJ0dWFsIHZvaWQgbWFya0ZvclN5bmMoYm9vbCBzY2hlZHVsZVN5bmMg PSBmYWxzZSkge30KKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZygpIHsgcmV0dXJuIGZhbHNlOyB9CiAjZW5kaWYKIAogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA2 MDAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDk0 MzA2MTMuLjZmODU2YjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcApAQCAtMTMxLDYgKzEzMSwxNSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 Y2FjaGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nRmxhZ3MoKQogICAgICAgICBzaG93UmVwYWludENv dW50ZXIgPSBzZXR0aW5ncy0+c2hvd1JlcGFpbnRDb3VudGVyKCk7CiAgICAgfQogCisgICAgLy8g V2UgYWxsb3cgdGhlIGNocm9tZSB0byBvdmVycmlkZSB0aGUgc2V0dGluZ3MsIGluIGNhc2UgdGhl IHBhZ2UgaXMgcmVuZGVyZWQKKyAgICAvLyBvbiBhIGNocm9tZSB0aGF0IGRvZXNuJ3QgYWxsb3cg YWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcuCisgICAgaWYgKGhhc0FjY2VsZXJhdGVkQ29tcG9zaXRp bmcpIHsKKyAgICAgICAgRnJhbWUqIGZyYW1lID0gbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXcoKS0+ ZnJhbWUoKTsKKyAgICAgICAgUGFnZSogcGFnZSA9IGZyYW1lID8gZnJhbWUtPnBhZ2UoKSA6IDA7 CisgICAgICAgIGlmIChwYWdlKQorICAgICAgICAgICAgaGFzQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZyA9IHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZygpOworICAgIH0KKwogICAgIGlmIChoYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nICE9IG1faGFz QWNjZWxlcmF0ZWRDb21wb3NpdGluZyB8fCBzaG93RGVidWdCb3JkZXJzICE9IG1fc2hvd0RlYnVn Qm9yZGVycyB8fCBzaG93UmVwYWludENvdW50ZXIgIT0gbV9zaG93UmVwYWludENvdW50ZXIpCiAg ICAgICAgIHNldENvbXBvc2l0aW5nTGF5ZXJzTmVlZFJlYnVpbGQoKTsKICAgICAgICAgCmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwIGIvV2ViS2l0L3F0L0Fw aS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAppbmRleCA5MTlhMTBhLi42MmEyZGQ1IDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkv cWdyYXBoaWNzd2Vidmlldy5jcHAKQEAgLTEyMiw2ICsxMjIsOSBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIHNldFJvb3RHcmFwaGljc0xheWVyKFFHcmFwaGljc0l0ZW0qIGxheWVyKTsKICAg ICB2aXJ0dWFsIHZvaWQgbWFya0ZvclN5bmMoYm9vbCBzY2hlZHVsZVN5bmMpOwogICAgIHZvaWQg dXBkYXRlQ29tcG9zaXRpbmdTY3JvbGxQb3NpdGlvbigpOworCisgICAgLy8gUUdyYXBoaWNzV2Vi VmlldyBjYW4gcmVuZGVyIGNvbXBvc2l0ZWQgbGF5ZXJzCisgICAgdmlydHVhbCBib29sIGFsbG93 c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSB7IHJldHVybiB0cnVlOyB9CiAjZW5kaWYKIAogICAg IHZvaWQgdXBkYXRlUmVzaXplc1RvQ29udGVudHNGb3JQYWdlKCk7CmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCmluZGV4 IGZjZDFmNGIuLjNiYTE2NzggMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3Bw CisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCkBAIC00MTUsOSArNDE1LDYgQEAgdm9p ZCBRV2ViVmlldzo6c2V0UGFnZShRV2ViUGFnZSogcGFnZSkKICAgICAgICAgICAgICAgICB0aGlz LCBTTE9UKHVwZGF0ZU1pY3JvRm9jdXMoKSkpOwogICAgICAgICBjb25uZWN0KGQtPnBhZ2UsIFNJ R05BTChkZXN0cm95ZWQoKSksCiAgICAgICAgICAgICAgICAgdGhpcywgU0xPVChfcV9wYWdlRGVz dHJveWVkKCkpKTsKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgICAgIGQt PnBhZ2UtPmQtPnBhZ2UtPnNldHRpbmdzKCktPnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFi bGVkKGZhbHNlKTsKLSNlbmRpZgogICAgIH0KICAgICBzZXRBdHRyaWJ1dGUoUXQ6OldBX09wYXF1 ZVBhaW50RXZlbnQsIGQtPnBhZ2UpOwogICAgIHVwZGF0ZSgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0 L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNjFlODhhMi4uZDc2ODcx ZSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDQtMTkgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0u cm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbUXRdIEZpeCBvciByZW1vdmUgdGhlIHJ1bnRpbWUgZmxhZyBmb3IgYWNj ZWxlcmF0ZWQgY29tcG9zaXRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNzMxMworCisgICAgICAgIFRoaXMgbGV0cyB0aGUgUVdlYlBhZ2VDbGll bnQgInZldG8iIHRoZSBzZXR0aW5ncyB2YWx1ZSBmb3IgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcu CisgICAgICAgIEluIHRoaXMgY2FzZSB3ZSBhbGxvdyBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBv bmx5IG9uIFFHcmFwaGljc1dlYlZpZXcuCisKKyAgICAgICAgKiBBcGkvcWdyYXBoaWNzd2Vidmll dy5jcHA6CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6YWxsb3dzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZyk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OmFsbG93c0FjY2VsZXJhdGVk Q29tcG9zaXRpbmcpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0Lmg6 CisKIDIwMTAtMDQtMTkgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBh L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCmluZGV4IGNlZDQwZmEuLjhmMWNiM2Ig MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAK KysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcApAQCAtNTU0 LDYgKzU1NCwxMiBAQCB2b2lkIENocm9tZUNsaWVudFF0OjpzY2hlZHVsZUNvbXBvc2l0aW5nTGF5 ZXJTeW5jKCkKICAgICBpZiAocGxhdGZvcm1QYWdlQ2xpZW50KCkpCiAgICAgICAgIHBsYXRmb3Jt UGFnZUNsaWVudCgpLT5tYXJrRm9yU3luYyh0cnVlKTsKIH0KKworYm9vbCBDaHJvbWVDbGllbnRR dDo6YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpCit7CisgICAgcmV0dXJuIChwbGF0Zm9y bVBhZ2VDbGllbnQoKSAmJiBwbGF0Zm9ybVBhZ2VDbGllbnQoKS0+YWxsb3dzQWNjZWxlcmF0ZWRD b21wb3NpdGluZygpKTsKK30KKwogI2VuZGlmCiAKIFF0QWJzdHJhY3RXZWJQb3B1cCogQ2hyb21l Q2xpZW50UXQ6OmNyZWF0ZVNlbGVjdFBvcHVwKCkKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5oIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudFF0LmgKaW5kZXggNGY4MGY4OS4uOTA2MWQxNCAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmgKKysrIGIvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmgKQEAgLTE0MSw2ICsxNDEsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hSb290R3JhcGhpY3NMYXllcihG cmFtZSosIEdyYXBoaWNzTGF5ZXIqKTsKICAgICAgICAgdmlydHVhbCB2b2lkIHNldE5lZWRzT25l U2hvdERyYXdpbmdTeW5jaHJvbml6YXRpb24oKTsKICAgICAgICAgdmlydHVhbCB2b2lkIHNjaGVk dWxlQ29tcG9zaXRpbmdMYXllclN5bmMoKTsKKyAgICAgICAgdmlydHVhbCBib29sIGFsbG93c0Fj Y2VsZXJhdGVkQ29tcG9zaXRpbmcoKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5U UykK 53749 2010-04-19 17:42:19 -0700 2010-04-21 03:09:57 -0700 take 4: /me was being sloppy with const patch-37313-4.diff text/plain 6869 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzZkYjVkOC4uNWUyMzdjYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNC0xOSAgTm8nYW0gUm9zZW50 aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9yIHJlbW92ZSB0aGUgcnVudGltZSBm bGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKworICAgICAgICBUaGlzIGFkZHMgYSB3 YXkgZm9yIGEgY2hyb21lIGNsaWVudCB0byBkaXNhbGxvdyBsYXllcnMgZnJvbSBiZWNvbWluZyBj b21wb3NpdGVkLAorICAgICAgICBldmVuIGlmIHRoZSBzZXR0aW5ncyBlbmFibGUgYWNjZWxlcmF0 ZWQgY29tcG9zaXRpbmcuIFRoaXMgaXMgbmVjZXNzYXJ5IGZvciBwbGF0Zm9ybXMKKyAgICAgICAg d2hlcmUgZGlmZmVyZW50IHZpZXdzIGNhbiBiZSBhcHBsaWVkIHdpdGggdGhlIHNhbWUgc2V0dGlu Z3MgdG8gdGhlIHNhbWUgcGFnZS4KKworICAgICAgICBXZSBlbmFibGUgYW4gQVBJIHRocm91Z2gg Q2hyb21lQ2xpZW50IHRvIGFzayB0aGUgY2hyb21lLWNsaWVudCB3aGV0aGVyIG9yIG5vdAorICAg ICAgICBpdCBjYW4gcmVuZGVyIGNvbXBvc2l0ZWQgbGF5ZXJzLCB3aGljaCBpcyB0YWtlbiBpbnRv IGFjY291bnQgd2hlbiB0aGUgY29tcG9zaXRvcgorICAgICAgICBkZWNpZGVzIHdoZXRoZXIgb3Ig bm90IHRvIHN0YXJ0IGNvbXBvc2l0aW5nLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zNzMxMworCisgICAgICAgIFBhZ2VzIHVuZGVyIExheW91dFRl c3RzL2NvbXBvc2l0aW5nIG5vdyB3b3JrIHVuZGVyIFFXZWJWaWV3LCBldmVuIHdoZW4KKyAgICAg ICAgUVdlYlNldHRpbmdzOjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCBpcyBvbi4KKwor ICAgICAgICAqIHBhZ2UvQ2hyb21lQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVD bGllbnQ6OmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcpOgorICAgICAgICAqIHBsYXRmb3Jt L3F0L1FXZWJQYWdlQ2xpZW50Lmg6CisgICAgICAgIChRV2ViUGFnZUNsaWVudDo6YWxsb3dzQWNj ZWxlcmF0ZWRDb21wb3NpdGluZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNh bkJlQ29tcG9zaXRlZCk6CisKIDIwMTAtMDQtMTkgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wYWdlL0Nocm9tZUNsaWVudC5oIGIvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCmlu ZGV4IGI3MTBjOTEuLmUxNzM4ZjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGll bnQuaAorKysgYi9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKQEAgLTIxNCw2ICsyMTQsOSBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIFNldHMgYSBmbGFnIHRvIHNwZWNpZnkg dGhhdCB0aGUgdmlldyBuZWVkcyB0byBiZSB1cGRhdGVkLCBzbyB3ZSBuZWVkCiAgICAgICAgIC8v IHRvIGRvIGFuIGVhZ2VyIGxheW91dCBiZWZvcmUgdGhlIGRyYXdpbmcuCiAgICAgICAgIHZpcnR1 YWwgdm9pZCBzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJTeW5jKCkgPSAwOworICAgICAgICAvLyBS ZXR1cm5zIHdoZXRoZXIgb3Igbm90IHRoZSBjbGllbnQgY2FuIHJlbmRlciB0aGUgY29tcG9zaXRl ZCBsYXllciwKKyAgICAgICAgLy8gcmVnYXJkbGVzcyBvZiB0aGUgc2V0dGluZ3MuCisgICAgICAg IHZpcnR1YWwgYm9vbCBhbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkgY29uc3QgeyByZXR1 cm4gdHJ1ZTsgfQogI2VuZGlmCiAKICAgICAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzRnVsbHNj cmVlbkZvck5vZGUoY29uc3QgTm9kZSopIHsgcmV0dXJuIGZhbHNlOyB9CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmggYi9XZWJDb3JlL3BsYXRmb3JtL3F0 L1FXZWJQYWdlQ2xpZW50LmgKaW5kZXggZjAzZmYwOC4uNDY3OTQxZiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v cXQvUVdlYlBhZ2VDbGllbnQuaApAQCAtNTUsNiArNTUsNyBAQCBwdWJsaWM6CiAgICAgLy8gaWYg c2NoZWR1bGVTeW5jIGlzIHRydWUsIHdlIHNjaGVkdWxlIGEgc3luYyBvdXJzZWx2ZXMuIG90aGVy d2lzZSwKICAgICAvLyB3ZSB3YWl0IGZvciB0aGUgbmV4dCB1cGRhdGUgYW5kIHN5bmMgdGhlIGxh eWVycyB0aGVuLgogICAgIHZpcnR1YWwgdm9pZCBtYXJrRm9yU3luYyhib29sIHNjaGVkdWxlU3lu YyA9IGZhbHNlKSB7fQorICAgIHZpcnR1YWwgYm9vbCBhbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICNlbmRpZgogCiAjaWYgUVRfVkVSU0lPTiA+ PSAweDA0MDYwMApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK aW5kZXggOTQzMDYxMy4uNmY4NTZiMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCkBAIC0xMzEsNiArMTMxLDE1IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpjYWNoZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGbGFncygpCiAgICAgICAgIHNob3dS ZXBhaW50Q291bnRlciA9IHNldHRpbmdzLT5zaG93UmVwYWludENvdW50ZXIoKTsKICAgICB9CiAK KyAgICAvLyBXZSBhbGxvdyB0aGUgY2hyb21lIHRvIG92ZXJyaWRlIHRoZSBzZXR0aW5ncywgaW4g Y2FzZSB0aGUgcGFnZSBpcyByZW5kZXJlZAorICAgIC8vIG9uIGEgY2hyb21lIHRoYXQgZG9lc24n dCBhbGxvdyBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKyAgICBpZiAoaGFzQWNjZWxlcmF0ZWRD b21wb3NpdGluZykgeworICAgICAgICBGcmFtZSogZnJhbWUgPSBtX3JlbmRlclZpZXctPmZyYW1l VmlldygpLT5mcmFtZSgpOworICAgICAgICBQYWdlKiBwYWdlID0gZnJhbWUgPyBmcmFtZS0+cGFn ZSgpIDogMDsKKyAgICAgICAgaWYgKHBhZ2UpCisgICAgICAgICAgICBoYXNBY2NlbGVyYXRlZENv bXBvc2l0aW5nID0gcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hbGxvd3NBY2NlbGVyYXRlZENv bXBvc2l0aW5nKCk7CisgICAgfQorCiAgICAgaWYgKGhhc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcg IT0gbV9oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nIHx8IHNob3dEZWJ1Z0JvcmRlcnMgIT0gbV9z aG93RGVidWdCb3JkZXJzIHx8IHNob3dSZXBhaW50Q291bnRlciAhPSBtX3Nob3dSZXBhaW50Q291 bnRlcikKICAgICAgICAgc2V0Q29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZCgpOwogICAgICAg ICAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJL aXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDkxOWExMGEuLmM4NjVjNGQgMTAw NjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0 L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMTIyLDYgKzEyMiw5IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgc2V0Um9vdEdyYXBoaWNzTGF5ZXIoUUdyYXBoaWNzSXRlbSogbGF5 ZXIpOwogICAgIHZpcnR1YWwgdm9pZCBtYXJrRm9yU3luYyhib29sIHNjaGVkdWxlU3luYyk7CiAg ICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ1Njcm9sbFBvc2l0aW9uKCk7CisKKyAgICAvLyBRR3Jh cGhpY3NXZWJWaWV3IGNhbiByZW5kZXIgY29tcG9zaXRlZCBsYXllcnMKKyAgICB2aXJ0dWFsIGJv b2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0K ICNlbmRpZgogCiAgICAgdm9pZCB1cGRhdGVSZXNpemVzVG9Db250ZW50c0ZvclBhZ2UoKTsKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2Vi dmlldy5jcHAKaW5kZXggZmNkMWY0Yi4uM2JhMTY3OCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0Fw aS9xd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKQEAgLTQxNSw5 ICs0MTUsNiBAQCB2b2lkIFFXZWJWaWV3OjpzZXRQYWdlKFFXZWJQYWdlKiBwYWdlKQogICAgICAg ICAgICAgICAgIHRoaXMsIFNMT1QodXBkYXRlTWljcm9Gb2N1cygpKSk7CiAgICAgICAgIGNvbm5l Y3QoZC0+cGFnZSwgU0lHTkFMKGRlc3Ryb3llZCgpKSwKICAgICAgICAgICAgICAgICB0aGlzLCBT TE9UKF9xX3BhZ2VEZXN0cm95ZWQoKSkpOwotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKLSAgICAgICAgZC0+cGFnZS0+ZC0+cGFnZS0+c2V0dGluZ3MoKS0+c2V0QWNjZWxlcmF0ZWRD b21wb3NpdGluZ0VuYWJsZWQoZmFsc2UpOwotI2VuZGlmCiAgICAgfQogICAgIHNldEF0dHJpYnV0 ZShRdDo6V0FfT3BhcXVlUGFpbnRFdmVudCwgZC0+cGFnZSk7CiAgICAgdXBkYXRlKCk7CmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA2 MWU4OGEyLi43ZTYxNTBjIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dl YktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNC0xOSAgTm8nYW0gUm9z ZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG9yIHJlbW92ZSB0aGUgcnVudGlt ZSBmbGFnIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MzEzCisKKyAgICAgICAgVGhpcyBsZXRzIHRo ZSBRV2ViUGFnZUNsaWVudCAidmV0byIgdGhlIHNldHRpbmdzIHZhbHVlIGZvciBhY2NlbGVyYXRl ZCBjb21wb3NpdGluZy4KKyAgICAgICAgSW4gdGhpcyBjYXNlIHdlIGFsbG93IGFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nIG9ubHkgb24gUUdyYXBoaWNzV2ViVmlldy4KKworICAgICAgICAqIEFwaS9x Z3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjph bGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9D aHJvbWVDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6YWxs b3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZyk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hy b21lQ2xpZW50UXQuaDoKKwogMjAxMC0wNC0xOSAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4u dHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5u LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNw cCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKaW5kZXggY2Vk NDBmYS4uOWFkYTlmNyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9t ZUNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 UXQuY3BwCkBAIC01NTQsNiArNTU0LDEyIEBAIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OnNjaGVkdWxl Q29tcG9zaXRpbmdMYXllclN5bmMoKQogICAgIGlmIChwbGF0Zm9ybVBhZ2VDbGllbnQoKSkKICAg ICAgICAgcGxhdGZvcm1QYWdlQ2xpZW50KCktPm1hcmtGb3JTeW5jKHRydWUpOwogfQorCitib29s IENocm9tZUNsaWVudFF0OjphbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkgY29uc3QKK3sK KyAgICByZXR1cm4gKHBsYXRmb3JtUGFnZUNsaWVudCgpICYmIHBsYXRmb3JtUGFnZUNsaWVudCgp LT5hbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpOworfQorCiAjZW5kaWYKIAogUXRBYnN0 cmFjdFdlYlBvcHVwKiBDaHJvbWVDbGllbnRRdDo6Y3JlYXRlU2VsZWN0UG9wdXAoKQpkaWZmIC0t Z2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmggYi9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaAppbmRleCA0ZjgwZjg5Li4xZDRiMTVj IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaAor KysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaApAQCAtMTQxLDYg KzE0MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCB2b2lkIGF0dGFj aFJvb3RHcmFwaGljc0xheWVyKEZyYW1lKiwgR3JhcGhpY3NMYXllciopOwogICAgICAgICB2aXJ0 dWFsIHZvaWQgc2V0TmVlZHNPbmVTaG90RHJhd2luZ1N5bmNocm9uaXphdGlvbigpOwogICAgICAg ICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVDb21wb3NpdGluZ0xheWVyU3luYygpOworICAgICAgICB2 aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0OwogI2VuZGlm CiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQo=