29826 2009-09-28 14:19:35 -0700 Add support for run-time flag for 3D canvas 2009-12-15 14:42:04 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P3 Normal --- 0 kbr kbr cmarrin dglazkov kbr oldest_to_newest 150651 0 kbr 2009-09-28 14:19:35 -0700 In order to enable experimental WebGL support in the nightly builds of the Chromium browser, a run-time flag is needed to cover the functionality. The attached patch adds the necessary infrastructure to the Settings class, and sets the flag to true in the Mac and Windows WebView classes when 3D_CANVAS is enabled in the build. Built and tested on Mac OS X with --3d-canvas both enabled and disabled to verify no build breakage and that the 3D canvas functionality continues to work as expected. 150655 1 40259 kbr 2009-09-28 14:27:29 -0700 Created attachment 40259 Patch adding run-time flag covering 3D canvas functionality. 150787 2 cmarrin 2009-09-28 20:21:37 -0700 The use of the WebGL .exp file here is needed in order to allow the runtime flag conditional on the ENABLE_3D_CANVAS compile time flag. You could also have the runtime flag always exist, like we did for the acceleratedCompositingEnabled runtime flag, while the functionality itself is conditionally compiled. That would allow you to get rid of the WebGL .exp file. 150795 3 40259 dglazkov 2009-09-28 21:34:02 -0700 Comment on attachment 40259 Patch adding run-time flag covering 3D canvas functionality. Mostly procedural nits. > +2009-09-28 Kenneth Russell <kbr@google.com> > + > + Reviewed by dglazkov@chromium.org(?), cmarrin@apple.com(?). You probably shouldn't remove the OOPS from here until reviewed. The pre-commit hook makes it your last line of defense. However -- you don't have a commit bit, so my point is Moooo-t :) > + > + Add support for run-time flag for 3D canvas > + https://bugs.webkit.org/show_bug.cgi?id=29826 > + > + * DerivedSources.make: Conditionally add > + Settings::setExperimentalWebGLEnabled to exported symbol list. Weird indentation here. Tabs maybe? > + * WebCore.WebGL.exp: Added. > + * html/HTMLCanvasElement.cpp: > + (WebCore::HTMLCanvasElement::getContext): Check page settings for > + experimental WebGL flag before returning 3D graphics context. Ditto. > + > + * WebView/WebView.mm: > + (-[WebView _preferencesChangedNotification:]): Enable experimental > + WebGL flag when 3D_CANVAS is enabled in the build. Ditto. > > +#if ENABLE(3D_CANVAS) > + settings->setExperimentalWebGLEnabled(true); > +#endif // ENABLE(3D_CANVAS) I didn't realize Win was a supported platform. If it's not, should we do this for all other ports, then? 150957 4 40311 kbr 2009-09-29 10:53:16 -0700 Created attachment 40311 Revised patch @Chris Marrin: > The use of the WebGL .exp file here is needed in order to allow the runtime > flag conditional on the ENABLE_3D_CANVAS compile time flag. You could also have > the runtime flag always exist, like we did for the > acceleratedCompositingEnabled runtime flag, while the functionality itself is > conditionally compiled. That would allow you to get rid of the WebGL .exp file. That would simplify both this addition and its eventual removal once the WebGL specification is finalized. Done. @Dimitri Glazkov: > You probably shouldn't remove the OOPS from here until reviewed. The pre-commit > hook makes it your last line of defense. Done. > Weird indentation here. Tabs maybe? Yes, I didn't have tabs-as-spaces set for Change Log mode. Fixed. > I didn't realize Win was a supported platform. If it's not, should we do this > for all other ports, then? Right now Safari only supports WebGL on Mac OS X, but I'm assuming Apple will port it to Windows in the near future. I would prefer to leave the other ports alone since the mechanism by which this flag is set will have to change depending on how the browser vendor wants to expose it. 150961 5 40311 dglazkov 2009-09-29 10:58:22 -0700 Comment on attachment 40311 Revised patch r=me. 150988 6 40311 commit-queue 2009-09-29 12:03:52 -0700 Comment on attachment 40311 Revised patch Rejecting patch 40311 from commit-queue. Patch https://bugs.webkit.org/attachment.cgi?id=40311 from bug 29826 failed to download and apply. 151002 7 40317 kbr 2009-09-29 12:40:04 -0700 Created attachment 40317 Updated patch after merging with trunk These files changed in trunk yesterday. Updated and merged. 151007 8 dglazkov 2009-09-29 12:50:47 -0700 Landed as http://trac.webkit.org/changeset/48893. 151108 9 mrowe 2009-09-29 17:10:50 -0700 There's some weird line breaking and extra parentheses added by this patch. 151123 10 kbr 2009-09-29 17:50:30 -0700 (In reply to comment #9) > There's some weird line breaking and extra parentheses added by this patch. Where do you mean? 40259 2009-09-28 14:27:29 -0700 2009-09-29 10:53:16 -0700 Patch adding run-time flag covering 3D canvas functionality. 3d-canvas-runtime-flag.patch text/plain 7697 kbr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODgzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDktMjggIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IGRnbGF6a292QGNocm9taXVtLm9yZyg/KSwgY21h cnJpbkBhcHBsZS5jb20oPykuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHJ1bi10aW1lIGZs YWcgZm9yIDNEIGNhbnZhcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mjk4MjYKKworICAgICAgICAqIERlcml2ZWRTb3VyY2VzLm1ha2U6IENvbmRpdGlv bmFsbHkgYWRkCisJU2V0dGluZ3M6OnNldEV4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZCB0byBleHBv cnRlZCBzeW1ib2wgbGlzdC4KKyAgICAgICAgKiBXZWJDb3JlLldlYkdMLmV4cDogQWRkZWQuCisg ICAgICAgICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI VE1MQ2FudmFzRWxlbWVudDo6Z2V0Q29udGV4dCk6IENoZWNrIHBhZ2Ugc2V0dGluZ3MgZm9yCisJ ZXhwZXJpbWVudGFsIFdlYkdMIGZsYWcgYmVmb3JlIHJldHVybmluZyAzRCBncmFwaGljcyBjb250 ZXh0LgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0 dGluZ3M6OlNldHRpbmdzKTogSW5pdGlhbGl6ZSBuZXcgZmxhZyB0byBmYWxzZS4KKyAgICAgICAg KFdlYkNvcmU6OlNldHRpbmdzOjpzZXRFeHBlcmltZW50YWxXZWJHTEVuYWJsZWQpOgorICAgICAg ICAqIHBhZ2UvU2V0dGluZ3MuaDogU2V0IG5ldyBmbGFnLgorICAgICAgICAoV2ViQ29yZTo6U2V0 dGluZ3M6OmV4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZCk6IFJldHVybiBuZXcgZmxhZy4KKwogMjAw OS0wOS0yOCAgTWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUg YnVpbGQgYnkgZG9pbmcgc29tZXRoaW5nIGFwcHJveGltYXRpbmcgcmVhc29uYWJsZW5lc3MgaW4g dGhlIFhjb2RlIHByb2plY3QuCkluZGV4OiBXZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9EZXJpdmVkU291cmNlcy5tYWtlCShyZXZpc2lvbiA0ODgyMSkK KysrIFdlYkNvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQkod29ya2luZyBjb3B5KQpAQCAtODM0LDYg KzgzNCwxMCBAQCBpZmVxICgkKGZpbmRzdHJpbmcgRU5BQkxFX1BMVUdJTl9QUk9YWV9GCiAgICAg IFdFQkNPUkVfRVhQT1JUX0RFUEVOREVOQ0lFUyA6PSAkKFdFQkNPUkVfRVhQT1JUX0RFUEVOREVO Q0lFUykgV2ViQ29yZS5WaWRlb1Byb3h5LmV4cAogZW5kaWYKIAoraWZlcSAoJChmaW5kc3RyaW5n IEVOQUJMRV8zRF9DQU5WQVMsJChGRUFUVVJFX0RFRklORVMpKSwgRU5BQkxFXzNEX0NBTlZBUykK KyAgICBXRUJDT1JFX0VYUE9SVF9ERVBFTkRFTkNJRVMgOj0gJChXRUJDT1JFX0VYUE9SVF9ERVBF TkRFTkNJRVMpIFdlYkNvcmUuV2ViR0wuZXhwCitlbmRpZgorCiBXZWJDb3JlLmV4cCA6IFdlYkNv cmUuYmFzZS5leHAgJChXRUJDT1JFX0VYUE9SVF9ERVBFTkRFTkNJRVMpCiAJY2F0ICReID4gJEAK IApJbmRleDogV2ViQ29yZS9XZWJDb3JlLldlYkdMLmV4cAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L1dlYkNvcmUuV2ViR0wuZXhwCShyZXZpc2lvbiAwKQorKysgV2ViQ29yZS9XZWJDb3JlLldlYkdM LmV4cAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAorX19aTjdXZWJDb3JlOFNldHRpbmdzMjdz ZXRFeHBlcmltZW50YWxXZWJHTEVuYWJsZWRFYgpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1l bnQuY3BwCShyZXZpc2lvbiA0ODgyMSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NSwxNyArMTY1LDIwIEBAIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQqIEhUTUxDYW52YXNFbGVtZW4KICAgICAgICAgcmV0dXJuIG1fY29udGV4dC5nZXQo KTsKICAgICB9CiAjaWYgRU5BQkxFKDNEX0NBTlZBUykgICAgCi0gICAgaWYgKCh0eXBlID09ICJ3 ZWJraXQtM2QiKSB8fAotICAgICAgICAodHlwZSA9PSAiR0wiKSkgewotICAgICAgICBpZiAobV9j b250ZXh0ICYmICFtX2NvbnRleHQtPmlzM2QoKSkKLSAgICAgICAgICAgIHJldHVybiAwOwotICAg ICAgICBpZiAoIW1fY29udGV4dCkgewotICAgICAgICAgICAgbV9jb250ZXh0ID0gbmV3IENhbnZh c1JlbmRlcmluZ0NvbnRleHQzRCh0aGlzKTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgLy8g TmVlZCB0byBtYWtlIHN1cmUgYSBSZW5kZXJMYXllciBhbmQgY29tcG9zaXRpbmcgbGF5ZXIgZ2V0 IGNyZWF0ZWQgZm9yIHRoZSBDYW52YXMKLSAgICAgICAgICAgIHNldE5lZWRzU3R5bGVSZWNhbGMo U3ludGhldGljU3R5bGVDaGFuZ2UpOworICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50 KCktPnNldHRpbmdzKCk7CisgICAgaWYgKHNldHRpbmdzICYmIHNldHRpbmdzLT5leHBlcmltZW50 YWxXZWJHTEVuYWJsZWQoKSkgeworICAgICAgICBpZiAoKHR5cGUgPT0gIndlYmtpdC0zZCIpIHx8 CisgICAgICAgICAgICAodHlwZSA9PSAiR0wiKSkgeworICAgICAgICAgICAgaWYgKG1fY29udGV4 dCAmJiAhbV9jb250ZXh0LT5pczNkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgICAgICBpZiAoIW1fY29udGV4dCkgeworICAgICAgICAgICAgICAgIG1fY29udGV4dCA9IG5l dyBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0QodGhpcyk7CisKKyAgICAgICAgICAgICAgICAvLyBO ZWVkIHRvIG1ha2Ugc3VyZSBhIFJlbmRlckxheWVyIGFuZCBjb21wb3NpdGluZyBsYXllciBnZXQg Y3JlYXRlZCBmb3IgdGhlIENhbnZhcworICAgICAgICAgICAgICAgIHNldE5lZWRzU3R5bGVSZWNh bGMoU3ludGhldGljU3R5bGVDaGFuZ2UpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0 dXJuIG1fY29udGV4dC5nZXQoKTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4gbV9jb250ZXh0 LmdldCgpOwogICAgIH0KICNlbmRpZgogICAgIHJldHVybiAwOwpJbmRleDogV2ViQ29yZS9wYWdl L1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShy ZXZpc2lvbiA0ODgyMSkKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTExNyw2ICsxMTcsOSBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAg ICAsIG1fYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQodHJ1ZSkKICAgICAsIG1fZXhwZXJp bWVudGFsTm90aWZpY2F0aW9uc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3BsdWdpbkhhbHRlckVu YWJsZWQoZmFsc2UpCisjaWYgRU5BQkxFKDNEX0NBTlZBUykKKyAgICAsIG1fZXhwZXJpbWVudGFs V2ViR0xFbmFibGVkKGZhbHNlKQorI2VuZGlmCiB7CiAgICAgLy8gQSBGcmFtZSBtYXkgbm90IGhh dmUgYmVlbiBjcmVhdGVkIHlldCwgc28gd2UgaW5pdGlhbGl6ZSB0aGUgQXRvbWljU3RyaW5nIAog ICAgIC8vIGhhc2ggYmVmb3JlIHRyeWluZyB0byB1c2UgaXQuCkBAIC01MjgsNCArNTMxLDExIEBA IHZvaWQgU2V0dGluZ3M6OnNldFNob3VsZFVzZUhpZ2hSZXNvbHV0aW8KIH0KICNlbmRpZgogCisj aWYgRU5BQkxFKDNEX0NBTlZBUykKK3ZvaWQgU2V0dGluZ3M6OnNldEV4cGVyaW1lbnRhbFdlYkdM RW5hYmxlZChib29sIGVuYWJsZWQpCit7CisgICAgbV9leHBlcmltZW50YWxXZWJHTEVuYWJsZWQg PSBlbmFibGVkOworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdl YkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9TZXR0aW5n cy5oCShyZXZpc2lvbiA0ODgyMSkKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNjcsNiArMjY3LDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg dm9pZCBzZXRQbHVnaW5BbGxvd2VkUnVuVGltZSh1bnNpZ25lZCk7CiAgICAgICAgIHVuc2lnbmVk IHBsdWdpbkFsbG93ZWRSdW5UaW1lKCkgY29uc3QgeyByZXR1cm4gbV9wbHVnaW5BbGxvd2VkUnVu VGltZTsgfQogCisjaWYgRU5BQkxFKDNEX0NBTlZBUykKKyAgICAgICAgLy8gVGhpcyBydW4tdGlt ZSBmbGFnIGlzIG9ubHkgdGVtcG9yYXJ5IHdoaWxlIHRoZSBXZWJHTAorICAgICAgICAvLyBzcGVj aWZpY2F0aW9uIGlzIGJlaW5nIGRldmVsb3BlZC4KKyAgICAgICAgdm9pZCBzZXRFeHBlcmltZW50 YWxXZWJHTEVuYWJsZWQoYm9vbCk7CisgICAgICAgIGJvb2wgZXhwZXJpbWVudGFsV2ViR0xFbmFi bGVkKCkgY29uc3QgeyByZXR1cm4gbV9leHBlcmltZW50YWxXZWJHTEVuYWJsZWQ7IH0KKyNlbmRp ZgorCiAgICAgcHJpdmF0ZToKICAgICAgICAgUGFnZSogbV9wYWdlOwogICAgICAgICAKQEAgLTM0 MSw2ICszNDgsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2lmIFBMQVRGT1JNKFdJTikgfHwg KFBMQVRGT1JNKFdJTl9PUykgJiYgUExBVEZPUk0oV1gpKQogICAgICAgICBzdGF0aWMgYm9vbCBn U2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnM7CiAjZW5kaWYKKworI2lmIEVOQUJMRSgzRF9D QU5WQVMpCisgICAgICAgIGJvb2wgbV9leHBlcmltZW50YWxXZWJHTEVuYWJsZWQgOiAxOworI2Vu ZGlmCiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViS2l0L21hYy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ4 ODMyKQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NCBAQAorMjAwOS0wOS0yOCAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgZGdsYXprb3ZAY2hyb21pdW0ub3JnKD8pLCBjbWFycmluQGFwcGxl LmNvbSg/KS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgcnVuLXRpbWUgZmxhZyBmb3IgM0Qg Y2FudmFzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y OTgyNgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3 IF9wcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb246XSk6IEVuYWJsZSBleHBlcmltZW50YWwK KwlXZWJHTCBmbGFnIHdoZW4gM0RfQ0FOVkFTIGlzIGVuYWJsZWQgaW4gdGhlIGJ1aWxkLgorCiAy MDA5LTA5LTI4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlz aW9uIDQ4ODIxKQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29w eSkKQEAgLTEzMTIsNiArMTMxMiw5IEBAIHN0YXRpYyBib29sIGZhc3REb2N1bWVudFRlYXJkb3du RW5hYmxlZCgKICAgICBzZXR0aW5ncy0+c2V0WFNTQXVkaXRvckVuYWJsZWQoW3ByZWZlcmVuY2Vz IGlzWFNTQXVkaXRvckVuYWJsZWRdKTsKICAgICBzZXR0aW5ncy0+c2V0RW5mb3JjZUNTU01JTUVU eXBlSW5TdHJpY3RNb2RlKCFXS0FwcFZlcnNpb25DaGVja0xlc3NUaGFuKEAiY29tLmFwcGxlLmlX ZWIiLCAtMSwgMi4xKSk7CiAgICAgc2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdF bmFibGVkKFtwcmVmZXJlbmNlcyBhY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZF0pOworI2lm IEVOQUJMRSgzRF9DQU5WQVMpCisgICAgc2V0dGluZ3MtPnNldEV4cGVyaW1lbnRhbFdlYkdMRW5h YmxlZCh0cnVlKTsKKyNlbmRpZiAgLy8gRU5BQkxFKDNEX0NBTlZBUykKIH0KIAogc3RhdGljIGlu bGluZSBJTVAgZ2V0TWV0aG9kKGlkIG8sIFNFTCBzKQpJbmRleDogV2ViS2l0L3dpbi9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ4ODMyKQor KysgV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAor MjAwOS0wOS0yOCAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgZGdsYXprb3ZAY2hyb21pdW0ub3JnKD8pLCBjbWFycmluQGFwcGxlLmNvbSg/ KS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgcnVuLXRpbWUgZmxhZyBmb3IgM0QgY2FudmFz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTgyNgor CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3Ojpub3RpZnlQcmVmZXJl bmNlc0NoYW5nZWQpOiBFbmFibGUgZXhwZXJpbWVudGFsIFdlYkdMCisJZmxhZyB3aGVuIDNEX0NB TlZBUyBpcyBlbmFibGVkIGluIHRoZSBidWlsZC4KKwogMjAwOS0wOS0yNSAgRGFyaW4gQWRsZXIg IDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU3RldmUgRmFsa2VuYnVy Zy4KSW5kZXg6IFdlYktpdC93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dp bi9XZWJWaWV3LmNwcAkocmV2aXNpb24gNDg4MjEpCisrKyBXZWJLaXQvd2luL1dlYlZpZXcuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00NDQ3LDYgKzQ0NDcsMTAgQEAgSFJFU1VMVCBXZWJWaWV3Ojpu b3RpZnlQcmVmZXJlbmNlc0NoYW5nZQogICAgICAgICByZXR1cm4gaHI7CiAgICAgc2V0dGluZ3Mt PnNldFBsdWdpbkFsbG93ZWRSdW5UaW1lKHJ1blRpbWUpOwogCisjaWYgRU5BQkxFKDNEX0NBTlZB UykKKyAgICBzZXR0aW5ncy0+c2V0RXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKHRydWUpOworI2Vu ZGlmICAvLyBFTkFCTEUoM0RfQ0FOVkFTKQorCiAgICAgaWYgKCFtX2Nsb3NlV2luZG93VGltZXIu aXNBY3RpdmUoKSkKICAgICAgICAgbV9tYWluRnJhbWUtPmludmFsaWRhdGUoKTsgLy8gRklYTUUK IAo= 40311 2009-09-29 10:53:16 -0700 2009-09-29 12:40:29 -0700 Revised patch 3d-canvas-runtime-flag-2.patch text/plain 7213 kbr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODgzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMDktMjggIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpCisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIHJ1bi10aW1lIGZsYWcgZm9yIDNEIGNhbnZhcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk4MjYKKworICAgICAgICAqIGh0bWwv SFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1l bnQ6OmdldENvbnRleHQpOiBDaGVjayBwYWdlIHNldHRpbmdzIGZvcgorICAgICAgICBleHBlcmlt ZW50YWwgV2ViR0wgZmxhZyBiZWZvcmUgcmV0dXJuaW5nIDNEIGdyYXBoaWNzIGNvbnRleHQuCisg ICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6 U2V0dGluZ3MpOiBJbml0aWFsaXplIG5ldyBmbGFnIHRvIGZhbHNlLgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6OnNldEV4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZCk6CisgICAgICAgICogcGFn ZS9TZXR0aW5ncy5oOiBTZXQgbmV3IGZsYWcuCisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6 ZXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKTogUmV0dXJuIG5ldyBmbGFnLgorCiAyMDA5LTA5LTI4 ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBidWlsZCBi eSBkb2luZyBzb21ldGhpbmcgYXBwcm94aW1hdGluZyByZWFzb25hYmxlbmVzcyBpbiB0aGUgWGNv ZGUgcHJvamVjdC4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAJKHJldmlzaW9uIDQ4ODIxKQorKysgV2ViQ29yZS9X ZWJDb3JlLmJhc2UuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC02MzYsNiArNjM2LDcgQEAgX19aTjdX ZWJDb3JlOFNldHRpbmdzMjVzZXRTaG91bGRQcmludEJhYwogX19aTjdXZWJDb3JlOFNldHRpbmdz MjVzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uRVJLTlNfNEtVUkxFCiBfX1pON1dlYkNvcmU4U2V0 dGluZ3MyNnNldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lRVJLTlNfNlN0cmluZ0UKIF9fWk43V2Vi Q29yZThTZXR0aW5nczI2c2V0TmVlZHNTaXRlU3BlY2lmaWNRdWlya3NFYgorX19aTjdXZWJDb3Jl OFNldHRpbmdzMjdzZXRFeHBlcmltZW50YWxXZWJHTEVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNl dHRpbmdzMjdzZXRGVFBEaXJlY3RvcnlUZW1wbGF0ZVBhdGhFUktOU182U3RyaW5nRQogX19aTjdX ZWJDb3JlOFNldHRpbmdzMjdzZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHlFYgogX19aTjdXZWJD b3JlOFNldHRpbmdzMjdzZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGhFUktOU182U3RyaW5nRQpJ bmRleDogV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCShyZXZpc2lvbiA0ODgyMSkKKysrIFdl YkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NSwx NyArMTY1LDIwIEBAIENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIEhUTUxDYW52YXNFbGVtZW4KICAg ICAgICAgcmV0dXJuIG1fY29udGV4dC5nZXQoKTsKICAgICB9CiAjaWYgRU5BQkxFKDNEX0NBTlZB UykgICAgCi0gICAgaWYgKCh0eXBlID09ICJ3ZWJraXQtM2QiKSB8fAotICAgICAgICAodHlwZSA9 PSAiR0wiKSkgewotICAgICAgICBpZiAobV9jb250ZXh0ICYmICFtX2NvbnRleHQtPmlzM2QoKSkK LSAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICBpZiAoIW1fY29udGV4dCkgewotICAgICAg ICAgICAgbV9jb250ZXh0ID0gbmV3IENhbnZhc1JlbmRlcmluZ0NvbnRleHQzRCh0aGlzKTsKLSAg ICAgICAgICAgIAotICAgICAgICAgICAgLy8gTmVlZCB0byBtYWtlIHN1cmUgYSBSZW5kZXJMYXll ciBhbmQgY29tcG9zaXRpbmcgbGF5ZXIgZ2V0IGNyZWF0ZWQgZm9yIHRoZSBDYW52YXMKLSAgICAg ICAgICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGljU3R5bGVDaGFuZ2UpOworICAgIFNl dHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50KCktPnNldHRpbmdzKCk7CisgICAgaWYgKHNldHRp bmdzICYmIHNldHRpbmdzLT5leHBlcmltZW50YWxXZWJHTEVuYWJsZWQoKSkgeworICAgICAgICBp ZiAoKHR5cGUgPT0gIndlYmtpdC0zZCIpIHx8CisgICAgICAgICAgICAodHlwZSA9PSAiR0wiKSkg eworICAgICAgICAgICAgaWYgKG1fY29udGV4dCAmJiAhbV9jb250ZXh0LT5pczNkKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICBpZiAoIW1fY29udGV4dCkgeworICAg ICAgICAgICAgICAgIG1fY29udGV4dCA9IG5ldyBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0QodGhp cyk7CisKKyAgICAgICAgICAgICAgICAvLyBOZWVkIHRvIG1ha2Ugc3VyZSBhIFJlbmRlckxheWVy IGFuZCBjb21wb3NpdGluZyBsYXllciBnZXQgY3JlYXRlZCBmb3IgdGhlIENhbnZhcworICAgICAg ICAgICAgICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGljU3R5bGVDaGFuZ2UpOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJuIG1fY29udGV4dC5nZXQoKTsKICAgICAgICAg fQotICAgICAgICByZXR1cm4gbV9jb250ZXh0LmdldCgpOwogICAgIH0KICNlbmRpZgogICAgIHJl dHVybiAwOwpJbmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZpc2lvbiA0ODgyMSkKKysrIFdlYkNvcmUvcGFn ZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNyw2ICsxMTcsNyBAQCBTZXR0aW5n czo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Vu YWJsZWQodHJ1ZSkKICAgICAsIG1fZXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0VuYWJsZWQoZmFs c2UpCiAgICAgLCBtX3BsdWdpbkhhbHRlckVuYWJsZWQoZmFsc2UpCisgICAgLCBtX2V4cGVyaW1l bnRhbFdlYkdMRW5hYmxlZChmYWxzZSkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3QgaGF2ZSBi ZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcgCiAgICAg Ly8gaGFzaCBiZWZvcmUgdHJ5aW5nIHRvIHVzZSBpdC4KQEAgLTUyOCw0ICs1MjksOSBAQCB2b2lk IFNldHRpbmdzOjpzZXRTaG91bGRVc2VIaWdoUmVzb2x1dGlvCiB9CiAjZW5kaWYKIAordm9pZCBT ZXR0aW5nczo6c2V0RXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKGJvb2wgZW5hYmxlZCkKK3sKKyAg ICBtX2V4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZCA9IGVuYWJsZWQ7Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCShyZXZpc2lvbiA0ODgyMSkKKysrIFdlYkNvcmUvcGFn ZS9TZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNjcsNiArMjY3LDExIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRQbHVnaW5BbGxvd2VkUnVuVGltZSh1bnNpZ25l ZCk7CiAgICAgICAgIHVuc2lnbmVkIHBsdWdpbkFsbG93ZWRSdW5UaW1lKCkgY29uc3QgeyByZXR1 cm4gbV9wbHVnaW5BbGxvd2VkUnVuVGltZTsgfQogCisgICAgICAgIC8vIFRoaXMgcnVuLXRpbWUg ZmxhZyBpcyBvbmx5IHRlbXBvcmFyeSB3aGlsZSB0aGUgV2ViR0wKKyAgICAgICAgLy8gc3BlY2lm aWNhdGlvbiBpcyBiZWluZyBkZXZlbG9wZWQuCisgICAgICAgIHZvaWQgc2V0RXhwZXJpbWVudGFs V2ViR0xFbmFibGVkKGJvb2wpOworICAgICAgICBib29sIGV4cGVyaW1lbnRhbFdlYkdMRW5hYmxl ZCgpIGNvbnN0IHsgcmV0dXJuIG1fZXhwZXJpbWVudGFsV2ViR0xFbmFibGVkOyB9CisKICAgICBw cml2YXRlOgogICAgICAgICBQYWdlKiBtX3BhZ2U7CiAgICAgICAgIApAQCAtMzM0LDYgKzMzOSw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX2FjY2VsZXJhdGVkQ29tcG9z aXRpbmdFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX2V4cGVyaW1lbnRhbE5vdGlmaWNhdGlv bnNFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX3BsdWdpbkhhbHRlckVuYWJsZWQgOiAxOwor ICAgICAgICBib29sIG1fZXhwZXJpbWVudGFsV2ViR0xFbmFibGVkIDogMTsKIAogI2lmIFVTRShT QUZBUklfVEhFTUUpCiAgICAgICAgIHN0YXRpYyBib29sIGdTaG91bGRQYWludE5hdGl2ZUNvbnRy b2xzOwpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ4ODMyKQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wOS0yOCAgS2VubmV0aCBSdXNzZWxs ICA8a2JyQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkK KworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgcnVuLXRpbWUgZmxhZyBmb3IgM0QgY2FudmFzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTgyNgorCisg ICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJl bmNlc0NoYW5nZWROb3RpZmljYXRpb246XSk6IEVuYWJsZSBleHBlcmltZW50YWwKKyAgICAgICAg V2ViR0wgZmxhZyB3aGVuIDNEX0NBTlZBUyBpcyBlbmFibGVkIGluIHRoZSBidWlsZC4KKwogMjAw OS0wOS0yOCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lv biA0ODgyMSkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xMzEyLDYgKzEzMTIsOSBAQCBzdGF0aWMgYm9vbCBmYXN0RG9jdW1lbnRUZWFyZG93bkVu YWJsZWQoCiAgICAgc2V0dGluZ3MtPnNldFhTU0F1ZGl0b3JFbmFibGVkKFtwcmVmZXJlbmNlcyBp c1hTU0F1ZGl0b3JFbmFibGVkXSk7CiAgICAgc2V0dGluZ3MtPnNldEVuZm9yY2VDU1NNSU1FVHlw ZUluU3RyaWN0TW9kZSghV0tBcHBWZXJzaW9uQ2hlY2tMZXNzVGhhbihAImNvbS5hcHBsZS5pV2Vi IiwgLTEsIDIuMSkpOwogICAgIHNldHRpbmdzLT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5h YmxlZChbcHJlZmVyZW5jZXMgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRdKTsKKyNpZiBF TkFCTEUoM0RfQ0FOVkFTKQorICAgIHNldHRpbmdzLT5zZXRFeHBlcmltZW50YWxXZWJHTEVuYWJs ZWQodHJ1ZSk7CisjZW5kaWYgIC8vIEVOQUJMRSgzRF9DQU5WQVMpCiB9CiAKIHN0YXRpYyBpbmxp bmUgSU1QIGdldE1ldGhvZChpZCBvLCBTRUwgcykKSW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA0ODgzMikKKysr IFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MDktMDktMjggIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHJ1bi10 aW1lIGZsYWcgZm9yIDNEIGNhbnZhcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Mjk4MjYKKworICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAo V2ViVmlldzo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKTogRW5hYmxlIGV4cGVyaW1lbnRhbCBX ZWJHTAorICAgICAgICBmbGFnIHdoZW4gM0RfQ0FOVkFTIGlzIGVuYWJsZWQgaW4gdGhlIGJ1aWxk LgorCiAyMDA5LTA5LTI1ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTdGV2ZSBGYWxrZW5idXJnLgpJbmRleDogV2ViS2l0L3dpbi9XZWJWaWV3 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiA0ODgy MSkKKysrIFdlYktpdC93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0NDcsNiAr NDQ0NywxMCBAQCBIUkVTVUxUIFdlYlZpZXc6Om5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlCiAgICAg ICAgIHJldHVybiBocjsKICAgICBzZXR0aW5ncy0+c2V0UGx1Z2luQWxsb3dlZFJ1blRpbWUocnVu VGltZSk7CiAKKyNpZiBFTkFCTEUoM0RfQ0FOVkFTKQorICAgIHNldHRpbmdzLT5zZXRFeHBlcmlt ZW50YWxXZWJHTEVuYWJsZWQodHJ1ZSk7CisjZW5kaWYgIC8vIEVOQUJMRSgzRF9DQU5WQVMpCisK ICAgICBpZiAoIW1fY2xvc2VXaW5kb3dUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICBtX21haW5G cmFtZS0+aW52YWxpZGF0ZSgpOyAvLyBGSVhNRQogCg== 40317 2009-09-29 12:40:04 -0700 2009-09-29 12:45:04 -0700 Updated patch after merging with trunk 3d-canvas-runtime-flag-3.patch text/plain 7337 kbr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODg5MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMDktMjggIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpCisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIHJ1bi10aW1lIGZsYWcgZm9yIDNEIGNhbnZhcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk4MjYKKworICAgICAgICAqIGh0bWwv SFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1l bnQ6OmdldENvbnRleHQpOiBDaGVjayBwYWdlIHNldHRpbmdzIGZvcgorICAgICAgICBleHBlcmlt ZW50YWwgV2ViR0wgZmxhZyBiZWZvcmUgcmV0dXJuaW5nIDNEIGdyYXBoaWNzIGNvbnRleHQuCisg ICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6 U2V0dGluZ3MpOiBJbml0aWFsaXplIG5ldyBmbGFnIHRvIGZhbHNlLgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6OnNldEV4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZCk6CisgICAgICAgICogcGFn ZS9TZXR0aW5ncy5oOiBTZXQgbmV3IGZsYWcuCisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6 ZXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKTogUmV0dXJuIG5ldyBmbGFnLgorCiAyMDA5LTA5LTI5 ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChtaXNzZWQgZmlsZSkuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCShyZXZpc2lvbiA0ODg5MSkKKysr IFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAkod29ya2luZyBjb3B5KQpAQCAtNjM2LDYgKzYzNiw3 IEBAIF9fWk43V2ViQ29yZThTZXR0aW5nczI1c2V0U2hvdWxkUHJpbnRCYWMKIF9fWk43V2ViQ29y ZThTZXR0aW5nczI1c2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbkVSS05TXzRLVVJMRQogX19aTjdX ZWJDb3JlOFNldHRpbmdzMjZzZXREZWZhdWx0VGV4dEVuY29kaW5nTmFtZUVSS05TXzZTdHJpbmdF CiBfX1pON1dlYkNvcmU4U2V0dGluZ3MyNnNldE5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzRWIKK19f Wk43V2ViQ29yZThTZXR0aW5nczI3c2V0RXhwZXJpbWVudGFsV2ViR0xFbmFibGVkRWIKIF9fWk43 V2ViQ29yZThTZXR0aW5nczI3c2V0RlRQRGlyZWN0b3J5VGVtcGxhdGVQYXRoRVJLTlNfNlN0cmlu Z0UKIF9fWk43V2ViQ29yZThTZXR0aW5nczI3c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5RWIK IF9fWk43V2ViQ29yZThTZXR0aW5nczI3c2V0TG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoRVJLTlNf NlN0cmluZ0UKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAkocmV2aXNpb24gNDg4 OTEpCisrKyBXZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNjUsMTcgKzE2NSwyMCBAQCBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBIVE1MQ2FudmFz RWxlbWVuCiAgICAgICAgIHJldHVybiBtX2NvbnRleHQuZ2V0KCk7CiAgICAgfQogI2lmIEVOQUJM RSgzRF9DQU5WQVMpICAgIAotICAgIGlmICgodHlwZSA9PSAid2Via2l0LTNkIikgfHwKLSAgICAg ICAgKHR5cGUgPT0gIkdMIikpIHsKLSAgICAgICAgaWYgKG1fY29udGV4dCAmJiAhbV9jb250ZXh0 LT5pczNkKCkpCi0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgaWYgKCFtX2NvbnRleHQp IHsKLSAgICAgICAgICAgIG1fY29udGV4dCA9IG5ldyBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Qo dGhpcyk7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIC8vIE5lZWQgdG8gbWFrZSBzdXJlIGEg UmVuZGVyTGF5ZXIgYW5kIGNvbXBvc2l0aW5nIGxheWVyIGdldCBjcmVhdGVkIGZvciB0aGUgQ2Fu dmFzCi0gICAgICAgICAgICBzZXROZWVkc1N0eWxlUmVjYWxjKFN5bnRoZXRpY1N0eWxlQ2hhbmdl KTsKKyAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBkb2N1bWVudCgpLT5zZXR0aW5ncygpOworICAg IGlmIChzZXR0aW5ncyAmJiBzZXR0aW5ncy0+ZXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKCkpIHsK KyAgICAgICAgaWYgKCh0eXBlID09ICJ3ZWJraXQtM2QiKSB8fAorICAgICAgICAgICAgKHR5cGUg PT0gIkdMIikpIHsKKyAgICAgICAgICAgIGlmIChtX2NvbnRleHQgJiYgIW1fY29udGV4dC0+aXMz ZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgaWYgKCFtX2NvbnRl eHQpIHsKKyAgICAgICAgICAgICAgICBtX2NvbnRleHQgPSBuZXcgQ2FudmFzUmVuZGVyaW5nQ29u dGV4dDNEKHRoaXMpOworCisgICAgICAgICAgICAgICAgLy8gTmVlZCB0byBtYWtlIHN1cmUgYSBS ZW5kZXJMYXllciBhbmQgY29tcG9zaXRpbmcgbGF5ZXIgZ2V0IGNyZWF0ZWQgZm9yIHRoZSBDYW52 YXMKKyAgICAgICAgICAgICAgICBzZXROZWVkc1N0eWxlUmVjYWxjKFN5bnRoZXRpY1N0eWxlQ2hh bmdlKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiBtX2NvbnRleHQuZ2V0KCk7 CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIG1fY29udGV4dC5nZXQoKTsKICAgICB9CiAjZW5k aWYKICAgICByZXR1cm4gMDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAkocmV2aXNpb24gNDg4OTEpCisrKyBX ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTcsNiArMTE3LDcg QEAgU2V0dGluZ3M6OlNldHRpbmdzKFBhZ2UqIHBhZ2UpCiAgICAgLCBtX2FjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkKHRydWUpCiAgICAgLCBtX2V4cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNF bmFibGVkKGZhbHNlKQogICAgICwgbV9wbHVnaW5IYWx0ZXJFbmFibGVkKGZhbHNlKQorICAgICwg bV9leHBlcmltZW50YWxXZWJHTEVuYWJsZWQoZmFsc2UpCiAjaWYgRU5BQkxFKFdFQl9TT0NLRVRT KQogICAgICwgbV9leHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZChmYWxzZSkKICNlbmRpZgpA QCAtNTMxLDYgKzUzMiwxMSBAQCB2b2lkIFNldHRpbmdzOjpzZXRTaG91bGRVc2VIaWdoUmVzb2x1 dGlvCiB9CiAjZW5kaWYKIAordm9pZCBTZXR0aW5nczo6c2V0RXhwZXJpbWVudGFsV2ViR0xFbmFi bGVkKGJvb2wgZW5hYmxlZCkKK3sKKyAgICBtX2V4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZCA9IGVu YWJsZWQ7Cit9CisKICNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCiB2b2lkIFNldHRpbmdzOjpzZXRF eHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZChib29sIGVuYWJsZWQpCiB7CkluZGV4OiBXZWJD b3JlL3BhZ2UvU2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu aAkocmV2aXNpb24gNDg4OTEpCisrKyBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkod29ya2luZyBj b3B5KQpAQCAtMjY3LDYgKzI2NywxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZv aWQgc2V0UGx1Z2luQWxsb3dlZFJ1blRpbWUodW5zaWduZWQpOwogICAgICAgICB1bnNpZ25lZCBw bHVnaW5BbGxvd2VkUnVuVGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGx1Z2luQWxsb3dlZFJ1blRp bWU7IH0KIAorICAgICAgICAvLyBUaGlzIHJ1bi10aW1lIGZsYWcgaXMgb25seSB0ZW1wb3Jhcnkg d2hpbGUgdGhlIFdlYkdMCisgICAgICAgIC8vIHNwZWNpZmljYXRpb24gaXMgYmVpbmcgZGV2ZWxv cGVkLgorICAgICAgICB2b2lkIHNldEV4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZChib29sKTsKKyAg ICAgICAgYm9vbCBleHBlcmltZW50YWxXZWJHTEVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2V4 cGVyaW1lbnRhbFdlYkdMRW5hYmxlZDsgfQorCiAjaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQogICAg ICAgICB2b2lkIHNldEV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkKGJvb2wpOwogICAgICAg ICBib29sIGV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9l eHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZDsgfQpAQCAtMzM5LDYgKzM0NCw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX2FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFi bGVkIDogMTsKICAgICAgICAgYm9vbCBtX2V4cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFibGVk IDogMTsKICAgICAgICAgYm9vbCBtX3BsdWdpbkhhbHRlckVuYWJsZWQgOiAxOworICAgICAgICBi b29sIG1fZXhwZXJpbWVudGFsV2ViR0xFbmFibGVkIDogMTsKIAogI2lmIEVOQUJMRShXRUJfU09D S0VUUykKICAgICAgICAgYm9vbCBtX2V4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkIDogMTsK SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA0ODg5MSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDktMjggIEtlbm5ldGggUnVzc2VsbCAgPGti ckBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpCisKKyAg ICAgICAgQWRkIHN1cHBvcnQgZm9yIHJ1bi10aW1lIGZsYWcgZm9yIDNEIGNhbnZhcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk4MjYKKworICAgICAg ICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXND aGFuZ2VkTm90aWZpY2F0aW9uOl0pOiBFbmFibGUgZXhwZXJpbWVudGFsCisgICAgICAgIFdlYkdM IGZsYWcgd2hlbiAzRF9DQU5WQVMgaXMgZW5hYmxlZCBpbiB0aGUgYnVpbGQuCisKIDIwMDktMDkt MjggIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gNDg4 OTEpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAt MTMxMyw2ICsxMzEzLDkgQEAgc3RhdGljIGJvb2wgZmFzdERvY3VtZW50VGVhcmRvd25FbmFibGVk KAogICAgIHNldHRpbmdzLT5zZXRYU1NBdWRpdG9yRW5hYmxlZChbcHJlZmVyZW5jZXMgaXNYU1NB dWRpdG9yRW5hYmxlZF0pOwogICAgIHNldHRpbmdzLT5zZXRFbmZvcmNlQ1NTTUlNRVR5cGVJblN0 cmljdE1vZGUoIVdLQXBwVmVyc2lvbkNoZWNrTGVzc1RoYW4oQCJjb20uYXBwbGUuaVdlYiIsIC0x LCAyLjEpKTsKICAgICBzZXR0aW5ncy0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQo W3ByZWZlcmVuY2VzIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkXSk7CisjaWYgRU5BQkxF KDNEX0NBTlZBUykKKyAgICBzZXR0aW5ncy0+c2V0RXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKHRy dWUpOworI2VuZGlmICAvLyBFTkFCTEUoM0RfQ0FOVkFTKQogfQogCiBzdGF0aWMgaW5saW5lIElN UCBnZXRNZXRob2QoaWQgbywgU0VMIHMpCkluZGV4OiBXZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gNDg4OTEpCisrKyBXZWJL aXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDA5LTA5 LTI4ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKQorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBydW4tdGltZSBm bGFnIGZvciAzRCBjYW52YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI5ODI2CisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZp ZXc6Om5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlZCk6IEVuYWJsZSBleHBlcmltZW50YWwgV2ViR0wK KyAgICAgICAgZmxhZyB3aGVuIDNEX0NBTlZBUyBpcyBlbmFibGVkIGluIHRoZSBidWlsZC4KKwog MjAwOS0wOS0yOCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlciBhbmQgU2FtIFdlaW5pZy4KSW5kZXg6IFdlYktpdC93 aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2 aXNpb24gNDg4OTEpCisrKyBXZWJLaXQvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00NDUyLDYgKzQ0NTIsMTAgQEAgSFJFU1VMVCBXZWJWaWV3Ojpub3RpZnlQcmVmZXJlbmNlc0No YW5nZQogICAgICAgICByZXR1cm4gaHI7CiAgICAgc2V0dGluZ3MtPnNldFBsdWdpbkFsbG93ZWRS dW5UaW1lKHJ1blRpbWUpOwogCisjaWYgRU5BQkxFKDNEX0NBTlZBUykKKyAgICBzZXR0aW5ncy0+ c2V0RXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKHRydWUpOworI2VuZGlmICAvLyBFTkFCTEUoM0Rf Q0FOVkFTKQorCiAgICAgaWYgKCFtX2Nsb3NlV2luZG93VGltZXIuaXNBY3RpdmUoKSkKICAgICAg ICAgbV9tYWluRnJhbWUtPmludmFsaWRhdGUoKTsgLy8gRklYTUUKIAo=