97903 2012-09-28 06:19:38 -0700 Make RenderLayerCompositor::requiresCompositingForScrollableFrame scrollbars agnostic 2012-12-19 11:32:50 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tonikitoo tonikitoo andersca bdakin dglazkov eric gustavo jamesr ojan.autocc philn simon.fraser webkit-ews webkit.review.bot xan.lopez oldest_to_newest 730581 0 tonikitoo 2012-09-28 06:19:38 -0700 The way it is implemented now, ports that disable scrollbars creation at FrameView creation time, won't benefit from it. 730771 1 166272 tonikitoo 2012-09-28 10:17:42 -0700 Created attachment 166272 patch 730798 2 166272 simon.fraser 2012-09-28 10:49:54 -0700 Comment on attachment 166272 patch View in context: https://bugs.webkit.org/attachment.cgi?id=166272&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:1675 > + // FIXME: Make FrameView::parentFrameView public to simplify this. > + if (!view->parent() || !view->parent()->isFrameView()) > + return false; > + > + m_reevaluateCompositingAfterLayout = true; > + > + return static_cast<FrameView*>(view->parent())->containsScrollableArea(view); I don't get why this is any better, or why it makes sense to ask our parent if it contains us? Why not just invent a way to ask about scrollability that doesn't involve scrollbars? 730800 3 tonikitoo 2012-09-28 10:54:45 -0700 > > + return static_cast<FrameView*>(view->parent())->containsScrollableArea(view); > > I don't get why this is any better, or why it makes sense to ask our parent if it contains us? Because FrameView caches all ScrollableArea "under" it (including other child frames, block elements (e.g. scrollable divs), etc). > Why not just invent a way to ask about scrollability that doesn't involve scrollbars? The way this patch provides is a way. Would you have something in mind specifically? 730804 4 simon.fraser 2012-09-28 11:01:07 -0700 (In reply to comment #3) > > > + return static_cast<FrameView*>(view->parent())->containsScrollableArea(view); > > > > I don't get why this is any better, or why it makes sense to ask our parent if it contains us? > > Because FrameView caches all ScrollableArea "under" it (including other child frames, block elements (e.g. scrollable divs), etc). Why not factor the code in FrameView::updateScrollableAreaSet() so you can just ask a FrameView if it's scrollable? 730821 5 tonikitoo 2012-09-28 11:14:48 -0700 > > > I don't get why this is any better, or why it makes sense to ask our parent if it contains us? > > > > Because FrameView caches all ScrollableArea "under" it (including other child frames, block elements (e.g. scrollable divs), etc). > > Why not factor the code in FrameView::updateScrollableAreaSet() so you can just ask a FrameView if it's scrollable? A simple bool to FrameView? If so, we would have to do something about the main frame though, since it does not go through updateScrollableArea 730840 6 simon.fraser 2012-09-28 11:38:15 -0700 Do you need this to be stateful? Can't you just run the same code that updateScrollableAreaSet() does? 730869 7 tonikitoo 2012-09-28 12:11:48 -0700 (In reply to comment #6) > Do you need this to be stateful? Can't you just run the same code that updateScrollableAreaSet() does? The long term plan was: 1) fix this bug 2) remove the existing but now unneeded Settings::acceleratedCompositingForScrollableFramesEnabled 3) make requiresCompositingForScrollableFrame a criteria to promote a layer to be composited, just like requiresCompositingForXXX So _3_ would be a rather hotter path than it is now. That said, stateful cache would be of more value. What do you think? 730902 8 simon.fraser 2012-09-28 12:41:08 -0700 The code in updateScrollableAreaSet() looks pretty cheap. You should just call it each time. 730989 9 166310 tonikitoo 2012-09-28 14:21:52 -0700 Created attachment 166310 patch 2 Simon, does it get closer to what you had in mind? 730991 10 166310 buildbot 2012-09-28 14:30:13 -0700 Comment on attachment 166310 patch 2 Attachment 166310 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14056550 730993 11 166310 gyuyoung.kim 2012-09-28 14:30:46 -0700 Comment on attachment 166310 patch 2 Attachment 166310 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/14070381 730994 12 166310 webkit.review.bot 2012-09-28 14:33:14 -0700 Comment on attachment 166310 patch 2 Attachment 166310 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14064410 730999 13 166310 webkit-ews 2012-09-28 14:35:56 -0700 Comment on attachment 166310 patch 2 Attachment 166310 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/14068375 731000 14 166312 tonikitoo 2012-09-28 14:37:19 -0700 Created attachment 166312 patch 2 - actual 731001 15 166312 simon.fraser 2012-09-28 14:43:32 -0700 Comment on attachment 166312 patch 2 - actual View in context: https://bugs.webkit.org/attachment.cgi?id=166312&action=review > Source/WebCore/page/FrameView.cpp:2794 > +bool FrameView::isScrollableChildFrameView() I don't think this should have the "child frame" part. It's up to the caller to determine whether it's a child frame. Just do the scrolling-related tests. > Source/WebCore/page/FrameView.cpp:2834 > + if (!parentFrameView()) > + return; > + > + if (isScrollableChildFrameView()) { > + parentFrameView()->addScrollableArea(this); > return; > } > > - parentFrameView()->addScrollableArea(this); > + parentFrameView()->removeScrollableArea(this); This fetches parentFrameView 3 times, and isScrollableChildFrameView() does so once. You should use a local. 785873 16 tonikitoo 2012-12-07 07:34:01 -0800 (In reply to comment #15) > (From update of attachment 166312 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166312&action=review > > > Source/WebCore/page/FrameView.cpp:2794 > > +bool FrameView::isScrollableChildFrameView() > > I don't think this should have the "child frame" part. It's up to the caller to determine whether it's a child frame. Just do the scrolling-related tests. > > > Source/WebCore/page/FrameView.cpp:2834 > > + if (!parentFrameView()) > > + return; > > + > > + if (isScrollableChildFrameView()) { > > + parentFrameView()->addScrollableArea(this); > > return; > > } > > > > - parentFrameView()->addScrollableArea(this); > > + parentFrameView()->removeScrollableArea(this); > > This fetches parentFrameView 3 times, and isScrollableChildFrameView() does so once. You should use a local. Getting back to this bug. 789539 17 179041 tonikitoo 2012-12-12 07:44:39 -0800 Created attachment 179041 patch 3 - addressed simon's comments 789557 18 179041 webkit.review.bot 2012-12-12 08:00:17 -0800 Comment on attachment 179041 patch 3 - addressed simon's comments Attachment 179041 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15282533 789558 19 179041 webkit-ews 2012-12-12 08:00:45 -0800 Comment on attachment 179041 patch 3 - addressed simon's comments Attachment 179041 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/15281531 789563 20 179041 webkit-ews 2012-12-12 08:08:49 -0800 Comment on attachment 179041 patch 3 - addressed simon's comments Attachment 179041 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/15296150 789576 21 179049 tonikitoo 2012-12-12 08:18:57 -0800 Created attachment 179049 (landed r138183, r=smfr) patch 3 (actual) - addressed simon's comments 794043 22 tonikitoo 2012-12-18 14:21:39 -0800 Kindly ping reviewer. 794496 23 tonikitoo 2012-12-19 03:56:05 -0800 (In reply to comment #22) > Kindly ping reviewers. Added some potential reviewers. 794717 24 179049 simon.fraser 2012-12-19 08:59:58 -0800 Comment on attachment 179049 (landed r138183, r=smfr) patch 3 (actual) - addressed simon's comments View in context: https://bugs.webkit.org/attachment.cgi?id=179049&action=review > Source/WebCore/page/FrameView.h:313 > + bool isScrollable(); This should be const. 794730 25 tonikitoo 2012-12-19 09:12:10 -0800 (In reply to comment #24) > (From update of attachment 179049 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=179049&action=review > > > Source/WebCore/page/FrameView.h:313 > > + bool isScrollable(); > > This should be const. Thanks Simon. Since FrameView::isScrollable calls calculateScrollbarModesForLayout, which is non-const, it can not be const. Maybe we can name it differently? 794765 26 simon.fraser 2012-12-19 09:55:38 -0800 No, you can leave it as is. 794826 27 tonikitoo 2012-12-19 11:32:50 -0800 https://trac.webkit.org/changeset/138183 166272 2012-09-28 10:17:42 -0700 2012-09-28 14:21:52 -0700 patch 0001-Make-RenderLayerCompositor-requiresCompositingForScr.patch text/plain 4077 tonikitoo RnJvbSBmM2M5ZmUzMGUyYTRiNTllMDdlMWQ2YzdkM2QwNTIwNjhhOTFmZmViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog RnJpLCAyOCBTZXAgMjAxMiAxMzoxNTozMiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIE1ha2UKIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFt ZQogc2Nyb2xsYmFycyBhZ25vc3RpYwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk3OTAzIFBSICMxOTcwOTMKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpQYXRj aCBieSBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KClBvcnRzIGxpa2UgdGhlIEJsYWNr QmVycnkgZGlzYWJsZSBzY3JvbGxiYXJzIGF0IEZyYW1lVmlldyBjcmVhdGlvbgpsZXZlbC4gU28g Y2hlY2tpbmcgZm9yIHRoZSBzY3JvbGxiYXJzIHByZXNlbmNlIGluIG9yZGVyIHRvIGRldGVybWlu ZQp0aGUgc2Nyb2xsYWJpbGl0eSBvZiBhbiBpbm5lciBmcmFtZSBpcyBmbGFreS4KClBhdGNoIGhh cyBhIGJlaGF2aW9yIGNoYW5nZSAoaXQgYmFpbHMgb3V0IGVhcmxpZXIgZm9yIHRoZSBtYWluIGZy YW1lKSwKYnV0IGl0IHNob3VsZCBub3QgYWZmZWN0IGFueSBwcmFjdGljYWwgYmVoYXZpb3IgZ2l2 ZW4gdGhlIHdheSBpdCBpcyBiZWluZwpjdXJyZW50bHkgdXNlZDogZGV0ZXJtaW5lIHRoZSBzY3Jv bGxhYmlsaXR5IG9mIGlubmVyIGZyYW1lcyAoc2VlIGNhbGwgc2l0ZSkuCgpObyAqcHJhY3RpY2Fs KiBiZWhhdmlvciBjaGFuZ2UsIHNvIG5vIG5ldyB0ZXN0czogcG9ydHMgbGlrZSBDaHJvbWl1bSBh bmQgb3RoZXJzCndobyBjdXJyZW50bHkgY2hlY2sgZm9yIHRoZSBzY3JvbGxiYXJzIHByZXNlbmNl IGluIG9yZGVyIHRvIGRldGVybWluZQphbiBpbm5lciBmcmFtZSBzY3JvbGxhYmlsaXR5IHNob3Vs ZCBub3QgYmUgYWZmZWN0ZWQuCgoqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw OgooV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9y U2Nyb2xsYWJsZUZyYW1lKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAgMjUgKysrKysrKysrKysrKysrKysrKy0KIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIHwgICAxNyArKysrKysrKysr KystCiAyIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDUwMDYxZmEuLjgwNjc5YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNCArMSwyNyBA QAotMjAxMi0wOS0yOCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CisyMDEyLTA5LTI4ICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CisKKyAgICAgICAg TWFrZSBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JTY3JvbGxh YmxlRnJhbWUgc2Nyb2xsYmFycyBhZ25vc3RpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc5MDMKKyAgICAgICAgUFIgIzE5NzA5MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBvcnRzIGxpa2UgdGhlIEJs YWNrQmVycnkgZGlzYWJsZSBzY3JvbGxiYXJzIGF0IEZyYW1lVmlldyBjcmVhdGlvbgorICAgICAg ICBsZXZlbC4gU28gY2hlY2tpbmcgZm9yIHRoZSBzY3JvbGxiYXJzIHByZXNlbmNlIGluIG9yZGVy IHRvIGRldGVybWluZQorICAgICAgICB0aGUgc2Nyb2xsYWJpbGl0eSBvZiBhbiBpbm5lciBmcmFt ZSBpcyBmbGFreS4KKworICAgICAgICBQYXRjaCBoYXMgYSBiZWhhdmlvciBjaGFuZ2UgKGl0IGJh aWxzIG91dCBlYXJsaWVyIGZvciB0aGUgbWFpbiBmcmFtZSksCisgICAgICAgIGJ1dCBpdCBzaG91 bGQgbm90IGFmZmVjdCBhbnkgcHJhY3RpY2FsIGJlaGF2aW9yIGdpdmVuIHRoZSB3YXkgaXQgaXMg YmVpbmcKKyAgICAgICAgY3VycmVudGx5IHVzZWQ6IGRldGVybWluZSB0aGUgc2Nyb2xsYWJpbGl0 eSBvZiBpbm5lciBmcmFtZXMgKHNlZSBjYWxsIHNpdGUpLgorCisgICAgICAgIE5vICpwcmFjdGlj YWwqIGJlaGF2aW9yIGNoYW5nZSwgc28gbm8gbmV3IHRlc3RzOiBwb3J0cyBsaWtlIENocm9taXVt IGFuZCBvdGhlcnMKKyAgICAgICAgd2hvIGN1cnJlbnRseSBjaGVjayBmb3IgdGhlIHNjcm9sbGJh cnMgcHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lCisgICAgICAgIGFuIGlubmVyIGZyYW1l IHNjcm9sbGFiaWxpdHkgc2hvdWxkIG5vdCBiZSBhZmZlY3RlZC4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yU2Nyb2xsYWJsZUZyYW1lKToK KworMDEyLTA5LTI4ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTI5NzUxLgogICAgICAgICBodHRw Oi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xMjk3NTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggZjk2NzIzMy4uYzlj MzFhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKQEAgLTE2NTUsMTEgKzE2NTUsMjQgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBv c2l0b3I6OmZpeGVkUG9zaXRpb25lZEJ5QW5jZXN0b3IoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVy KQogCiBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNj cm9sbGFibGVGcmFtZSgpIGNvbnN0CiB7CisgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25l ckVsZW1lbnQgPSBtX3JlbmRlclZpZXctPmRvY3VtZW50KCktPm93bmVyRWxlbWVudCgpOworICAg IGlmICghb3duZXJFbGVtZW50KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAvLyBOZWVk IHRoaXMgZG9uZSBmaXJzdCB0byBkZXRlcm1pbmUgb3ZlcmZsb3cuCiAgICAgQVNTRVJUKCFtX3Jl bmRlclZpZXctPm5lZWRzTGF5b3V0KCkpOwogCi0gICAgU2Nyb2xsVmlldyogc2Nyb2xsVmlldyA9 IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7Ci0gICAgcmV0dXJuIHNjcm9sbFZpZXctPnZlcnRp Y2FsU2Nyb2xsYmFyKCkgfHwgc2Nyb2xsVmlldy0+aG9yaXpvbnRhbFNjcm9sbGJhcigpOworICAg IEZyYW1lVmlldyogdmlldyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7CisgICAgaWYgKCF2 aWV3KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBGSVhNRTogTWFrZSBGcmFtZVZp ZXc6OnBhcmVudEZyYW1lVmlldyBwdWJsaWMgdG8gc2ltcGxpZnkgdGhpcy4KKyAgICBpZiAoIXZp ZXctPnBhcmVudCgpIHx8ICF2aWV3LT5wYXJlbnQoKS0+aXNGcmFtZVZpZXcoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgbV9yZWV2YWx1YXRlQ29tcG9zaXRpbmdBZnRlckxheW91dCA9 IHRydWU7CisKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4odmlldy0+cGFyZW50 KCkpLT5jb250YWluc1Njcm9sbGFibGVBcmVhKHZpZXcpOwogfQogCiBib29sIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclRyYW5zZm9ybShSZW5kZXJPYmplY3Qq IHJlbmRlcmVyKSBjb25zdAotLSAKMS43LjUuNAoK 166310 2012-09-28 14:21:52 -0700 2012-09-28 14:37:19 -0700 patch 2 0001-Make-RenderLayerCompositor-requiresCompositingForScr.patch text/plain 7437 tonikitoo RnJvbSBhNzBlMWYyNzA3MjFlZTY3ZGFlOTMyMWQ3YTBhNTI4YzM1NmFmM2E5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog RnJpLCAyOCBTZXAgMjAxMiAxNzoyMDowMiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIE1ha2UKIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFt ZQogc2Nyb2xsYmFycyBhZ25vc3RpYwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk3OTAzCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KUGF0Y2ggYnkgQW50b25p byBHb21lcyA8YWdvbWVzQHJpbS5jb20+CgpQb3J0cyBsaWtlIHRoZSBCbGFja0JlcnJ5IHBvcnQg ZGlzYWJsZSBzY3JvbGxiYXJzIGF0IEZyYW1lVmlldyBjcmVhdGlvbgpsZXZlbC4gU28gY2hlY2tp bmcgZm9yIHRoZSBzY3JvbGxiYXJzIHByZXNlbmNlIGluIG9yZGVyIHRvIGRldGVybWluZQp0aGUg c2Nyb2xsYWJpbGl0eSBvZiBhbiBpbm5lciBmcmFtZSBpcyBmbGFreS4KCkluc3RlYWQsIHRoZSBw YXRjaCBmYWN0b3JzIG91dCBwYXJ0IG9mIHRoZSBsb2dpYyBpbgpGcmFtZVZpZXc6OnVwZGF0ZVNj cm9sbGFibGVBcmVhU2V0IGludG8gYSBuZXcgOjppc1Njcm9sbGFibGVDaGlsZEZyYW1lVmlldwpt ZXRob2QuIFRoZSBsYXRlciBjYW4gYmUgdXNlZCB0byBjaGVjayB0aGUgc2Nyb2xsYWJpbGl0eSBv ZiBhIGdpdmVuCmNoaWxkIEZyYW1lVmlldy4KCkFsdGhvdWdoIHRoZSBzb2x1dGlvbiBwcm9wb3Nl ZCBpbnRyb2R1Y2VzIGEgYmVoYXZpb3IgY2hhbmdlIChpdCBiYWlsIG91dCBlYXJsaWVyIGZvciB0 aGUgbWFpbiBmcmFtZSksCml0IHNob3VsZCBub3QgYWZmZWN0IGFueSBwcmFjdGljYWwgYmVoYXZp b3IgZ2l2ZW4gdGhlIHdheSBpdCBpcyBiZWluZwpjdXJyZW50bHkgdXNlZDogZGV0ZXJtaW5lIHRo ZSBzY3JvbGxhYmlsaXR5IG9mIGlubmVyIGZyYW1lcyAoc2VlIGNhbGwgc2l0ZSkuCgpUaGF0IHNh aWQgKG5vICpwcmFjdGljYWwqIGJlaGF2aW9yIGNoYW5nZSksIG5vIG5ldyB0ZXN0czogcG9ydHMg bGlrZSBDaHJvbWl1bSBhbmQgb3RoZXJzCndobyBjdXJyZW50bHkgY2hlY2sgZm9yIHRoZSBzY3Jv bGxiYXJzIHByZXNlbmNlIGluIG9yZGVyIHRvIGRldGVybWluZQphbiBpbm5lciBmcmFtZSBzY3Jv bGxhYmlsaXR5IHNob3VsZCBub3QgYmUgYWZmZWN0ZWQuCgoqIHBhZ2UvRnJhbWVWaWV3LmNwcDoK KFdlYkNvcmU6OkZyYW1lVmlldzo6aXNTY3JvbGxhYmxlQ2hpbGRGcmFtZVZpZXcpOgooV2ViQ29y ZSk6CihXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVNjcm9sbGFibGVBcmVhU2V0KToKKiBwYWdl L0ZyYW1lVmlldy5oOgooRnJhbWVWaWV3KToKKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcDoKKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3Np dGluZ0ZvclNjcm9sbGFibGVGcmFtZSk6Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDMzICsrKysrKysrKysrKysrKysrKwogU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwICAgICAgICAgICAgICAgICAgfCAgIDM2ICsrKysr KysrKysrLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggICAgICAgICAg ICAgICAgICAgIHwgICAgMiArCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmNwcCB8ICAgIDYgKystCiA0IGZpbGVzIGNoYW5nZWQsIDYwIGluc2VydGlvbnMo KyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlY2JiNTZiLi4wZmQ5ZGYzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMDktMjggIEFudG9uaW8gR29tZXMgIDxhZ29t ZXNAcmltLmNvbT4KKworICAgICAgICBNYWtlIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWly ZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFtZSBzY3JvbGxiYXJzIGFnbm9zdGljCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzkwMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBvcnRzIGxpa2UgdGhl IEJsYWNrQmVycnkgcG9ydCBkaXNhYmxlIHNjcm9sbGJhcnMgYXQgRnJhbWVWaWV3IGNyZWF0aW9u CisgICAgICAgIGxldmVsLiBTbyBjaGVja2luZyBmb3IgdGhlIHNjcm9sbGJhcnMgcHJlc2VuY2Ug aW4gb3JkZXIgdG8gZGV0ZXJtaW5lCisgICAgICAgIHRoZSBzY3JvbGxhYmlsaXR5IG9mIGFuIGlu bmVyIGZyYW1lIGlzIGZsYWt5LgorCisgICAgICAgIEluc3RlYWQsIHRoZSBwYXRjaCBmYWN0b3Jz IG91dCBwYXJ0IG9mIHRoZSBsb2dpYyBpbgorICAgICAgICBGcmFtZVZpZXc6OnVwZGF0ZVNjcm9s bGFibGVBcmVhU2V0IGludG8gYSBuZXcgOjppc1Njcm9sbGFibGVDaGlsZEZyYW1lVmlldworICAg ICAgICBtZXRob2QuIFRoZSBsYXRlciBjYW4gYmUgdXNlZCB0byBjaGVjayB0aGUgc2Nyb2xsYWJp bGl0eSBvZiBhIGdpdmVuCisgICAgICAgIGNoaWxkIEZyYW1lVmlldy4KKworICAgICAgICBBbHRo b3VnaCB0aGUgc29sdXRpb24gcHJvcG9zZWQgaW50cm9kdWNlcyBhIGJlaGF2aW9yIGNoYW5nZSAo aXQgYmFpbCBvdXQgZWFybGllciBmb3IgdGhlIG1haW4gZnJhbWUpLAorICAgICAgICBpdCBzaG91 bGQgbm90IGFmZmVjdCBhbnkgcHJhY3RpY2FsIGJlaGF2aW9yIGdpdmVuIHRoZSB3YXkgaXQgaXMg YmVpbmcKKyAgICAgICAgY3VycmVudGx5IHVzZWQ6IGRldGVybWluZSB0aGUgc2Nyb2xsYWJpbGl0 eSBvZiBpbm5lciBmcmFtZXMgKHNlZSBjYWxsIHNpdGUpLgorCisgICAgICAgIFRoYXQgc2FpZCAo bm8gKnByYWN0aWNhbCogYmVoYXZpb3IgY2hhbmdlKSwgbm8gbmV3IHRlc3RzOiBwb3J0cyBsaWtl IENocm9taXVtIGFuZCBvdGhlcnMKKyAgICAgICAgd2hvIGN1cnJlbnRseSBjaGVjayBmb3IgdGhl IHNjcm9sbGJhcnMgcHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lCisgICAgICAgIGFuIGlu bmVyIGZyYW1lIHNjcm9sbGFiaWxpdHkgc2hvdWxkIG5vdCBiZSBhZmZlY3RlZC4KKworICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6aXNT Y3JvbGxhYmxlQ2hpbGRGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVNjcm9sbGFibGVBcmVhU2V0KToKKyAgICAgICAgKiBw YWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAoRnJhbWVWaWV3KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFtZSk6CisK IDIwMTItMDktMjcgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBm bGV4Ym94IGFzc2VydCBmYWlscyB3aXRoIGF1dG8tc2l6ZWQgaXRlbSB3aXRoIHBhZGRpbmcKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBhMTk1N2Q0Li4xMTYwMjlkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yNzkxLDQxICsyNzkxLDQ3IEBAIEludFJlY3QgRnJhbWVW aWV3OjpzY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KCkgY29uc3QKICAgICByZXR1cm4gZnJhbWVS ZWN0KCk7CiB9CiAKLXZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCgpCiti b29sIEZyYW1lVmlldzo6aXNTY3JvbGxhYmxlQ2hpbGRGcmFtZVZpZXcoKQogewotICAgIC8vIFRo YXQgZW5zdXJlcyB0aGF0IG9ubHkgaW5uZXIgZnJhbWVzIGFyZSBjYWNoZWQuCiAgICAgaWYgKCFw YXJlbnRGcmFtZVZpZXcoKSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2UK IAogICAgIC8vIENoZWNrIGZvcjoKICAgICAvLyAxKSBkaXNwbGF5Om5vbmUgb3IgdmlzaWJpbGl0 eTpoaWRkZW4gc2V0IHRvIHNlbGYgb3IgaW5oZXJpdGVkLgogICAgIC8vIDIpIG92ZXJmbG93ey14 LC15fTogaGlkZGVuOwogICAgIC8vIDMpIHNjcm9sbGluZzogbm87Ci0KICAgICAvLyBDb3ZlcnMg IzEuCiAgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG1fZnJhbWUtPm93bmVyRWxl bWVudCgpOwotICAgIGlmICghb3duZXIgfHwgIW93bmVyLT5yZW5kZXJlcigpIHx8ICFvd25lci0+ cmVuZGVyZXIoKS0+dmlzaWJsZVRvSGl0VGVzdGluZygpKSB7Ci0gICAgICAgIHBhcmVudEZyYW1l VmlldygpLT5yZW1vdmVTY3JvbGxhYmxlQXJlYSh0aGlzKTsKLSAgICAgICAgcmV0dXJuOwotICAg IH0KKyAgICBpZiAoIW93bmVyIHx8ICFvd25lci0+cmVuZGVyZXIoKSB8fCAhb3duZXItPnJlbmRl cmVyKCktPnZpc2libGVUb0hpdFRlc3RpbmcoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgSW50U2l6ZSBjb250ZW50U2l6ZSA9IGNvbnRlbnRzU2l6ZSgpOwogICAgIEludFNpemUgdmlz aWJsZUNvbnRlbnRTaXplID0gdmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpOwotICAgIGlmICgo Y29udGVudFNpemUuaGVpZ2h0KCkgPD0gdmlzaWJsZUNvbnRlbnRTaXplLmhlaWdodCgpICYmIGNv bnRlbnRTaXplLndpZHRoKCkgPD0gdmlzaWJsZUNvbnRlbnRTaXplLndpZHRoKCkpKSB7Ci0gICAg ICAgIHBhcmVudEZyYW1lVmlldygpLT5yZW1vdmVTY3JvbGxhYmxlQXJlYSh0aGlzKTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KKyAgICBpZiAoKGNvbnRlbnRTaXplLmhlaWdodCgpIDw9IHZpc2li bGVDb250ZW50U2l6ZS5oZWlnaHQoKSAmJiBjb250ZW50U2l6ZS53aWR0aCgpIDw9IHZpc2libGVD b250ZW50U2l6ZS53aWR0aCgpKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gQ292 ZXIgIzIgYW5kICMzLgogICAgIFNjcm9sbGJhck1vZGUgaG9yaXpvbnRhbE1vZGU7CiAgICAgU2Ny b2xsYmFyTW9kZSB2ZXJ0aWNhbE1vZGU7CiAgICAgY2FsY3VsYXRlU2Nyb2xsYmFyTW9kZXNGb3JM YXlvdXQoaG9yaXpvbnRhbE1vZGUsIHZlcnRpY2FsTW9kZSwgUnVsZXNGcm9tV2ViQ29udGVudE9u bHkpOwotICAgIGlmIChob3Jpem9udGFsTW9kZSA9PSBTY3JvbGxiYXJBbHdheXNPZmYgJiYgdmVy dGljYWxNb2RlID09IFNjcm9sbGJhckFsd2F5c09mZikgewotICAgICAgICBwYXJlbnRGcmFtZVZp ZXcoKS0+cmVtb3ZlU2Nyb2xsYWJsZUFyZWEodGhpcyk7CisgICAgaWYgKGhvcml6b250YWxNb2Rl ID09IFNjcm9sbGJhckFsd2F5c09mZiAmJiB2ZXJ0aWNhbE1vZGUgPT0gU2Nyb2xsYmFyQWx3YXlz T2ZmKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9p ZCBGcmFtZVZpZXc6OnVwZGF0ZVNjcm9sbGFibGVBcmVhU2V0KCkKK3sKKyAgICAvLyBUaGF0IGVu c3VyZXMgdGhhdCBvbmx5IGlubmVyIGZyYW1lcyBhcmUgY2FjaGVkLgorICAgIGlmICghcGFyZW50 RnJhbWVWaWV3KCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChpc1Njcm9sbGFibGVDaGls ZEZyYW1lVmlldygpKSB7CisgICAgICAgIHBhcmVudEZyYW1lVmlldygpLT5hZGRTY3JvbGxhYmxl QXJlYSh0aGlzKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHBhcmVudEZyYW1lVmll dygpLT5hZGRTY3JvbGxhYmxlQXJlYSh0aGlzKTsKKyAgICBwYXJlbnRGcmFtZVZpZXcoKS0+cmVt b3ZlU2Nyb2xsYWJsZUFyZWEodGhpcyk7CiB9CiAKIGJvb2wgRnJhbWVWaWV3OjpzaG91bGRTdXNw ZW5kU2Nyb2xsQW5pbWF0aW9ucygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCBl MTBiZDIwLi5lN2Y2MWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTM0Myw2ICszNDMs OCBAQCBwdWJsaWM6CiAgICAgYm9vbCBjb250YWluc1Njcm9sbGFibGVBcmVhKFNjcm9sbGFibGVB cmVhKikgY29uc3Q7CiAgICAgY29uc3QgU2Nyb2xsYWJsZUFyZWFTZXQqIHNjcm9sbGFibGVBcmVh cygpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYWJsZUFyZWFzLmdldCgpOyB9CiAKKyAgICBib29s IGlzU2Nyb2xsYWJsZUNoaWxkRnJhbWVWaWV3KCk7CisKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3Zl Q2hpbGQoV2lkZ2V0KikgT1ZFUlJJREU7CiAKICAgICAvLyBUaGlzIGZ1bmN0aW9uIGV4aXN0cyBm b3IgcG9ydHMgdGhhdCBuZWVkIHRvIGhhbmRsZSB3aGVlbCBldmVudHMgbWFudWFsbHkuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmlu ZGV4IGY5NjcyMzMuLjA3NzUwZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xNjU4LDggKzE2NTgsMTAgQEAgYm9vbCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JTY3JvbGxhYmxlRnJh bWUoKSBjb25zdAogICAgIC8vIE5lZWQgdGhpcyBkb25lIGZpcnN0IHRvIGRldGVybWluZSBvdmVy Zmxvdy4KICAgICBBU1NFUlQoIW1fcmVuZGVyVmlldy0+bmVlZHNMYXlvdXQoKSk7CiAKLSAgICBT Y3JvbGxWaWV3KiBzY3JvbGxWaWV3ID0gbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXcoKTsKLSAgICBy ZXR1cm4gc2Nyb2xsVmlldy0+dmVydGljYWxTY3JvbGxiYXIoKSB8fCBzY3JvbGxWaWV3LT5ob3Jp em9udGFsU2Nyb2xsYmFyKCk7CisgICAgaWYgKEZyYW1lVmlldyogdmlldyA9IG1fcmVuZGVyVmll dy0+ZnJhbWVWaWV3KCkpCisgICAgICAgIHJldHVybiB2aWV3LT5pc1Njcm9sbGFibGVDaGlsZEZy YW1lVmlldygpOworCisgICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29sIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclRyYW5zZm9ybShSZW5kZXJPYmplY3QqIHJl bmRlcmVyKSBjb25zdAotLSAKMS43LjUuNAoK 166312 2012-09-28 14:37:19 -0700 2012-12-12 07:44:39 -0800 patch 2 - actual 0001-Make-RenderLayerCompositor-requiresCompositingForScr.patch text/plain 7438 tonikitoo RnJvbSA5MDFlM2I1MzU4ZjQ3NzU0N2ZkNDQ0MjNhNDQ0NzYxNTYwOTQ0YzU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog RnJpLCAyOCBTZXAgMjAxMiAxNzoyMDowMiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIE1ha2UKIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFt ZQogc2Nyb2xsYmFycyBhZ25vc3RpYwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk3OTAzCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KUGF0Y2ggYnkgQW50b25p byBHb21lcyA8YWdvbWVzQHJpbS5jb20+CgpQb3J0cyBsaWtlIHRoZSBCbGFja0JlcnJ5IHBvcnQg ZGlzYWJsZSBzY3JvbGxiYXJzIGF0IEZyYW1lVmlldyBjcmVhdGlvbgpsZXZlbC4gU28gY2hlY2tp bmcgZm9yIHRoZSBzY3JvbGxiYXJzIHByZXNlbmNlIGluIG9yZGVyIHRvIGRldGVybWluZQp0aGUg c2Nyb2xsYWJpbGl0eSBvZiBhbiBpbm5lciBmcmFtZSBpcyBmbGFreS4KCkluc3RlYWQsIHRoZSBw YXRjaCBmYWN0b3JzIG91dCBwYXJ0IG9mIHRoZSBsb2dpYyBpbgpGcmFtZVZpZXc6OnVwZGF0ZVNj cm9sbGFibGVBcmVhU2V0IGludG8gYSBuZXcgOjppc1Njcm9sbGFibGVDaGlsZEZyYW1lVmlldwpt ZXRob2QuIFRoZSBsYXRlciBjYW4gYmUgdXNlZCB0byBjaGVjayB0aGUgc2Nyb2xsYWJpbGl0eSBv ZiBhIGdpdmVuCmNoaWxkIEZyYW1lVmlldy4KCkFsdGhvdWdoIHRoZSBzb2x1dGlvbiBwcm9wb3Nl ZCBpbnRyb2R1Y2VzIGEgYmVoYXZpb3IgY2hhbmdlIChpdCBiYWlsIG91dCBlYXJsaWVyIGZvciB0 aGUgbWFpbiBmcmFtZSksCml0IHNob3VsZCBub3QgYWZmZWN0IGFueSBwcmFjdGljYWwgYmVoYXZp b3IgZ2l2ZW4gdGhlIHdheSBpdCBpcyBiZWluZwpjdXJyZW50bHkgdXNlZDogZGV0ZXJtaW5lIHRo ZSBzY3JvbGxhYmlsaXR5IG9mIGlubmVyIGZyYW1lcyAoc2VlIGNhbGwgc2l0ZSkuCgpUaGF0IHNh aWQgKG5vICpwcmFjdGljYWwqIGJlaGF2aW9yIGNoYW5nZSksIG5vIG5ldyB0ZXN0czogcG9ydHMg bGlrZSBDaHJvbWl1bSBhbmQgb3RoZXJzCndobyBjdXJyZW50bHkgY2hlY2sgZm9yIHRoZSBzY3Jv bGxiYXJzIHByZXNlbmNlIGluIG9yZGVyIHRvIGRldGVybWluZQphbiBpbm5lciBmcmFtZSBzY3Jv bGxhYmlsaXR5IHNob3VsZCBub3QgYmUgYWZmZWN0ZWQuCgoqIHBhZ2UvRnJhbWVWaWV3LmNwcDoK KFdlYkNvcmU6OkZyYW1lVmlldzo6aXNTY3JvbGxhYmxlQ2hpbGRGcmFtZVZpZXcpOgooV2ViQ29y ZSk6CihXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVNjcm9sbGFibGVBcmVhU2V0KToKKiBwYWdl L0ZyYW1lVmlldy5oOgooRnJhbWVWaWV3KToKKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcDoKKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3Np dGluZ0ZvclNjcm9sbGFibGVGcmFtZSk6Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDMzICsrKysrKysrKysrKysrKysrKwogU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwICAgICAgICAgICAgICAgICAgfCAgIDM2ICsrKysr KysrKysrLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggICAgICAgICAg ICAgICAgICAgIHwgICAgMiArCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmNwcCB8ICAgIDYgKystCiA0IGZpbGVzIGNoYW5nZWQsIDYwIGluc2VydGlvbnMo KyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlY2JiNTZiLi4wZmQ5ZGYzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMDktMjggIEFudG9uaW8gR29tZXMgIDxhZ29t ZXNAcmltLmNvbT4KKworICAgICAgICBNYWtlIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWly ZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFtZSBzY3JvbGxiYXJzIGFnbm9zdGljCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzkwMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBvcnRzIGxpa2UgdGhl IEJsYWNrQmVycnkgcG9ydCBkaXNhYmxlIHNjcm9sbGJhcnMgYXQgRnJhbWVWaWV3IGNyZWF0aW9u CisgICAgICAgIGxldmVsLiBTbyBjaGVja2luZyBmb3IgdGhlIHNjcm9sbGJhcnMgcHJlc2VuY2Ug aW4gb3JkZXIgdG8gZGV0ZXJtaW5lCisgICAgICAgIHRoZSBzY3JvbGxhYmlsaXR5IG9mIGFuIGlu bmVyIGZyYW1lIGlzIGZsYWt5LgorCisgICAgICAgIEluc3RlYWQsIHRoZSBwYXRjaCBmYWN0b3Jz IG91dCBwYXJ0IG9mIHRoZSBsb2dpYyBpbgorICAgICAgICBGcmFtZVZpZXc6OnVwZGF0ZVNjcm9s bGFibGVBcmVhU2V0IGludG8gYSBuZXcgOjppc1Njcm9sbGFibGVDaGlsZEZyYW1lVmlldworICAg ICAgICBtZXRob2QuIFRoZSBsYXRlciBjYW4gYmUgdXNlZCB0byBjaGVjayB0aGUgc2Nyb2xsYWJp bGl0eSBvZiBhIGdpdmVuCisgICAgICAgIGNoaWxkIEZyYW1lVmlldy4KKworICAgICAgICBBbHRo b3VnaCB0aGUgc29sdXRpb24gcHJvcG9zZWQgaW50cm9kdWNlcyBhIGJlaGF2aW9yIGNoYW5nZSAo aXQgYmFpbCBvdXQgZWFybGllciBmb3IgdGhlIG1haW4gZnJhbWUpLAorICAgICAgICBpdCBzaG91 bGQgbm90IGFmZmVjdCBhbnkgcHJhY3RpY2FsIGJlaGF2aW9yIGdpdmVuIHRoZSB3YXkgaXQgaXMg YmVpbmcKKyAgICAgICAgY3VycmVudGx5IHVzZWQ6IGRldGVybWluZSB0aGUgc2Nyb2xsYWJpbGl0 eSBvZiBpbm5lciBmcmFtZXMgKHNlZSBjYWxsIHNpdGUpLgorCisgICAgICAgIFRoYXQgc2FpZCAo bm8gKnByYWN0aWNhbCogYmVoYXZpb3IgY2hhbmdlKSwgbm8gbmV3IHRlc3RzOiBwb3J0cyBsaWtl IENocm9taXVtIGFuZCBvdGhlcnMKKyAgICAgICAgd2hvIGN1cnJlbnRseSBjaGVjayBmb3IgdGhl IHNjcm9sbGJhcnMgcHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lCisgICAgICAgIGFuIGlu bmVyIGZyYW1lIHNjcm9sbGFiaWxpdHkgc2hvdWxkIG5vdCBiZSBhZmZlY3RlZC4KKworICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6aXNT Y3JvbGxhYmxlQ2hpbGRGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVNjcm9sbGFibGVBcmVhU2V0KToKKyAgICAgICAgKiBw YWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAoRnJhbWVWaWV3KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFtZSk6CisK IDIwMTItMDktMjcgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBm bGV4Ym94IGFzc2VydCBmYWlscyB3aXRoIGF1dG8tc2l6ZWQgaXRlbSB3aXRoIHBhZGRpbmcKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBhMTk1N2Q0Li45YTVkMTk2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yNzkxLDQxICsyNzkxLDQ3IEBAIEludFJlY3QgRnJhbWVW aWV3OjpzY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KCkgY29uc3QKICAgICByZXR1cm4gZnJhbWVS ZWN0KCk7CiB9CiAKLXZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCgpCiti b29sIEZyYW1lVmlldzo6aXNTY3JvbGxhYmxlQ2hpbGRGcmFtZVZpZXcoKQogewotICAgIC8vIFRo YXQgZW5zdXJlcyB0aGF0IG9ubHkgaW5uZXIgZnJhbWVzIGFyZSBjYWNoZWQuCiAgICAgaWYgKCFw YXJlbnRGcmFtZVZpZXcoKSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICAvLyBDaGVjayBmb3I6CiAgICAgLy8gMSkgZGlzcGxheTpub25lIG9yIHZpc2liaWxp dHk6aGlkZGVuIHNldCB0byBzZWxmIG9yIGluaGVyaXRlZC4KICAgICAvLyAyKSBvdmVyZmxvd3st eCwteX06IGhpZGRlbjsKICAgICAvLyAzKSBzY3JvbGxpbmc6IG5vOwotCiAgICAgLy8gQ292ZXJz ICMxLgogICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBtX2ZyYW1lLT5vd25lckVs ZW1lbnQoKTsKLSAgICBpZiAoIW93bmVyIHx8ICFvd25lci0+cmVuZGVyZXIoKSB8fCAhb3duZXIt PnJlbmRlcmVyKCktPnZpc2libGVUb0hpdFRlc3RpbmcoKSkgewotICAgICAgICBwYXJlbnRGcmFt ZVZpZXcoKS0+cmVtb3ZlU2Nyb2xsYWJsZUFyZWEodGhpcyk7Ci0gICAgICAgIHJldHVybjsKLSAg ICB9CisgICAgaWYgKCFvd25lciB8fCAhb3duZXItPnJlbmRlcmVyKCkgfHwgIW93bmVyLT5yZW5k ZXJlcigpLT52aXNpYmxlVG9IaXRUZXN0aW5nKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgIEludFNpemUgY29udGVudFNpemUgPSBjb250ZW50c1NpemUoKTsKICAgICBJbnRTaXplIHZp c2libGVDb250ZW50U2l6ZSA9IHZpc2libGVDb250ZW50UmVjdCgpLnNpemUoKTsKLSAgICBpZiAo KGNvbnRlbnRTaXplLmhlaWdodCgpIDw9IHZpc2libGVDb250ZW50U2l6ZS5oZWlnaHQoKSAmJiBj b250ZW50U2l6ZS53aWR0aCgpIDw9IHZpc2libGVDb250ZW50U2l6ZS53aWR0aCgpKSkgewotICAg ICAgICBwYXJlbnRGcmFtZVZpZXcoKS0+cmVtb3ZlU2Nyb2xsYWJsZUFyZWEodGhpcyk7Ci0gICAg ICAgIHJldHVybjsKLSAgICB9CisgICAgaWYgKChjb250ZW50U2l6ZS5oZWlnaHQoKSA8PSB2aXNp YmxlQ29udGVudFNpemUuaGVpZ2h0KCkgJiYgY29udGVudFNpemUud2lkdGgoKSA8PSB2aXNpYmxl Q29udGVudFNpemUud2lkdGgoKSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIENv dmVyICMyIGFuZCAjMy4KICAgICBTY3JvbGxiYXJNb2RlIGhvcml6b250YWxNb2RlOwogICAgIFNj cm9sbGJhck1vZGUgdmVydGljYWxNb2RlOwogICAgIGNhbGN1bGF0ZVNjcm9sbGJhck1vZGVzRm9y TGF5b3V0KGhvcml6b250YWxNb2RlLCB2ZXJ0aWNhbE1vZGUsIFJ1bGVzRnJvbVdlYkNvbnRlbnRP bmx5KTsKLSAgICBpZiAoaG9yaXpvbnRhbE1vZGUgPT0gU2Nyb2xsYmFyQWx3YXlzT2ZmICYmIHZl cnRpY2FsTW9kZSA9PSBTY3JvbGxiYXJBbHdheXNPZmYpIHsKLSAgICAgICAgcGFyZW50RnJhbWVW aWV3KCktPnJlbW92ZVNjcm9sbGFibGVBcmVhKHRoaXMpOworICAgIGlmIChob3Jpem9udGFsTW9k ZSA9PSBTY3JvbGxiYXJBbHdheXNPZmYgJiYgdmVydGljYWxNb2RlID09IFNjcm9sbGJhckFsd2F5 c09mZikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7Cit9CisKK3Zv aWQgRnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCgpCit7CisgICAgLy8gVGhhdCBl bnN1cmVzIHRoYXQgb25seSBpbm5lciBmcmFtZXMgYXJlIGNhY2hlZC4KKyAgICBpZiAoIXBhcmVu dEZyYW1lVmlldygpKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoaXNTY3JvbGxhYmxlQ2hp bGRGcmFtZVZpZXcoKSkgeworICAgICAgICBwYXJlbnRGcmFtZVZpZXcoKS0+YWRkU2Nyb2xsYWJs ZUFyZWEodGhpcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBwYXJlbnRGcmFtZVZp ZXcoKS0+YWRkU2Nyb2xsYWJsZUFyZWEodGhpcyk7CisgICAgcGFyZW50RnJhbWVWaWV3KCktPnJl bW92ZVNjcm9sbGFibGVBcmVhKHRoaXMpOwogfQogCiBib29sIEZyYW1lVmlldzo6c2hvdWxkU3Vz cGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXgg ZTEwYmQyMC4uZTdmNjFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC0zNDMsNiArMzQz LDggQEAgcHVibGljOgogICAgIGJvb2wgY29udGFpbnNTY3JvbGxhYmxlQXJlYShTY3JvbGxhYmxl QXJlYSopIGNvbnN0OwogICAgIGNvbnN0IFNjcm9sbGFibGVBcmVhU2V0KiBzY3JvbGxhYmxlQXJl YXMoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGFibGVBcmVhcy5nZXQoKTsgfQogCisgICAgYm9v bCBpc1Njcm9sbGFibGVDaGlsZEZyYW1lVmlldygpOworCiAgICAgdmlydHVhbCB2b2lkIHJlbW92 ZUNoaWxkKFdpZGdldCopIE9WRVJSSURFOwogCiAgICAgLy8gVGhpcyBmdW5jdGlvbiBleGlzdHMg Zm9yIHBvcnRzIHRoYXQgbmVlZCB0byBoYW5kbGUgd2hlZWwgZXZlbnRzIG1hbnVhbGx5LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApp bmRleCBmOTY3MjMzLi4wNzc1MGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTY1OCw4ICsxNjU4LDEwIEBAIGJvb2wg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yU2Nyb2xsYWJsZUZy YW1lKCkgY29uc3QKICAgICAvLyBOZWVkIHRoaXMgZG9uZSBmaXJzdCB0byBkZXRlcm1pbmUgb3Zl cmZsb3cuCiAgICAgQVNTRVJUKCFtX3JlbmRlclZpZXctPm5lZWRzTGF5b3V0KCkpOwogCi0gICAg U2Nyb2xsVmlldyogc2Nyb2xsVmlldyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7Ci0gICAg cmV0dXJuIHNjcm9sbFZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkgfHwgc2Nyb2xsVmlldy0+aG9y aXpvbnRhbFNjcm9sbGJhcigpOworICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBtX3JlbmRlclZp ZXctPmZyYW1lVmlldygpKQorICAgICAgICByZXR1cm4gdmlldy0+aXNTY3JvbGxhYmxlQ2hpbGRG cmFtZVZpZXcoKTsKKworICAgIHJldHVybiBmYWxzZTsKIH0KIAogYm9vbCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JUcmFuc2Zvcm0oUmVuZGVyT2JqZWN0KiBy ZW5kZXJlcikgY29uc3QKLS0gCjEuNy41LjQKCg== 179041 2012-12-12 07:44:39 -0800 2012-12-12 08:18:57 -0800 patch 3 - addressed simon's comments 0001-Make-RenderLayerCompositor-requiresCompositingForScr.patch text/plain 7362 tonikitoo RnJvbSBhNzA4MjI0ZmEwODVkMGJiYmI3Y2U5Mjk5ZDU1NDhlM2MxYTg4MDk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhMS5nb21lc0BzaXNhLnNhbXN1bmcu Y29tPgpEYXRlOiBXZWQsIDEyIERlYyAyMDEyIDExOjM5OjMwIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gTWFrZQogUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yU2Ny b2xsYWJsZUZyYW1lCiBzY3JvbGxiYXJzIGFnbm9zdGljCiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTc5MDMKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpQYXRj aCBieSBBbnRvbmlvIEdvbWVzIDxhMS5nb21lc0BzaXNhLnNhbXN1bmcuY29tPgoKU29tZSBwb3J0 cyAoaW5jbHVkaW5nIFF0LXdrMSBhbmQgQmxhY2tCZXJyeSkgYWxsb3cgZGlzYWJsaW5nCnNjcm9s bGJhcnMgYXQgRnJhbWVWaWV3IGNyZWF0aW9uIGxldmVsLiBSZWdhcmRsZXNzIHRoZSBzY3JvbGxi YXJzCnByZXNlbmNlIHRob3VnaCwgdGhlaXIgZnJhbWUncyBjb250ZW50IGNhbiBzdGlsbCBiZSBz Y3JvbGxlZCBhcyBuZWVkZWQuClRoZSBzYWlkLCBjaGVja2luZyBmb3IgdGhlIHNjcm9sbGJhcnMg cHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lCnRoZSBzY3JvbGxhYmlsaXR5IG9mIGFuIGlu bmVyIGZyYW1lIGlzIGZsYWt5LCBhcyBkb25lIGluIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVx dWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFtZS4KCkluc3RlYWQsIHRoZSBwYXRjaCBm YWN0b3JzIG91dCBwYXJ0IG9mIHRoZSBsb2dpYyBpbgpGcmFtZVZpZXc6OnVwZGF0ZVNjcm9sbGFi bGVBcmVhU2V0IGludG8gYSBuZXcgOjppc1Njcm9sbGFibGUgbWV0aG9kLgpUaGUgbGF0ZXIgY2Fu IGJlIHVzZWQgdG8gY2hlY2sgdGhlIHNjcm9sbGFiaWxpdHkgb2YgYSBnaXZlbiBGcmFtZVZpZXcu CgpObyBuZXcgdGVzdHMgYWRkZWQsIHNpbmNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZTog cG9ydHMgbGlrZSBDaHJvbWl1bSBhbmQgb3RoZXJzCndobyBjdXJyZW50bHkgY2hlY2sgZm9yIHRo ZSBzY3JvbGxiYXJzIHByZXNlbmNlIGluIG9yZGVyIHRvIGRldGVybWluZQphbiBpbm5lciBmcmFt ZSBzY3JvbGxhYmlsaXR5IHNob3VsZCBub3QgYmUgYWZmZWN0ZWQuCgoqIHBhZ2UvRnJhbWVWaWV3 LmNwcDoKKFdlYkNvcmU6OkZyYW1lVmlldzo6aXNTY3JvbGxhYmxlKToKKFdlYkNvcmUpOgooV2Vi Q29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCk6CiogcGFnZS9GcmFtZVZp ZXcuaDoKKEZyYW1lVmlldyk6CiogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6 CihXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JT Y3JvbGxhYmxlRnJhbWUpOgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAzMCArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwICAgICAgICAgICAgICAgICAgfCAgIDUzICsrKysrKysrKysrLS0tLS0tLS0t CiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oICAgICAgICAgICAgICAgICAgICB8ICAg IDEgKwogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAg fCAgICA0ICstCiA0IGZpbGVzIGNoYW5nZWQsIDYzIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA3ZDQwYTYxLi43ZmY0MjUzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzMgQEAKKzIwMTItMTItMTIgIEFudG9uaW8gR29tZXMgIDxhMS5nb21lc0BzaXNhLnNhbXN1 bmcuY29tPgorCisgICAgICAgIE1ha2UgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0Nv bXBvc2l0aW5nRm9yU2Nyb2xsYWJsZUZyYW1lIHNjcm9sbGJhcnMgYWdub3N0aWMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3OTAzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU29tZSBwb3J0cyAoaW5jbHVk aW5nIFF0LXdrMSBhbmQgQmxhY2tCZXJyeSkgYWxsb3cgZGlzYWJsaW5nCisgICAgICAgIHNjcm9s bGJhcnMgYXQgRnJhbWVWaWV3IGNyZWF0aW9uIGxldmVsLiBSZWdhcmRsZXNzIHRoZSBzY3JvbGxi YXJzCisgICAgICAgIHByZXNlbmNlIHRob3VnaCwgdGhlaXIgZnJhbWUncyBjb250ZW50IGNhbiBz dGlsbCBiZSBzY3JvbGxlZCBhcyBuZWVkZWQuCisgICAgICAgIFRoZSBzYWlkLCBjaGVja2luZyBm b3IgdGhlIHNjcm9sbGJhcnMgcHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lCisgICAgICAg IHRoZSBzY3JvbGxhYmlsaXR5IG9mIGFuIGlubmVyIGZyYW1lIGlzIGZsYWt5LCBhcyBkb25lIGlu IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVG cmFtZS4KKworICAgICAgICBJbnN0ZWFkLCB0aGUgcGF0Y2ggZmFjdG9ycyBvdXQgcGFydCBvZiB0 aGUgbG9naWMgaW4KKyAgICAgICAgRnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCBp bnRvIGEgbmV3IDo6aXNTY3JvbGxhYmxlIG1ldGhvZC4KKyAgICAgICAgVGhlIGxhdGVyIGNhbiBi ZSB1c2VkIHRvIGNoZWNrIHRoZSBzY3JvbGxhYmlsaXR5IG9mIGEgZ2l2ZW4gRnJhbWVWaWV3Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBhZGRlZCwgc2luY2UgdGhlcmUgaXMgbm8gYmVoYXZpb3Ig Y2hhbmdlOiBwb3J0cyBsaWtlIENocm9taXVtIGFuZCBvdGhlcnMKKyAgICAgICAgd2hvIGN1cnJl bnRseSBjaGVjayBmb3IgdGhlIHNjcm9sbGJhcnMgcHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJt aW5lCisgICAgICAgIGFuIGlubmVyIGZyYW1lIHNjcm9sbGFiaWxpdHkgc2hvdWxkIG5vdCBiZSBh ZmZlY3RlZC4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6aXNTY3JvbGxhYmxlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCk6CisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKEZyYW1lVmlldyk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JTY3JvbGxhYmxlRnJhbWUp OgorCiAyMDEyLTEyLTEwICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBpbi1iYW5kIHRleHQgdHJhY2tzIHRvIE1hYyBwb3J0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMjlkOTJjOS4uZjk2NjFjNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMjgxNiw0MSArMjgxNiw0OCBAQCBJbnRSZWN0IEZy YW1lVmlldzo6c2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0JveCgpIGNvbnN0CiAgICAgcmV0dXJuIGZy YW1lUmVjdCgpOwogfQogCi12b2lkIEZyYW1lVmlldzo6dXBkYXRlU2Nyb2xsYWJsZUFyZWFTZXQo KQorYm9vbCBGcmFtZVZpZXc6OmlzU2Nyb2xsYWJsZSgpCiB7Ci0gICAgLy8gVGhhdCBlbnN1cmVz IHRoYXQgb25seSBpbm5lciBmcmFtZXMgYXJlIGNhY2hlZC4KLSAgICBpZiAoIXBhcmVudEZyYW1l VmlldygpKQotICAgICAgICByZXR1cm47Ci0KICAgICAvLyBDaGVjayBmb3I6Ci0gICAgLy8gMSkg ZGlzcGxheTpub25lIG9yIHZpc2liaWxpdHk6aGlkZGVuIHNldCB0byBzZWxmIG9yIGluaGVyaXRl ZC4KLSAgICAvLyAyKSBvdmVyZmxvd3steCwteX06IGhpZGRlbjsKLSAgICAvLyAzKSBzY3JvbGxp bmc6IG5vOwotCi0gICAgLy8gQ292ZXJzICMxLgotICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCog b3duZXIgPSBtX2ZyYW1lLT5vd25lckVsZW1lbnQoKTsKLSAgICBpZiAoIW93bmVyIHx8ICFvd25l ci0+cmVuZGVyZXIoKSB8fCAhb3duZXItPnJlbmRlcmVyKCktPnZpc2libGVUb0hpdFRlc3Rpbmco KSkgewotICAgICAgICBwYXJlbnRGcmFtZVZpZXcoKS0+cmVtb3ZlU2Nyb2xsYWJsZUFyZWEodGhp cyk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgLy8gMSkgSWYgdGhlcmUgYW4gYWN0dWFs IG92ZXJmbG93LgorICAgIC8vIDIpIGRpc3BsYXk6bm9uZSBvciB2aXNpYmlsaXR5OmhpZGRlbiBz ZXQgdG8gc2VsZiBvciBpbmhlcml0ZWQuCisgICAgLy8gMykgb3ZlcmZsb3d7LXgsLXl9OiBoaWRk ZW47CisgICAgLy8gNCkgc2Nyb2xsaW5nOiBubzsKIAorICAgIC8vIENvdmVycyAjMQogICAgIElu dFNpemUgY29udGVudFNpemUgPSBjb250ZW50c1NpemUoKTsKICAgICBJbnRTaXplIHZpc2libGVD b250ZW50U2l6ZSA9IHZpc2libGVDb250ZW50UmVjdCgpLnNpemUoKTsKLSAgICBpZiAoKGNvbnRl bnRTaXplLmhlaWdodCgpIDw9IHZpc2libGVDb250ZW50U2l6ZS5oZWlnaHQoKSAmJiBjb250ZW50 U2l6ZS53aWR0aCgpIDw9IHZpc2libGVDb250ZW50U2l6ZS53aWR0aCgpKSkgewotICAgICAgICBw YXJlbnRGcmFtZVZpZXcoKS0+cmVtb3ZlU2Nyb2xsYWJsZUFyZWEodGhpcyk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CisgICAgaWYgKChjb250ZW50U2l6ZS5oZWlnaHQoKSA8PSB2aXNpYmxlQ29u dGVudFNpemUuaGVpZ2h0KCkgJiYgY29udGVudFNpemUud2lkdGgoKSA8PSB2aXNpYmxlQ29udGVu dFNpemUud2lkdGgoKSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIENvdmVycyAj Mi4KKyAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyID0gbV9mcmFtZS0+b3duZXJFbGVt ZW50KCk7CisgICAgaWYgKG93bmVyICYmICghb3duZXItPnJlbmRlcmVyKCkgfHwgIW93bmVyLT5y ZW5kZXJlcigpLT52aXNpYmxlVG9IaXRUZXN0aW5nKCkpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICAvLyBDb3ZlciAjMiBhbmQgIzMuCisgICAgLy8gQ292ZXIgIzMgYW5kICM0LgogICAg IFNjcm9sbGJhck1vZGUgaG9yaXpvbnRhbE1vZGU7CiAgICAgU2Nyb2xsYmFyTW9kZSB2ZXJ0aWNh bE1vZGU7CiAgICAgY2FsY3VsYXRlU2Nyb2xsYmFyTW9kZXNGb3JMYXlvdXQoaG9yaXpvbnRhbE1v ZGUsIHZlcnRpY2FsTW9kZSwgUnVsZXNGcm9tV2ViQ29udGVudE9ubHkpOwotICAgIGlmIChob3Jp em9udGFsTW9kZSA9PSBTY3JvbGxiYXJBbHdheXNPZmYgJiYgdmVydGljYWxNb2RlID09IFNjcm9s bGJhckFsd2F5c09mZikgewotICAgICAgICBwYXJlbnRGcmFtZVZpZXcoKS0+cmVtb3ZlU2Nyb2xs YWJsZUFyZWEodGhpcyk7CisgICAgaWYgKGhvcml6b250YWxNb2RlID09IFNjcm9sbGJhckFsd2F5 c09mZiAmJiB2ZXJ0aWNhbE1vZGUgPT0gU2Nyb2xsYmFyQWx3YXlzT2ZmKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9pZCBGcmFtZVZpZXc6OnVwZGF0 ZVNjcm9sbGFibGVBcmVhU2V0KCkKK3sKKyAgICAvLyBUaGF0IGVuc3VyZXMgdGhhdCBvbmx5IGlu bmVyIGZyYW1lcyBhcmUgY2FjaGVkLgorICAgIEZyYW1lVmlldyogcGFyZW50RnJhbWVWaWV3ID0g dGhpcy0+cGFyZW50RnJhbWVWaWV3KCk7CisgICAgaWYgKCFwYXJlbnRGcmFtZVZpZXcpCisgICAg ICAgIHJldHVybjsKKworICAgIGlmICghaXNTY3JvbGxhYmxlKCkpIHsKKyAgICAgICAgcGFyZW50 RnJhbWVWaWV3LT5yZW1vdmVTY3JvbGxhYmxlQXJlYSh0aGlzKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIHBhcmVudEZyYW1lVmlldygpLT5hZGRTY3JvbGxhYmxlQXJlYSh0aGlzKTsK KyAgICBwYXJlbnRGcmFtZVZpZXctPmFkZFNjcm9sbGFibGVBcmVhKHRoaXMpOwogfQogCiBib29s IEZyYW1lVmlldzo6c2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKaW5kZXggNDJjNGMzNC4uM2Y0MzI1ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oCkBAIC00NDMsNiArNDQzLDcgQEAgcHJpdmF0ZToKICNlbmRpZgogI2VuZGlmCiAKKyAg ICBib29sIGlzU2Nyb2xsYWJsZSgpOwogICAgIHZvaWQgdXBkYXRlU2Nyb2xsYWJsZUFyZWFTZXQo KTsKIAogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlQYWdlVGhhdENvbnRlbnRBcmVhV2lsbFBhaW50 KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwCmluZGV4IDM3YmI2NTEuLmQ0OWIwMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xNzkxLDggKzE3 OTEsOCBAQCBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0Zv clNjcm9sbGFibGVGcmFtZSgpIGNvbnN0CiAgICAgLy8gTmVlZCB0aGlzIGRvbmUgZmlyc3QgdG8g ZGV0ZXJtaW5lIG92ZXJmbG93LgogICAgIEFTU0VSVCghbV9yZW5kZXJWaWV3LT5uZWVkc0xheW91 dCgpKTsKIAotICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcgPSBtX3JlbmRlclZpZXctPmZyYW1l VmlldygpOwotICAgIHJldHVybiBzY3JvbGxWaWV3LT52ZXJ0aWNhbFNjcm9sbGJhcigpIHx8IHNj cm9sbFZpZXctPmhvcml6b250YWxTY3JvbGxiYXIoKTsKKyAgICBGcmFtZVZpZXcqIGZyYW1lVmll dyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7CisgICAgcmV0dXJuIGZyYW1lVmlldy0+aXNT Y3JvbGxhYmxlKCk7CiB9CiAKIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0Nv bXBvc2l0aW5nRm9yVHJhbnNmb3JtKFJlbmRlck9iamVjdCogcmVuZGVyZXIpIGNvbnN0Ci0tIAox LjcuMTAuNAoK 179049 2012-12-12 08:18:57 -0800 2012-12-19 11:33:29 -0800 (landed r138183, r=smfr) patch 3 (actual) - addressed simon's comments 0001-Make-RenderLayerCompositor-requiresCompositingForScr.patch text/plain 7583 tonikitoo RnJvbSAxY2U1YjljN2JhNGZhZDljYmU3NTgwZmVmZDRmMWNmOTRmY2I4MTJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhMS5nb21lc0BzaXNhLnNhbXN1bmcu Y29tPgpEYXRlOiBXZWQsIDEyIERlYyAyMDEyIDExOjM5OjMwIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gTWFrZQogUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yU2Ny b2xsYWJsZUZyYW1lCiBzY3JvbGxiYXJzIGFnbm9zdGljCiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTc5MDMKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpQYXRj aCBieSBBbnRvbmlvIEdvbWVzIDxhMS5nb21lc0BzaXNhLnNhbXN1bmcuY29tPgoKU29tZSBwb3J0 cyAoaW5jbHVkaW5nIFF0LXdrMSBhbmQgQmxhY2tCZXJyeSkgYWxsb3cgZGlzYWJsaW5nCnNjcm9s bGJhcnMgYXQgRnJhbWVWaWV3IGNyZWF0aW9uIGxldmVsLiBSZWdhcmRsZXNzIHRoZSBzY3JvbGxi YXJzCnByZXNlbmNlIHRob3VnaCwgdGhlaXIgZnJhbWUncyBjb250ZW50IGNhbiBzdGlsbCBiZSBz Y3JvbGxlZCBhcyBuZWVkZWQuClRoZSBzYWlkLCBjaGVja2luZyBmb3IgdGhlIHNjcm9sbGJhcnMg cHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lCnRoZSBzY3JvbGxhYmlsaXR5IG9mIGFuIGlu bmVyIGZyYW1lIGlzIGZsYWt5LCBhcyBkb25lIGluIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVx dWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVGcmFtZS4KCkluc3RlYWQsIHRoZSBwYXRjaCBm YWN0b3JzIG91dCBwYXJ0IG9mIHRoZSBsb2dpYyBpbgpGcmFtZVZpZXc6OnVwZGF0ZVNjcm9sbGFi bGVBcmVhU2V0IGludG8gYSBuZXcgOjppc1Njcm9sbGFibGUgbWV0aG9kLgpUaGUgbGF0ZXIgY2Fu IGJlIHVzZWQgdG8gY2hlY2sgdGhlIHNjcm9sbGFiaWxpdHkgb2YgYSBnaXZlbiBGcmFtZVZpZXcu CgpObyBuZXcgdGVzdHMgYWRkZWQsIHNpbmNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZTog cG9ydHMgbGlrZSBDaHJvbWl1bSBhbmQgb3RoZXJzCndobyBjdXJyZW50bHkgY2hlY2sgZm9yIHRo ZSBzY3JvbGxiYXJzIHByZXNlbmNlIGluIG9yZGVyIHRvIGRldGVybWluZQphbiBpbm5lciBmcmFt ZSBzY3JvbGxhYmlsaXR5IHNob3VsZCBub3QgYmUgYWZmZWN0ZWQuCgoqIHBhZ2UvRnJhbWVWaWV3 LmNwcDoKKFdlYkNvcmU6OkZyYW1lVmlldzo6aXNTY3JvbGxhYmxlKToKKFdlYkNvcmUpOgooV2Vi Q29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCk6CiogcGFnZS9GcmFtZVZp ZXcuaDoKKEZyYW1lVmlldyk6CiogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6 CihXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JT Y3JvbGxhYmxlRnJhbWUpOgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAzMCArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwICAgICAgICAgICAgICAgICAgfCAgIDUzICsrKysrKysrKysrLS0tLS0tLS0t CiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oICAgICAgICAgICAgICAgICAgICB8ICAg IDIgKwogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAg fCAgICA0ICstCiA0IGZpbGVzIGNoYW5nZWQsIDY0IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA3ZDQwYTYxLi43ZmY0MjUzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzMgQEAKKzIwMTItMTItMTIgIEFudG9uaW8gR29tZXMgIDxhMS5nb21lc0BzaXNhLnNhbXN1 bmcuY29tPgorCisgICAgICAgIE1ha2UgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0Nv bXBvc2l0aW5nRm9yU2Nyb2xsYWJsZUZyYW1lIHNjcm9sbGJhcnMgYWdub3N0aWMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3OTAzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU29tZSBwb3J0cyAoaW5jbHVk aW5nIFF0LXdrMSBhbmQgQmxhY2tCZXJyeSkgYWxsb3cgZGlzYWJsaW5nCisgICAgICAgIHNjcm9s bGJhcnMgYXQgRnJhbWVWaWV3IGNyZWF0aW9uIGxldmVsLiBSZWdhcmRsZXNzIHRoZSBzY3JvbGxi YXJzCisgICAgICAgIHByZXNlbmNlIHRob3VnaCwgdGhlaXIgZnJhbWUncyBjb250ZW50IGNhbiBz dGlsbCBiZSBzY3JvbGxlZCBhcyBuZWVkZWQuCisgICAgICAgIFRoZSBzYWlkLCBjaGVja2luZyBm b3IgdGhlIHNjcm9sbGJhcnMgcHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lCisgICAgICAg IHRoZSBzY3JvbGxhYmlsaXR5IG9mIGFuIGlubmVyIGZyYW1lIGlzIGZsYWt5LCBhcyBkb25lIGlu IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclNjcm9sbGFibGVG cmFtZS4KKworICAgICAgICBJbnN0ZWFkLCB0aGUgcGF0Y2ggZmFjdG9ycyBvdXQgcGFydCBvZiB0 aGUgbG9naWMgaW4KKyAgICAgICAgRnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCBp bnRvIGEgbmV3IDo6aXNTY3JvbGxhYmxlIG1ldGhvZC4KKyAgICAgICAgVGhlIGxhdGVyIGNhbiBi ZSB1c2VkIHRvIGNoZWNrIHRoZSBzY3JvbGxhYmlsaXR5IG9mIGEgZ2l2ZW4gRnJhbWVWaWV3Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBhZGRlZCwgc2luY2UgdGhlcmUgaXMgbm8gYmVoYXZpb3Ig Y2hhbmdlOiBwb3J0cyBsaWtlIENocm9taXVtIGFuZCBvdGhlcnMKKyAgICAgICAgd2hvIGN1cnJl bnRseSBjaGVjayBmb3IgdGhlIHNjcm9sbGJhcnMgcHJlc2VuY2UgaW4gb3JkZXIgdG8gZGV0ZXJt aW5lCisgICAgICAgIGFuIGlubmVyIGZyYW1lIHNjcm9sbGFiaWxpdHkgc2hvdWxkIG5vdCBiZSBh ZmZlY3RlZC4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6aXNTY3JvbGxhYmxlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldCk6CisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKEZyYW1lVmlldyk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JTY3JvbGxhYmxlRnJhbWUp OgorCiAyMDEyLTEyLTEwICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBpbi1iYW5kIHRleHQgdHJhY2tzIHRvIE1hYyBwb3J0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMjlkOTJjOS4uZjk2NjFjNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMjgxNiw0MSArMjgxNiw0OCBAQCBJbnRSZWN0IEZy YW1lVmlldzo6c2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0JveCgpIGNvbnN0CiAgICAgcmV0dXJuIGZy YW1lUmVjdCgpOwogfQogCi12b2lkIEZyYW1lVmlldzo6dXBkYXRlU2Nyb2xsYWJsZUFyZWFTZXQo KQorYm9vbCBGcmFtZVZpZXc6OmlzU2Nyb2xsYWJsZSgpCiB7Ci0gICAgLy8gVGhhdCBlbnN1cmVz IHRoYXQgb25seSBpbm5lciBmcmFtZXMgYXJlIGNhY2hlZC4KLSAgICBpZiAoIXBhcmVudEZyYW1l VmlldygpKQotICAgICAgICByZXR1cm47Ci0KICAgICAvLyBDaGVjayBmb3I6Ci0gICAgLy8gMSkg ZGlzcGxheTpub25lIG9yIHZpc2liaWxpdHk6aGlkZGVuIHNldCB0byBzZWxmIG9yIGluaGVyaXRl ZC4KLSAgICAvLyAyKSBvdmVyZmxvd3steCwteX06IGhpZGRlbjsKLSAgICAvLyAzKSBzY3JvbGxp bmc6IG5vOwotCi0gICAgLy8gQ292ZXJzICMxLgotICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCog b3duZXIgPSBtX2ZyYW1lLT5vd25lckVsZW1lbnQoKTsKLSAgICBpZiAoIW93bmVyIHx8ICFvd25l ci0+cmVuZGVyZXIoKSB8fCAhb3duZXItPnJlbmRlcmVyKCktPnZpc2libGVUb0hpdFRlc3Rpbmco KSkgewotICAgICAgICBwYXJlbnRGcmFtZVZpZXcoKS0+cmVtb3ZlU2Nyb2xsYWJsZUFyZWEodGhp cyk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgLy8gMSkgSWYgdGhlcmUgYW4gYWN0dWFs IG92ZXJmbG93LgorICAgIC8vIDIpIGRpc3BsYXk6bm9uZSBvciB2aXNpYmlsaXR5OmhpZGRlbiBz ZXQgdG8gc2VsZiBvciBpbmhlcml0ZWQuCisgICAgLy8gMykgb3ZlcmZsb3d7LXgsLXl9OiBoaWRk ZW47CisgICAgLy8gNCkgc2Nyb2xsaW5nOiBubzsKIAorICAgIC8vIENvdmVycyAjMQogICAgIElu dFNpemUgY29udGVudFNpemUgPSBjb250ZW50c1NpemUoKTsKICAgICBJbnRTaXplIHZpc2libGVD b250ZW50U2l6ZSA9IHZpc2libGVDb250ZW50UmVjdCgpLnNpemUoKTsKLSAgICBpZiAoKGNvbnRl bnRTaXplLmhlaWdodCgpIDw9IHZpc2libGVDb250ZW50U2l6ZS5oZWlnaHQoKSAmJiBjb250ZW50 U2l6ZS53aWR0aCgpIDw9IHZpc2libGVDb250ZW50U2l6ZS53aWR0aCgpKSkgewotICAgICAgICBw YXJlbnRGcmFtZVZpZXcoKS0+cmVtb3ZlU2Nyb2xsYWJsZUFyZWEodGhpcyk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CisgICAgaWYgKChjb250ZW50U2l6ZS5oZWlnaHQoKSA8PSB2aXNpYmxlQ29u dGVudFNpemUuaGVpZ2h0KCkgJiYgY29udGVudFNpemUud2lkdGgoKSA8PSB2aXNpYmxlQ29udGVu dFNpemUud2lkdGgoKSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIENvdmVycyAj Mi4KKyAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyID0gbV9mcmFtZS0+b3duZXJFbGVt ZW50KCk7CisgICAgaWYgKG93bmVyICYmICghb3duZXItPnJlbmRlcmVyKCkgfHwgIW93bmVyLT5y ZW5kZXJlcigpLT52aXNpYmxlVG9IaXRUZXN0aW5nKCkpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICAvLyBDb3ZlciAjMiBhbmQgIzMuCisgICAgLy8gQ292ZXIgIzMgYW5kICM0LgogICAg IFNjcm9sbGJhck1vZGUgaG9yaXpvbnRhbE1vZGU7CiAgICAgU2Nyb2xsYmFyTW9kZSB2ZXJ0aWNh bE1vZGU7CiAgICAgY2FsY3VsYXRlU2Nyb2xsYmFyTW9kZXNGb3JMYXlvdXQoaG9yaXpvbnRhbE1v ZGUsIHZlcnRpY2FsTW9kZSwgUnVsZXNGcm9tV2ViQ29udGVudE9ubHkpOwotICAgIGlmIChob3Jp em9udGFsTW9kZSA9PSBTY3JvbGxiYXJBbHdheXNPZmYgJiYgdmVydGljYWxNb2RlID09IFNjcm9s bGJhckFsd2F5c09mZikgewotICAgICAgICBwYXJlbnRGcmFtZVZpZXcoKS0+cmVtb3ZlU2Nyb2xs YWJsZUFyZWEodGhpcyk7CisgICAgaWYgKGhvcml6b250YWxNb2RlID09IFNjcm9sbGJhckFsd2F5 c09mZiAmJiB2ZXJ0aWNhbE1vZGUgPT0gU2Nyb2xsYmFyQWx3YXlzT2ZmKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9pZCBGcmFtZVZpZXc6OnVwZGF0 ZVNjcm9sbGFibGVBcmVhU2V0KCkKK3sKKyAgICAvLyBUaGF0IGVuc3VyZXMgdGhhdCBvbmx5IGlu bmVyIGZyYW1lcyBhcmUgY2FjaGVkLgorICAgIEZyYW1lVmlldyogcGFyZW50RnJhbWVWaWV3ID0g dGhpcy0+cGFyZW50RnJhbWVWaWV3KCk7CisgICAgaWYgKCFwYXJlbnRGcmFtZVZpZXcpCisgICAg ICAgIHJldHVybjsKKworICAgIGlmICghaXNTY3JvbGxhYmxlKCkpIHsKKyAgICAgICAgcGFyZW50 RnJhbWVWaWV3LT5yZW1vdmVTY3JvbGxhYmxlQXJlYSh0aGlzKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIHBhcmVudEZyYW1lVmlldygpLT5hZGRTY3JvbGxhYmxlQXJlYSh0aGlzKTsK KyAgICBwYXJlbnRGcmFtZVZpZXctPmFkZFNjcm9sbGFibGVBcmVhKHRoaXMpOwogfQogCiBib29s IEZyYW1lVmlldzo6c2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKaW5kZXggNDJjNGMzNC4uMmRlZjcyYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oCkBAIC0zMTAsNiArMzEwLDggQEAgcHVibGljOgogCiAgICAgYm9vbCBpc0ZyYW1lVmll d1Njcm9sbENvcm5lcihSZW5kZXJTY3JvbGxiYXJQYXJ0KiBzY3JvbGxDb3JuZXIpIGNvbnN0IHsg cmV0dXJuIG1fc2Nyb2xsQ29ybmVyID09IHNjcm9sbENvcm5lcjsgfQogCisgICAgYm9vbCBpc1Nj cm9sbGFibGUoKTsKKwogICAgIGVudW0gU2Nyb2xsYmFyTW9kZXNDYWxjdWxhdGlvblN0cmF0ZWd5 IHsgUnVsZXNGcm9tV2ViQ29udGVudE9ubHksIEFueVJ1bGUgfTsKICAgICB2b2lkIGNhbGN1bGF0 ZVNjcm9sbGJhck1vZGVzRm9yTGF5b3V0KFNjcm9sbGJhck1vZGUmIGhNb2RlLCBTY3JvbGxiYXJN b2RlJiB2TW9kZSwgU2Nyb2xsYmFyTW9kZXNDYWxjdWxhdGlvblN0cmF0ZWd5ID0gQW55UnVsZSk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRv ci5jcHAKaW5kZXggMzdiYjY1MS4uZDQ5YjAxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTE3OTEsOCArMTc5MSw4IEBA IGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yU2Nyb2xs YWJsZUZyYW1lKCkgY29uc3QKICAgICAvLyBOZWVkIHRoaXMgZG9uZSBmaXJzdCB0byBkZXRlcm1p bmUgb3ZlcmZsb3cuCiAgICAgQVNTRVJUKCFtX3JlbmRlclZpZXctPm5lZWRzTGF5b3V0KCkpOwog Ci0gICAgU2Nyb2xsVmlldyogc2Nyb2xsVmlldyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7 Ci0gICAgcmV0dXJuIHNjcm9sbFZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkgfHwgc2Nyb2xsVmll dy0+aG9yaXpvbnRhbFNjcm9sbGJhcigpOworICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV9y ZW5kZXJWaWV3LT5mcmFtZVZpZXcoKTsKKyAgICByZXR1cm4gZnJhbWVWaWV3LT5pc1Njcm9sbGFi bGUoKTsKIH0KIAogYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRp bmdGb3JUcmFuc2Zvcm0oUmVuZGVyT2JqZWN0KiByZW5kZXJlcikgY29uc3QKLS0gCjEuNy4xMC40 Cgo=