41010 2010-06-22 13:43:52 -0700 [chromium] Attach a GLES2Context to a WebView to enable resource sharing 2010-06-24 11:09:51 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 vangelis webkit-unassigned dglazkov fishd webkit.review.bot oldest_to_newest 241431 0 vangelis 2010-06-22 13:43:52 -0700 In order for the page compositor to share resources (textures) with any hardware accelerated elements within a page (e.g. WebGL, Pepper3D) there needs to be a single GLES2Context associated with the view that's available when the accelerated elements are created (they often get created before the layer compositor). 241465 1 59416 vangelis 2010-06-22 14:45:17 -0700 Created attachment 59416 Proposed patch 241473 2 webkit.review.bot 2010-06-22 15:03:43 -0700 Attachment 59416 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/3334596 241498 3 59426 vangelis 2010-06-22 15:55:33 -0700 Created attachment 59426 Patch. Hopefully fixes the link issues 241574 4 webkit.review.bot 2010-06-22 18:02:23 -0700 Attachment 59426 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/3311607 241593 5 59459 vangelis 2010-06-22 18:43:18 -0700 Created attachment 59459 Proposed patch. Removed virtual method from WebView class. 241892 6 vangelis 2010-06-23 09:46:59 -0700 Ok, this looks like it actually did compile successfully after all. Darin or Dimitri, can you please take a look when you get a chance? 241900 7 59459 fishd 2010-06-23 09:56:55 -0700 Comment on attachment 59459 Proposed patch. Removed virtual method from WebView class. WebKit/chromium/src/GLES2Context.cpp:68 + WebKit::WebViewImpl* webView = WebKit::WebViewImpl::fromPage(page); I recommend putting a "using namespace WebKit" at the top of this file. WebKit/chromium/src/WebViewImpl.h:340 + WebGLES2Context* GLES2Context(); WebKit style suggests that this method should be named gles2Context instead. See examples like ResourceRequest::httpReferrer. WebKit/chromium/src/WebViewImpl.cpp:2290 + if (!m_gles2Context) { should we check if accelerated compositing is enabled before creating the GLES2Context? 241944 8 59532 vangelis 2010-06-23 11:06:50 -0700 Created attachment 59532 Proposed patch addressing review comments 241948 9 vangelis 2010-06-23 11:13:33 -0700 (In reply to comment #7) > (From update of attachment 59459 [details]) > WebKit/chromium/src/GLES2Context.cpp:68 > + WebKit::WebViewImpl* webView = WebKit::WebViewImpl::fromPage(page); > I recommend putting a "using namespace WebKit" at the top of this file. > Done. > WebKit/chromium/src/WebViewImpl.h:340 > + WebGLES2Context* GLES2Context(); > WebKit style suggests that this method should be named gles2Context > instead. See examples like ResourceRequest::httpReferrer. > Done. > WebKit/chromium/src/WebViewImpl.cpp:2290 > + if (!m_gles2Context) { > should we check if accelerated compositing is enabled before > creating the GLES2Context? This method currently gets called from one of two places: 1. When creating a WebGL context, only if the accelerated compositing flag is enabled 2. When creating the page compositor So, as it stands, it will only create the context if compositing is enabled. However, one can imagine other cases where it would be useful to attach a GLES2 context to the view even when not doing accelerated compositing so I don't think it should be checking whether the feature is enabled. I had previously made a mistake and defined the method within the USE(ACCELERATED_COMPOSTING) block which shouldn't be the case. It's fixed in this patch. 241950 10 webkit.review.bot 2010-06-23 11:15:44 -0700 Attachment 59532 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/chromium/src/WebViewImpl.cpp:2285: One space before end of line comments [whitespace/comments] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 241982 11 fishd 2010-06-23 11:39:31 -0700 (In reply to comment #9) > > WebKit/chromium/src/WebViewImpl.cpp:2290 > > + if (!m_gles2Context) { > > should we check if accelerated compositing is enabled before > > creating the GLES2Context? > > This method currently gets called from one of two places: > 1. When creating a WebGL context, only if the accelerated compositing flag is enabled > 2. When creating the page compositor > > So, as it stands, it will only create the context if compositing is enabled. However, one can imagine other cases where it would be useful to attach a GLES2 context to the view even when not doing accelerated compositing so I don't think it should be checking whether the feature is enabled. > I had previously made a mistake and defined the method within the USE(ACCELERATED_COMPOSTING) block which shouldn't be the case. It's fixed in this patch. OK. My concern was with this being an API method, but your explanation makes sense to me. 241984 12 59532 fishd 2010-06-23 11:40:24 -0700 Comment on attachment 59532 Proposed patch addressing review comments R=me, cq- due to style issue. 242006 13 59547 vangelis 2010-06-23 12:02:31 -0700 Created attachment 59547 Proposed patch. Fixed style issue. 242299 14 59532 eric 2010-06-23 22:54:25 -0700 Comment on attachment 59532 Proposed patch addressing review comments Cleared Darin Fisher's review+ from obsolete attachment 59532 so that this bug does not appear in http://webkit.org/pending-commit. 242596 15 fishd 2010-06-24 11:09:23 -0700 Landed as http://trac.webkit.org/changeset/61774 59416 2010-06-22 14:45:17 -0700 2010-06-22 15:55:33 -0700 Proposed patch gles2ContextWebView_41010_1.txt text/plain 5696 vangelis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE2MjcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDYtMjIgIFZhbmdl bGlzIEtva2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQSBXZWJWaWV3IGNhbiBu b3cgb3duIGEgR0xFUzJDb250ZXh0IHdoaWNoIGdldHMgY3JlYXRlZCBvbgorICAgICAgICBkZW1h bmQuIFRoaXMgY29udGV4dCB3aWxsIHR5cGljYWxseSBiZSBjcmVhdGVkIGZvciB0aGUgZ3B1IGNv bXBvc2l0b3IKKyAgICAgICAgYW5kIHVzZWQgYXMgYSBwYXJlbnQgY29udGV4dCBmb3IgYW55IGVs ZW1lbnRzIG9uIHRoZSBwYWdlIHRoYXQgdXNlIHRoZQorICAgICAgICBncHUgZm9yIHJlbmRlcmlu ZyAoZS5nLiBXZWJHTCkgYW5kIG5lZWQgdG8gcGFzcyB0aGVpciBiYWNrYnVmZmVyIGRpcmVjdGx5 CisgICAgICAgIHRvIHRoZSBjb21wb3NpdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTAKKworICAgICAgICAqIHB1YmxpYy9XZWJHTEVTMkNv bnRleHQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHNyYy9HTEVT MkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R0xFUzJDb250ZXh0SW50ZXJuYWw6Omdl dFdlYkdMRVMyQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpHTEVTMkNvbnRleHRJbnRlcm5h bDo6aW5pdGlhbGl6ZSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OkdMRVMyQ29udGV4dCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisK IDIwMTAtMDYtMjIgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkdMRVMyQ29udGV4dC5oCShyZXZpc2lvbiA2MTYyMSkKKysrIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViR0xFUzJDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDcgKzQ1 LDcgQEAgY2xhc3MgV2ViR0xFUzJDb250ZXh0IDogcHVibGljIFdlYk5vbkNvcAogcHVibGljOgog ICAgIHZpcnR1YWwgfldlYkdMRVMyQ29udGV4dCgpIHt9CiAKLSAgICB2aXJ0dWFsIGJvb2wgaW5p dGlhbGl6ZShXZWJWaWV3KikgPSAwOworICAgIHZpcnR1YWwgYm9vbCBpbml0aWFsaXplKFdlYlZp ZXcqLCBXZWJHTEVTMkNvbnRleHQqIHBhcmVudCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBtYWtl Q3VycmVudCgpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZGVzdHJveSgpID0gMDsKICAgICB2aXJ0 dWFsIGJvb2wgc3dhcEJ1ZmZlcnMoKSA9IDA7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcu aAkocmV2aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQCBjbGFzcyBXZWJEZXZUb29sc0FnZW50Owog Y2xhc3MgV2ViRHJhZ0RhdGE7CiBjbGFzcyBXZWJGcmFtZTsKIGNsYXNzIFdlYkZyYW1lQ2xpZW50 OworY2xhc3MgV2ViR0xFUzJDb250ZXh0OwogY2xhc3MgV2ViTm9kZTsKIGNsYXNzIFdlYlNldHRp bmdzOwogY2xhc3MgV2ViU3RyaW5nOwpAQCAtMjkyLDYgKzI5Myw5IEBAIHB1YmxpYzoKICAgICBX RUJLSVRfQVBJIHN0YXRpYyB2b2lkIHdpbGxFbnRlck1vZGFsTG9vcCgpOwogICAgIFdFQktJVF9B UEkgc3RhdGljIHZvaWQgZGlkRXhpdE1vZGFsTG9vcCgpOwogCisgICAgLy8gR1BVIHN1cHBvcnQg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CisgICAgdmlydHVhbCBXZWJHTEVTMkNvbnRleHQqIEdMRVMyQ29udGV4dCgpID0gMDsKKwogcHJv dGVjdGVkOgogICAgIH5XZWJWaWV3KCkge30KIH07CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L0dMRVMyQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9HTEVT MkNvbnRleHQuY3BwCShyZXZpc2lvbiA2MTYyMSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvR0xF UzJDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYsMjMgKzU2LDIwIEBAIHB1YmxpYzoK IAogICAgIGJvb2wgaW5pdGlhbGl6ZShQYWdlKik7CiAKLSAgICBXZWJLaXQ6OldlYkdMRVMyQ29u dGV4dCogZ2V0V2ViR0xFUzJDb250ZXh0KCkgeyByZXR1cm4gbV9pbXBsLmdldCgpOyB9CisgICAg V2ViS2l0OjpXZWJHTEVTMkNvbnRleHQqIGdldFdlYkdMRVMyQ29udGV4dCgpIHsgcmV0dXJuIG1f aW1wbDsgfQogCiBwcml2YXRlOgotICAgIE93blB0cjxXZWJLaXQ6OldlYkdMRVMyQ29udGV4dD4g bV9pbXBsOworICAgIFdlYktpdDo6V2ViR0xFUzJDb250ZXh0KiBtX2ltcGw7CiB9OwogCiBib29s IEdMRVMyQ29udGV4dEludGVybmFsOjppbml0aWFsaXplKFBhZ2UqIHBhZ2UpCiB7Ci0gICAgbV9p bXBsID0gV2ViS2l0Ojp3ZWJLaXRDbGllbnQoKS0+Y3JlYXRlR0xFUzJDb250ZXh0KCk7CisgICAg QVNTRVJUKHBhZ2UpOworICAgIFdlYktpdDo6V2ViVmlld0ltcGwqIHdlYlZpZXcgPSBXZWJLaXQ6 OldlYlZpZXdJbXBsOjpmcm9tUGFnZShwYWdlKTsKKyAgICBtX2ltcGwgPSB3ZWJWaWV3LT5HTEVT MkNvbnRleHQoKTsKICAgICBpZiAoIW1faW1wbCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgV2ViS2l0OjpXZWJWaWV3SW1wbCogd2ViVmlldyA9IFdlYktpdDo6V2ViVmlld0ltcGw6OmZy b21QYWdlKHBhZ2UpOwotICAgIGlmICghbV9pbXBsLT5pbml0aWFsaXplKHdlYlZpZXcpKSB7Ci0g ICAgICAgIG1faW1wbC5jbGVhcigpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQogICAg IHJldHVybiB0cnVlOwogfQogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAko cmV2aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAko d29ya2luZyBjb3B5KQpAQCAtOTIsNiArOTIsOCBAQAogI2luY2x1ZGUgIldlYkltYWdlLmgiCiAj aW5jbHVkZSAiV2ViSW5wdXRFdmVudC5oIgogI2luY2x1ZGUgIldlYklucHV0RXZlbnRDb252ZXJz aW9uLmgiCisjaW5jbHVkZSAiV2ViS2l0LmgiCisjaW5jbHVkZSAiV2ViS2l0Q2xpZW50LmgiCiAj aW5jbHVkZSAiV2ViTWVkaWFQbGF5ZXJBY3Rpb24uaCIKICNpbmNsdWRlICJXZWJOb2RlLmgiCiAj aW5jbHVkZSAiV2ViUG9pbnQuaCIKQEAgLTI0Niw2ICsyNDgsNyBAQCBXZWJWaWV3SW1wbDo6V2Vi Vmlld0ltcGwoV2ViVmlld0NsaWVudCogCiAgICAgLCBtX2xheWVyUmVuZGVyZXIoMCkKICAgICAs IG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGZhbHNlKQogI2VuZGlmCisgICAgLCBt X2dsZXMyQ29udGV4dCgwKQogewogICAgIC8vIFdlYktpdC93aW4vV2ViVmlldy5jcHAgZG9lcyB0 aGUgc2FtZSB0aGluZywgZXhjZXB0IHRoZXkgY2FsbCB0aGUKICAgICAvLyBLSlMgc3BlY2lmaWMg d3JhcHBlciBhcm91bmQgdGhpcyBtZXRob2QuIFdlIG5lZWQgdG8gaGF2ZSB0aHJlYWRpbmcKQEAg LTIyODAsNiArMjI4MywyMyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRSb290TGF5ZXJOZWVkc0Rp c3BsCiAgICAgICAgIG1fbGF5ZXJSZW5kZXJlci0+c2V0TmVlZHNEaXNwbGF5KCk7CiB9CiAKKy8v IFJldHVybnMgdGhlIEdMRVMyIGNvbnRleHQgYXNzb2NpYXRlZCB3aXRoIHRoaXMgVmlldy4gSWYg b25lIGRvZXNuJ3QgZXhpc3QKKy8vIGl0IHdpbGwgZ2V0IGNyZWF0ZWQgZmlyc3QuCitXZWJHTEVT MkNvbnRleHQqIFdlYlZpZXdJbXBsOjpHTEVTMkNvbnRleHQoKQoreworICAgIGlmICghbV9nbGVz MkNvbnRleHQpIHsKKyAgICAgICAgbV9nbGVzMkNvbnRleHQgPSB3ZWJLaXRDbGllbnQoKS0+Y3Jl YXRlR0xFUzJDb250ZXh0KCk7CisgICAgICAgIGlmICghbV9nbGVzMkNvbnRleHQpCisgICAgICAg ICAgICByZXR1cm4gMDsKKworICAgICAgICBpZiAoIW1fZ2xlczJDb250ZXh0LT5pbml0aWFsaXpl KHRoaXMsIDApKSB7CisgICAgICAgICAgICBtX2dsZXMyQ29udGV4dC5jbGVhcigpOworICAgICAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG1fZ2xlczJDb250 ZXh0LmdldCgpOworfQorCiAjZW5kaWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCShyZXZpc2lvbiA2MTYyMSkKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAog I2lmbmRlZiBXZWJWaWV3SW1wbF9oCiAjZGVmaW5lIFdlYlZpZXdJbXBsX2gKIAorI2luY2x1ZGUg IldlYkdMRVMyQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYk5hdmlnYXRpb25Qb2xpY3kuaCIKICNp bmNsdWRlICJXZWJQb2ludC5oIgogI2luY2x1ZGUgIldlYlNpemUuaCIKQEAgLTE5Niw2ICsxOTcs NyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBydW5BdFN0 YXJ0KTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkVXNlclN0eWxlU2hlZXQoY29uc3QgV2ViU3RyaW5n JiBzb3VyY2VDb2RlKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlQWxsVXNlckNvbnRlbnQoKTsK KyAgICB2aXJ0dWFsIFdlYkdMRVMyQ29udGV4dCogR0xFUzJDb250ZXh0KCk7CiAKICAgICAvLyBX ZWJWaWV3SW1wbAogCkBAIC01MjEsNiArNTIzLDggQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlOwogI2VuZGlmCiAgICAgc3RhdGljIGNvbnN0IFdl YklucHV0RXZlbnQqIG1fY3VycmVudElucHV0RXZlbnQ7CisKKyAgICBPd25QdHI8V2ViR0xFUzJD b250ZXh0PiBtX2dsZXMyQ29udGV4dDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 59426 2010-06-22 15:55:33 -0700 2010-06-22 18:43:18 -0700 Patch. Hopefully fixes the link issues gles2ContextWebView_41010_2.txt text/plain 5927 vangelis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE2MjcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDYtMjIgIFZhbmdl bGlzIEtva2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQSBXZWJWaWV3IGNhbiBu b3cgb3duIGEgR0xFUzJDb250ZXh0IHdoaWNoIGdldHMgY3JlYXRlZCBvbgorICAgICAgICBkZW1h bmQuIFRoaXMgY29udGV4dCB3aWxsIHR5cGljYWxseSBiZSBjcmVhdGVkIGZvciB0aGUgZ3B1IGNv bXBvc2l0b3IKKyAgICAgICAgYW5kIHVzZWQgYXMgYSBwYXJlbnQgY29udGV4dCBmb3IgYW55IGVs ZW1lbnRzIG9uIHRoZSBwYWdlIHRoYXQgdXNlIHRoZQorICAgICAgICBncHUgZm9yIHJlbmRlcmlu ZyAoZS5nLiBXZWJHTCkgYW5kIG5lZWQgdG8gcGFzcyB0aGVpciBiYWNrYnVmZmVyIGRpcmVjdGx5 CisgICAgICAgIHRvIHRoZSBjb21wb3NpdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTAKKworICAgICAgICAqIHB1YmxpYy9XZWJHTEVTMkNv bnRleHQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHNyYy9HTEVT MkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R0xFUzJDb250ZXh0SW50ZXJuYWw6Omdl dFdlYkdMRVMyQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpHTEVTMkNvbnRleHRJbnRlcm5h bDo6aW5pdGlhbGl6ZSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OkdMRVMyQ29udGV4dCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisK IDIwMTAtMDYtMjIgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkdMRVMyQ29udGV4dC5oCShyZXZpc2lvbiA2MTYyMSkKKysrIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViR0xFUzJDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDcgKzQ1 LDcgQEAgY2xhc3MgV2ViR0xFUzJDb250ZXh0IDogcHVibGljIFdlYk5vbkNvcAogcHVibGljOgog ICAgIHZpcnR1YWwgfldlYkdMRVMyQ29udGV4dCgpIHt9CiAKLSAgICB2aXJ0dWFsIGJvb2wgaW5p dGlhbGl6ZShXZWJWaWV3KikgPSAwOworICAgIHZpcnR1YWwgYm9vbCBpbml0aWFsaXplKFdlYlZp ZXcqLCBXZWJHTEVTMkNvbnRleHQqIHBhcmVudCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBtYWtl Q3VycmVudCgpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZGVzdHJveSgpID0gMDsKICAgICB2aXJ0 dWFsIGJvb2wgc3dhcEJ1ZmZlcnMoKSA9IDA7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcu aAkocmV2aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQCBjbGFzcyBXZWJEZXZUb29sc0FnZW50Owog Y2xhc3MgV2ViRHJhZ0RhdGE7CiBjbGFzcyBXZWJGcmFtZTsKIGNsYXNzIFdlYkZyYW1lQ2xpZW50 OworY2xhc3MgV2ViR0xFUzJDb250ZXh0OwogY2xhc3MgV2ViTm9kZTsKIGNsYXNzIFdlYlNldHRp bmdzOwogY2xhc3MgV2ViU3RyaW5nOwpAQCAtMjkyLDYgKzI5Myw5IEBAIHB1YmxpYzoKICAgICBX RUJLSVRfQVBJIHN0YXRpYyB2b2lkIHdpbGxFbnRlck1vZGFsTG9vcCgpOwogICAgIFdFQktJVF9B UEkgc3RhdGljIHZvaWQgZGlkRXhpdE1vZGFsTG9vcCgpOwogCisgICAgLy8gR1BVIHN1cHBvcnQg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CisgICAgdmlydHVhbCBXZWJHTEVTMkNvbnRleHQqIEdMRVMyQ29udGV4dCgpID0gMDsKKwogcHJv dGVjdGVkOgogICAgIH5XZWJWaWV3KCkge30KIH07CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L0dMRVMyQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9HTEVT MkNvbnRleHQuY3BwCShyZXZpc2lvbiA2MTYyMSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvR0xF UzJDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYsMjMgKzU2LDIwIEBAIHB1YmxpYzoK IAogICAgIGJvb2wgaW5pdGlhbGl6ZShQYWdlKik7CiAKLSAgICBXZWJLaXQ6OldlYkdMRVMyQ29u dGV4dCogZ2V0V2ViR0xFUzJDb250ZXh0KCkgeyByZXR1cm4gbV9pbXBsLmdldCgpOyB9CisgICAg V2ViS2l0OjpXZWJHTEVTMkNvbnRleHQqIGdldFdlYkdMRVMyQ29udGV4dCgpIHsgcmV0dXJuIG1f aW1wbDsgfQogCiBwcml2YXRlOgotICAgIE93blB0cjxXZWJLaXQ6OldlYkdMRVMyQ29udGV4dD4g bV9pbXBsOworICAgIFdlYktpdDo6V2ViR0xFUzJDb250ZXh0KiBtX2ltcGw7CiB9OwogCiBib29s IEdMRVMyQ29udGV4dEludGVybmFsOjppbml0aWFsaXplKFBhZ2UqIHBhZ2UpCiB7Ci0gICAgbV9p bXBsID0gV2ViS2l0Ojp3ZWJLaXRDbGllbnQoKS0+Y3JlYXRlR0xFUzJDb250ZXh0KCk7CisgICAg QVNTRVJUKHBhZ2UpOworICAgIFdlYktpdDo6V2ViVmlld0ltcGwqIHdlYlZpZXcgPSBXZWJLaXQ6 OldlYlZpZXdJbXBsOjpmcm9tUGFnZShwYWdlKTsKKyAgICBtX2ltcGwgPSB3ZWJWaWV3LT5HTEVT MkNvbnRleHQoKTsKICAgICBpZiAoIW1faW1wbCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgV2ViS2l0OjpXZWJWaWV3SW1wbCogd2ViVmlldyA9IFdlYktpdDo6V2ViVmlld0ltcGw6OmZy b21QYWdlKHBhZ2UpOwotICAgIGlmICghbV9pbXBsLT5pbml0aWFsaXplKHdlYlZpZXcpKSB7Ci0g ICAgICAgIG1faW1wbC5jbGVhcigpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQogICAg IHJldHVybiB0cnVlOwogfQogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAko cmV2aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAko d29ya2luZyBjb3B5KQpAQCAtOTIsNiArOTIsOCBAQAogI2luY2x1ZGUgIldlYkltYWdlLmgiCiAj aW5jbHVkZSAiV2ViSW5wdXRFdmVudC5oIgogI2luY2x1ZGUgIldlYklucHV0RXZlbnRDb252ZXJz aW9uLmgiCisjaW5jbHVkZSAiV2ViS2l0LmgiCisjaW5jbHVkZSAiV2ViS2l0Q2xpZW50LmgiCiAj aW5jbHVkZSAiV2ViTWVkaWFQbGF5ZXJBY3Rpb24uaCIKICNpbmNsdWRlICJXZWJOb2RlLmgiCiAj aW5jbHVkZSAiV2ViUG9pbnQuaCIKQEAgLTI0Niw2ICsyNDgsNyBAQCBXZWJWaWV3SW1wbDo6V2Vi Vmlld0ltcGwoV2ViVmlld0NsaWVudCogCiAgICAgLCBtX2xheWVyUmVuZGVyZXIoMCkKICAgICAs IG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGZhbHNlKQogI2VuZGlmCisgICAgLCBt X2dsZXMyQ29udGV4dCgwKQogewogICAgIC8vIFdlYktpdC93aW4vV2ViVmlldy5jcHAgZG9lcyB0 aGUgc2FtZSB0aGluZywgZXhjZXB0IHRoZXkgY2FsbCB0aGUKICAgICAvLyBLSlMgc3BlY2lmaWMg d3JhcHBlciBhcm91bmQgdGhpcyBtZXRob2QuIFdlIG5lZWQgdG8gaGF2ZSB0aHJlYWRpbmcKQEAg LTIyODAsNiArMjI4MywyMyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRSb290TGF5ZXJOZWVkc0Rp c3BsCiAgICAgICAgIG1fbGF5ZXJSZW5kZXJlci0+c2V0TmVlZHNEaXNwbGF5KCk7CiB9CiAKKy8v IFJldHVybnMgdGhlIEdMRVMyIGNvbnRleHQgYXNzb2NpYXRlZCB3aXRoIHRoaXMgVmlldy4gSWYg b25lIGRvZXNuJ3QgZXhpc3QKKy8vIGl0IHdpbGwgZ2V0IGNyZWF0ZWQgZmlyc3QuCitXZWJHTEVT MkNvbnRleHQqIFdlYlZpZXdJbXBsOjpHTEVTMkNvbnRleHQoKQoreworICAgIGlmICghbV9nbGVz MkNvbnRleHQpIHsKKyAgICAgICAgbV9nbGVzMkNvbnRleHQgPSB3ZWJLaXRDbGllbnQoKS0+Y3Jl YXRlR0xFUzJDb250ZXh0KCk7CisgICAgICAgIGlmICghbV9nbGVzMkNvbnRleHQpCisgICAgICAg ICAgICByZXR1cm4gMDsKKworICAgICAgICBpZiAoIW1fZ2xlczJDb250ZXh0LT5pbml0aWFsaXpl KHRoaXMsIDApKSB7CisgICAgICAgICAgICBtX2dsZXMyQ29udGV4dC5jbGVhcigpOworICAgICAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG1fZ2xlczJDb250 ZXh0LmdldCgpOworfQorCiAjZW5kaWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCShyZXZpc2lvbiA2MTYyMSkKKysrIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAog I2lmbmRlZiBXZWJWaWV3SW1wbF9oCiAjZGVmaW5lIFdlYlZpZXdJbXBsX2gKIAorI2luY2x1ZGUg IldlYkdMRVMyQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYk5hdmlnYXRpb25Qb2xpY3kuaCIKICNp bmNsdWRlICJXZWJQb2ludC5oIgogI2luY2x1ZGUgIldlYlNpemUuaCIKQEAgLTMzNCw2ICszMzUs MTAgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJDb3Jl OjpTY3JvbGxEaXJlY3Rpb24qIHNjcm9sbERpcmVjdGlvbiwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHkqIHNjcm9sbEdyYW51bGFy aXR5KTsKIAorICAgIC8vIFJldHVybnMgdGhlIEdMRVMyQ29udGV4dCBhc3NvY2lhdGVkIHdpdGgg dGhpcyBXZWJWaWV3LiBPbmUgd2lsbCBiZSBjcmVhdGVkCisgICAgLy8gaWYgaXQgZG9lc24ndCBh bHJlYWR5IGV4aXN0LgorICAgIFdlYkdMRVMyQ29udGV4dCogR0xFUzJDb250ZXh0KCk7CisKIHBy aXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFdlYlZpZXc7ICAvLyBTbyBXZWJWaWV3OjpDcmVhdGUg Y2FuIGNhbGwgb3VyIGNvbnN0cnVjdG9yCiAgICAgZnJpZW5kIGNsYXNzIFdURjo6UmVmQ291bnRl ZDxXZWJWaWV3SW1wbD47CkBAIC01MjEsNiArNTI2LDggQEAgcHJpdmF0ZToKICAgICBib29sIG1f aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlOwogI2VuZGlmCiAgICAgc3RhdGljIGNvbnN0 IFdlYklucHV0RXZlbnQqIG1fY3VycmVudElucHV0RXZlbnQ7CisKKyAgICBPd25QdHI8V2ViR0xF UzJDb250ZXh0PiBtX2dsZXMyQ29udGV4dDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 59459 2010-06-22 18:43:18 -0700 2010-06-23 11:06:50 -0700 Proposed patch. Removed virtual method from WebView class. gles2ContextWebView_41010_3.txt text/plain 5211 vangelis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE2MjcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMjIgIFZhbmdl bGlzIEtva2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQSBXZWJWaWV3IGNhbiBu b3cgb3duIGEgR0xFUzJDb250ZXh0IHdoaWNoIGdldHMgY3JlYXRlZCBvbgorICAgICAgICBkZW1h bmQuIFRoaXMgY29udGV4dCB3aWxsIHR5cGljYWxseSBiZSBjcmVhdGVkIGZvciB0aGUgZ3B1IGNv bXBvc2l0b3IKKyAgICAgICAgYW5kIHVzZWQgYXMgYSBwYXJlbnQgY29udGV4dCBmb3IgYW55IGVs ZW1lbnRzIG9uIHRoZSBwYWdlIHRoYXQgdXNlIHRoZQorICAgICAgICBncHUgZm9yIHJlbmRlcmlu ZyAoZS5nLiBXZWJHTCkgYW5kIG5lZWQgdG8gcGFzcyB0aGVpciBiYWNrYnVmZmVyIGRpcmVjdGx5 CisgICAgICAgIHRvIHRoZSBjb21wb3NpdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTAKKworICAgICAgICAqIHB1YmxpYy9XZWJHTEVTMkNv bnRleHQuaDoKKyAgICAgICAgKiBzcmMvR0xFUzJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkdMRVMyQ29udGV4dEludGVybmFsOjpnZXRXZWJHTEVTMkNvbnRleHQpOgorICAgICAgICAo V2ViQ29yZTo6R0xFUzJDb250ZXh0SW50ZXJuYWw6OmluaXRpYWxpemUpOgorICAgICAgICAqIHNy Yy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpXZWJWaWV3 SW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpHTEVTMkNvbnRleHQpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTA2LTIyICBNaWtoYWlsIE5hZ2Fub3Yg IDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViR0xFUzJDb250ZXh0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaAkocmV2 aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdMRVMyQ29udGV4dC5o CSh3b3JraW5nIGNvcHkpCkBAIC00NSw3ICs0NSw3IEBAIGNsYXNzIFdlYkdMRVMyQ29udGV4dCA6 IHB1YmxpYyBXZWJOb25Db3AKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJHTEVTMkNvbnRleHQo KSB7fQogCi0gICAgdmlydHVhbCBib29sIGluaXRpYWxpemUoV2ViVmlldyopID0gMDsKKyAgICB2 aXJ0dWFsIGJvb2wgaW5pdGlhbGl6ZShXZWJWaWV3KiwgV2ViR0xFUzJDb250ZXh0KiBwYXJlbnQp ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgbWFrZUN1cnJlbnQoKSA9IDA7CiAgICAgdmlydHVhbCBi b29sIGRlc3Ryb3koKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHN3YXBCdWZmZXJzKCkgPSAwOwpJ bmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9HTEVTMkNvbnRleHQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvR0xFUzJDb250ZXh0LmNwcAkocmV2aXNpb24gNjE2MjEpCisr KyBXZWJLaXQvY2hyb21pdW0vc3JjL0dMRVMyQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTU2LDIzICs1NiwyMCBAQCBwdWJsaWM6CiAKICAgICBib29sIGluaXRpYWxpemUoUGFnZSopOwog Ci0gICAgV2ViS2l0OjpXZWJHTEVTMkNvbnRleHQqIGdldFdlYkdMRVMyQ29udGV4dCgpIHsgcmV0 dXJuIG1faW1wbC5nZXQoKTsgfQorICAgIFdlYktpdDo6V2ViR0xFUzJDb250ZXh0KiBnZXRXZWJH TEVTMkNvbnRleHQoKSB7IHJldHVybiBtX2ltcGw7IH0KIAogcHJpdmF0ZToKLSAgICBPd25QdHI8 V2ViS2l0OjpXZWJHTEVTMkNvbnRleHQ+IG1faW1wbDsKKyAgICBXZWJLaXQ6OldlYkdMRVMyQ29u dGV4dCogbV9pbXBsOwogfTsKIAogYm9vbCBHTEVTMkNvbnRleHRJbnRlcm5hbDo6aW5pdGlhbGl6 ZShQYWdlKiBwYWdlKQogewotICAgIG1faW1wbCA9IFdlYktpdDo6d2ViS2l0Q2xpZW50KCktPmNy ZWF0ZUdMRVMyQ29udGV4dCgpOworICAgIEFTU0VSVChwYWdlKTsKKyAgICBXZWJLaXQ6OldlYlZp ZXdJbXBsKiB3ZWJWaWV3ID0gV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZnJvbVBhZ2UocGFnZSk7Cisg ICAgbV9pbXBsID0gd2ViVmlldy0+R0xFUzJDb250ZXh0KCk7CiAgICAgaWYgKCFtX2ltcGwpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIFdlYktpdDo6V2ViVmlld0ltcGwqIHdlYlZpZXcg PSBXZWJLaXQ6OldlYlZpZXdJbXBsOjpmcm9tUGFnZShwYWdlKTsKLSAgICBpZiAoIW1faW1wbC0+ aW5pdGlhbGl6ZSh3ZWJWaWV3KSkgewotICAgICAgICBtX2ltcGwuY2xlYXIoKTsKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlzaW9uIDYxNjIxKQorKysgV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkyLDYgKzkyLDggQEAK ICNpbmNsdWRlICJXZWJJbWFnZS5oIgogI2luY2x1ZGUgIldlYklucHV0RXZlbnQuaCIKICNpbmNs dWRlICJXZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5oIgorI2luY2x1ZGUgIldlYktpdC5oIgorI2lu Y2x1ZGUgIldlYktpdENsaWVudC5oIgogI2luY2x1ZGUgIldlYk1lZGlhUGxheWVyQWN0aW9uLmgi CiAjaW5jbHVkZSAiV2ViTm9kZS5oIgogI2luY2x1ZGUgIldlYlBvaW50LmgiCkBAIC0yNDYsNiAr MjQ4LDcgQEAgV2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKFdlYlZpZXdDbGllbnQqIAogICAgICwg bV9sYXllclJlbmRlcmVyKDApCiAgICAgLCBtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2 ZShmYWxzZSkKICNlbmRpZgorICAgICwgbV9nbGVzMkNvbnRleHQoMCkKIHsKICAgICAvLyBXZWJL aXQvd2luL1dlYlZpZXcuY3BwIGRvZXMgdGhlIHNhbWUgdGhpbmcsIGV4Y2VwdCB0aGV5IGNhbGwg dGhlCiAgICAgLy8gS0pTIHNwZWNpZmljIHdyYXBwZXIgYXJvdW5kIHRoaXMgbWV0aG9kLiBXZSBu ZWVkIHRvIGhhdmUgdGhyZWFkaW5nCkBAIC0yMjgwLDYgKzIyODMsMjMgQEAgdm9pZCBXZWJWaWV3 SW1wbDo6c2V0Um9vdExheWVyTmVlZHNEaXNwbAogICAgICAgICBtX2xheWVyUmVuZGVyZXItPnNl dE5lZWRzRGlzcGxheSgpOwogfQogCisvLyBSZXR1cm5zIHRoZSBHTEVTMiBjb250ZXh0IGFzc29j aWF0ZWQgd2l0aCB0aGlzIFZpZXcuIElmIG9uZSBkb2Vzbid0IGV4aXN0CisvLyBpdCB3aWxsIGdl dCBjcmVhdGVkIGZpcnN0LgorV2ViR0xFUzJDb250ZXh0KiBXZWJWaWV3SW1wbDo6R0xFUzJDb250 ZXh0KCkKK3sKKyAgICBpZiAoIW1fZ2xlczJDb250ZXh0KSB7CisgICAgICAgIG1fZ2xlczJDb250 ZXh0ID0gd2ViS2l0Q2xpZW50KCktPmNyZWF0ZUdMRVMyQ29udGV4dCgpOworICAgICAgICBpZiAo IW1fZ2xlczJDb250ZXh0KQorICAgICAgICAgICAgcmV0dXJuIDA7CisKKyAgICAgICAgaWYgKCFt X2dsZXMyQ29udGV4dC0+aW5pdGlhbGl6ZSh0aGlzLCAwKSkgeworICAgICAgICAgICAgbV9nbGVz MkNvbnRleHQuY2xlYXIoKTsKKyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICB9CisgICAg fQorICAgIHJldHVybiBtX2dsZXMyQ29udGV4dC5nZXQoKTsKK30KKwogI2VuZGlmCiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAkocmV2aXNp b24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgJKHdvcmtpbmcg Y29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgV2ViVmlld0ltcGxfaAogI2RlZmluZSBX ZWJWaWV3SW1wbF9oCiAKKyNpbmNsdWRlICJXZWJHTEVTMkNvbnRleHQuaCIKICNpbmNsdWRlICJX ZWJOYXZpZ2F0aW9uUG9saWN5LmgiCiAjaW5jbHVkZSAiV2ViUG9pbnQuaCIKICNpbmNsdWRlICJX ZWJTaXplLmgiCkBAIC0zMzQsNiArMzM1LDEwIEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgV2ViQ29yZTo6U2Nyb2xsRGlyZWN0aW9uKiBzY3JvbGxEaXJlY3Rp b24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYkNvcmU6OlNjcm9sbEdy YW51bGFyaXR5KiBzY3JvbGxHcmFudWxhcml0eSk7CiAKKyAgICAvLyBSZXR1cm5zIHRoZSBHTEVT MkNvbnRleHQgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViVmlldy4gT25lIHdpbGwgYmUgY3JlYXRl ZAorICAgIC8vIGlmIGl0IGRvZXNuJ3QgYWxyZWFkeSBleGlzdC4KKyAgICBXZWJHTEVTMkNvbnRl eHQqIEdMRVMyQ29udGV4dCgpOworCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXZWJWaWV3 OyAgLy8gU28gV2ViVmlldzo6Q3JlYXRlIGNhbiBjYWxsIG91ciBjb25zdHJ1Y3RvcgogICAgIGZy aWVuZCBjbGFzcyBXVEY6OlJlZkNvdW50ZWQ8V2ViVmlld0ltcGw+OwpAQCAtNTIxLDYgKzUyNiw4 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZTsK ICNlbmRpZgogICAgIHN0YXRpYyBjb25zdCBXZWJJbnB1dEV2ZW50KiBtX2N1cnJlbnRJbnB1dEV2 ZW50OworCisgICAgT3duUHRyPFdlYkdMRVMyQ29udGV4dD4gbV9nbGVzMkNvbnRleHQ7CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK 59532 2010-06-23 11:06:50 -0700 2010-06-23 22:54:24 -0700 Proposed patch addressing review comments gles2ContextWebView_41010_4.txt text/plain 6421 vangelis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE2MjcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMjIgIFZhbmdl bGlzIEtva2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQSBXZWJWaWV3IGNhbiBu b3cgb3duIGEgR0xFUzJDb250ZXh0IHdoaWNoIGdldHMgY3JlYXRlZCBvbgorICAgICAgICBkZW1h bmQuIFRoaXMgY29udGV4dCB3aWxsIHR5cGljYWxseSBiZSBjcmVhdGVkIGZvciB0aGUgZ3B1IGNv bXBvc2l0b3IKKyAgICAgICAgYW5kIHVzZWQgYXMgYSBwYXJlbnQgY29udGV4dCBmb3IgYW55IGVs ZW1lbnRzIG9uIHRoZSBwYWdlIHRoYXQgdXNlIHRoZQorICAgICAgICBncHUgZm9yIHJlbmRlcmlu ZyAoZS5nLiBXZWJHTCkgYW5kIG5lZWQgdG8gcGFzcyB0aGVpciBiYWNrYnVmZmVyIGRpcmVjdGx5 CisgICAgICAgIHRvIHRoZSBjb21wb3NpdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTAKKworICAgICAgICAqIHB1YmxpYy9XZWJHTEVTMkNv bnRleHQuaDoKKyAgICAgICAgKiBzcmMvR0xFUzJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkdMRVMyQ29udGV4dEludGVybmFsOjpnZXRXZWJHTEVTMkNvbnRleHQpOgorICAgICAgICAo V2ViQ29yZTo6R0xFUzJDb250ZXh0SW50ZXJuYWw6OmluaXRpYWxpemUpOgorICAgICAgICAqIHNy Yy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpXZWJWaWV3 SW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpnbGVzMkNvbnRleHQpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTA2LTIyICBNaWtoYWlsIE5hZ2Fub3Yg IDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViR0xFUzJDb250ZXh0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaAkocmV2 aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdMRVMyQ29udGV4dC5o CSh3b3JraW5nIGNvcHkpCkBAIC00NSw3ICs0NSw3IEBAIGNsYXNzIFdlYkdMRVMyQ29udGV4dCA6 IHB1YmxpYyBXZWJOb25Db3AKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJHTEVTMkNvbnRleHQo KSB7fQogCi0gICAgdmlydHVhbCBib29sIGluaXRpYWxpemUoV2ViVmlldyopID0gMDsKKyAgICB2 aXJ0dWFsIGJvb2wgaW5pdGlhbGl6ZShXZWJWaWV3KiwgV2ViR0xFUzJDb250ZXh0KiBwYXJlbnQp ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgbWFrZUN1cnJlbnQoKSA9IDA7CiAgICAgdmlydHVhbCBi b29sIGRlc3Ryb3koKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHN3YXBCdWZmZXJzKCkgPSAwOwpJ bmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9HTEVTMkNvbnRleHQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvR0xFUzJDb250ZXh0LmNwcAkocmV2aXNpb24gNjE2MjEpCisr KyBXZWJLaXQvY2hyb21pdW0vc3JjL0dMRVMyQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ3LDYgKzQ3LDggQEAKIC8vICAgICAgV2ViR0xFUzJDb250ZXh0LiBUaGlzIGlzIGRvbmUgc28g d2UgaGF2ZSBhIHBsYWNlIHRvIGluamVjdCBhbgogLy8gICAgICBpbXBsZW1lbnRhdGlvbiB3aGlj aCBjcmVhdGVzIHRoZSBHTCBFUyBjb250ZXh0LgogCit1c2luZyBuYW1lc3BhY2UgV2ViS2l0Owor CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEdMRVMyQ29udGV4dEludGVybmFsIHsKQEAg LTU2LDIzICs1OCwyMCBAQCBwdWJsaWM6CiAKICAgICBib29sIGluaXRpYWxpemUoUGFnZSopOwog Ci0gICAgV2ViS2l0OjpXZWJHTEVTMkNvbnRleHQqIGdldFdlYkdMRVMyQ29udGV4dCgpIHsgcmV0 dXJuIG1faW1wbC5nZXQoKTsgfQorICAgIFdlYkdMRVMyQ29udGV4dCogZ2V0V2ViR0xFUzJDb250 ZXh0KCkgeyByZXR1cm4gbV9pbXBsOyB9CiAKIHByaXZhdGU6Ci0gICAgT3duUHRyPFdlYktpdDo6 V2ViR0xFUzJDb250ZXh0PiBtX2ltcGw7CisgICAgV2ViR0xFUzJDb250ZXh0KiBtX2ltcGw7CiB9 OwogCiBib29sIEdMRVMyQ29udGV4dEludGVybmFsOjppbml0aWFsaXplKFBhZ2UqIHBhZ2UpCiB7 Ci0gICAgbV9pbXBsID0gV2ViS2l0Ojp3ZWJLaXRDbGllbnQoKS0+Y3JlYXRlR0xFUzJDb250ZXh0 KCk7CisgICAgQVNTRVJUKHBhZ2UpOworICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gV2ViVmll d0ltcGw6OmZyb21QYWdlKHBhZ2UpOworICAgIG1faW1wbCA9IHdlYlZpZXctPmdsZXMyQ29udGV4 dCgpOwogICAgIGlmICghbV9pbXBsKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBXZWJL aXQ6OldlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZnJvbVBhZ2Uo cGFnZSk7Ci0gICAgaWYgKCFtX2ltcGwtPmluaXRpYWxpemUod2ViVmlldykpIHsKLSAgICAgICAg bV9pbXBsLmNsZWFyKCk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9CiAgICAgcmV0dXJu IHRydWU7CiB9CiAKQEAgLTk0LDcgKzkzLDcgQEAgR0xFUzJDb250ZXh0Ojp+R0xFUzJDb250ZXh0 KCkKIAogYm9vbCBHTEVTMkNvbnRleHQ6Om1ha2VDdXJyZW50KCkKIHsKLSAgICBXZWJLaXQ6Oldl YkdMRVMyQ29udGV4dCogd2ViQ29udGV4dCA9IG1faW50ZXJuYWwtPmdldFdlYkdMRVMyQ29udGV4 dCgpOworICAgIFdlYkdMRVMyQ29udGV4dCogd2ViQ29udGV4dCA9IG1faW50ZXJuYWwtPmdldFdl YkdMRVMyQ29udGV4dCgpOwogICAgIGlmICghd2ViQ29udGV4dCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIHJldHVybiB3ZWJDb250ZXh0LT5tYWtlQ3VycmVudCgpOwpAQCAtMTAyLDcgKzEw MSw3IEBAIGJvb2wgR0xFUzJDb250ZXh0OjptYWtlQ3VycmVudCgpCiAKIGJvb2wgR0xFUzJDb250 ZXh0OjpkZXN0cm95KCkKIHsKLSAgICBXZWJLaXQ6OldlYkdMRVMyQ29udGV4dCogd2ViQ29udGV4 dCA9IG1faW50ZXJuYWwtPmdldFdlYkdMRVMyQ29udGV4dCgpOworICAgIFdlYkdMRVMyQ29udGV4 dCogd2ViQ29udGV4dCA9IG1faW50ZXJuYWwtPmdldFdlYkdMRVMyQ29udGV4dCgpOwogICAgIGlm ICghd2ViQ29udGV4dCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiB3ZWJDb250 ZXh0LT5kZXN0cm95KCk7CkBAIC0xMTAsNyArMTA5LDcgQEAgYm9vbCBHTEVTMkNvbnRleHQ6OmRl c3Ryb3koKQogCiBib29sIEdMRVMyQ29udGV4dDo6c3dhcEJ1ZmZlcnMoKQogewotICAgIFdlYktp dDo6V2ViR0xFUzJDb250ZXh0KiB3ZWJDb250ZXh0ID0gbV9pbnRlcm5hbC0+Z2V0V2ViR0xFUzJD b250ZXh0KCk7CisgICAgV2ViR0xFUzJDb250ZXh0KiB3ZWJDb250ZXh0ID0gbV9pbnRlcm5hbC0+ Z2V0V2ViR0xFUzJDb250ZXh0KCk7CiAgICAgaWYgKCF3ZWJDb250ZXh0KQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgcmV0dXJuIHdlYkNvbnRleHQtPnN3YXBCdWZmZXJzKCk7CkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkocmV2aXNpb24gNjE2MjEpCisrKyBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIsNiArOTIs OCBAQAogI2luY2x1ZGUgIldlYkltYWdlLmgiCiAjaW5jbHVkZSAiV2ViSW5wdXRFdmVudC5oIgog I2luY2x1ZGUgIldlYklucHV0RXZlbnRDb252ZXJzaW9uLmgiCisjaW5jbHVkZSAiV2ViS2l0Lmgi CisjaW5jbHVkZSAiV2ViS2l0Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViTWVkaWFQbGF5ZXJBY3Rp b24uaCIKICNpbmNsdWRlICJXZWJOb2RlLmgiCiAjaW5jbHVkZSAiV2ViUG9pbnQuaCIKQEAgLTI0 Niw2ICsyNDgsNyBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogCiAg ICAgLCBtX2xheWVyUmVuZGVyZXIoMCkKICAgICAsIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5n QWN0aXZlKGZhbHNlKQogI2VuZGlmCisgICAgLCBtX2dsZXMyQ29udGV4dCgwKQogewogICAgIC8v IFdlYktpdC93aW4vV2ViVmlldy5jcHAgZG9lcyB0aGUgc2FtZSB0aGluZywgZXhjZXB0IHRoZXkg Y2FsbCB0aGUKICAgICAvLyBLSlMgc3BlY2lmaWMgd3JhcHBlciBhcm91bmQgdGhpcyBtZXRob2Qu IFdlIG5lZWQgdG8gaGF2ZSB0aHJlYWRpbmcKQEAgLTIyNzksNyArMjI4MiwyMyBAQCB2b2lkIFdl YlZpZXdJbXBsOjpzZXRSb290TGF5ZXJOZWVkc0Rpc3BsCiAgICAgaWYgKG1fbGF5ZXJSZW5kZXJl cikKICAgICAgICAgbV9sYXllclJlbmRlcmVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKIH0KKyNlbmRp ZiAgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogCi0jZW5kaWYKKy8vIFJldHVybnMg dGhlIEdMRVMyIGNvbnRleHQgYXNzb2NpYXRlZCB3aXRoIHRoaXMgVmlldy4gSWYgb25lIGRvZXNu J3QgZXhpc3QKKy8vIGl0IHdpbGwgZ2V0IGNyZWF0ZWQgZmlyc3QuCitXZWJHTEVTMkNvbnRleHQq IFdlYlZpZXdJbXBsOjpnbGVzMkNvbnRleHQoKQoreworICAgIGlmICghbV9nbGVzMkNvbnRleHQp IHsKKyAgICAgICAgbV9nbGVzMkNvbnRleHQgPSB3ZWJLaXRDbGllbnQoKS0+Y3JlYXRlR0xFUzJD b250ZXh0KCk7CisgICAgICAgIGlmICghbV9nbGVzMkNvbnRleHQpCisgICAgICAgICAgICByZXR1 cm4gMDsKKworICAgICAgICBpZiAoIW1fZ2xlczJDb250ZXh0LT5pbml0aWFsaXplKHRoaXMsIDAp KSB7CisgICAgICAgICAgICBtX2dsZXMyQ29udGV4dC5jbGVhcigpOworICAgICAgICAgICAgcmV0 dXJuIDA7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG1fZ2xlczJDb250ZXh0LmdldCgp OworfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmgJKHJldmlzaW9uIDYxNjIxKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAjaWZuZGVmIFdlYlZpZXdJbXBs X2gKICNkZWZpbmUgV2ViVmlld0ltcGxfaAogCisjaW5jbHVkZSAiV2ViR0xFUzJDb250ZXh0Lmgi CiAjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblBvbGljeS5oIgogI2luY2x1ZGUgIldlYlBvaW50Lmgi CiAjaW5jbHVkZSAiV2ViU2l6ZS5oIgpAQCAtMzM0LDYgKzMzNSwxMCBAQCBwdWJsaWM6CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYkNvcmU6OlNjcm9sbERpcmVjdGlvbiog c2Nyb2xsRGlyZWN0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJD b3JlOjpTY3JvbGxHcmFudWxhcml0eSogc2Nyb2xsR3JhbnVsYXJpdHkpOwogCisgICAgLy8gUmV0 dXJucyB0aGUgR0xFUzJDb250ZXh0IGFzc29jaWF0ZWQgd2l0aCB0aGlzIFdlYlZpZXcuIE9uZSB3 aWxsIGJlIGNyZWF0ZWQKKyAgICAvLyBpZiBpdCBkb2Vzbid0IGFscmVhZHkgZXhpc3QuCisgICAg V2ViR0xFUzJDb250ZXh0KiBnbGVzMkNvbnRleHQoKTsKKwogcHJpdmF0ZToKICAgICBmcmllbmQg Y2xhc3MgV2ViVmlldzsgIC8vIFNvIFdlYlZpZXc6OkNyZWF0ZSBjYW4gY2FsbCBvdXIgY29uc3Ry dWN0b3IKICAgICBmcmllbmQgY2xhc3MgV1RGOjpSZWZDb3VudGVkPFdlYlZpZXdJbXBsPjsKQEAg LTUyMSw2ICs1MjYsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc0FjY2VsZXJhdGVkQ29tcG9z aXRpbmdBY3RpdmU7CiAjZW5kaWYKICAgICBzdGF0aWMgY29uc3QgV2ViSW5wdXRFdmVudCogbV9j dXJyZW50SW5wdXRFdmVudDsKKworICAgIE93blB0cjxXZWJHTEVTMkNvbnRleHQ+IG1fZ2xlczJD b250ZXh0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 59547 2010-06-23 12:02:31 -0700 2010-06-24 11:09:51 -0700 Proposed patch. Fixed style issue. gles2ContextWebView_41010_5.txt text/plain 6420 vangelis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjE2MjcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMjIgIFZhbmdl bGlzIEtva2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQSBXZWJWaWV3IGNhbiBu b3cgb3duIGEgR0xFUzJDb250ZXh0IHdoaWNoIGdldHMgY3JlYXRlZCBvbgorICAgICAgICBkZW1h bmQuIFRoaXMgY29udGV4dCB3aWxsIHR5cGljYWxseSBiZSBjcmVhdGVkIGZvciB0aGUgZ3B1IGNv bXBvc2l0b3IKKyAgICAgICAgYW5kIHVzZWQgYXMgYSBwYXJlbnQgY29udGV4dCBmb3IgYW55IGVs ZW1lbnRzIG9uIHRoZSBwYWdlIHRoYXQgdXNlIHRoZQorICAgICAgICBncHUgZm9yIHJlbmRlcmlu ZyAoZS5nLiBXZWJHTCkgYW5kIG5lZWQgdG8gcGFzcyB0aGVpciBiYWNrYnVmZmVyIGRpcmVjdGx5 CisgICAgICAgIHRvIHRoZSBjb21wb3NpdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTAKKworICAgICAgICAqIHB1YmxpYy9XZWJHTEVTMkNv bnRleHQuaDoKKyAgICAgICAgKiBzcmMvR0xFUzJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkdMRVMyQ29udGV4dEludGVybmFsOjpnZXRXZWJHTEVTMkNvbnRleHQpOgorICAgICAgICAo V2ViQ29yZTo6R0xFUzJDb250ZXh0SW50ZXJuYWw6OmluaXRpYWxpemUpOgorICAgICAgICAqIHNy Yy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpXZWJWaWV3 SW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpnbGVzMkNvbnRleHQpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTA2LTIyICBNaWtoYWlsIE5hZ2Fub3Yg IDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViR0xFUzJDb250ZXh0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaAkocmV2 aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdMRVMyQ29udGV4dC5o CSh3b3JraW5nIGNvcHkpCkBAIC00NSw3ICs0NSw3IEBAIGNsYXNzIFdlYkdMRVMyQ29udGV4dCA6 IHB1YmxpYyBXZWJOb25Db3AKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJHTEVTMkNvbnRleHQo KSB7fQogCi0gICAgdmlydHVhbCBib29sIGluaXRpYWxpemUoV2ViVmlldyopID0gMDsKKyAgICB2 aXJ0dWFsIGJvb2wgaW5pdGlhbGl6ZShXZWJWaWV3KiwgV2ViR0xFUzJDb250ZXh0KiBwYXJlbnQp ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgbWFrZUN1cnJlbnQoKSA9IDA7CiAgICAgdmlydHVhbCBi b29sIGRlc3Ryb3koKSA9IDA7CiAgICAgdmlydHVhbCBib29sIHN3YXBCdWZmZXJzKCkgPSAwOwpJ bmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9HTEVTMkNvbnRleHQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvR0xFUzJDb250ZXh0LmNwcAkocmV2aXNpb24gNjE2MjEpCisr KyBXZWJLaXQvY2hyb21pdW0vc3JjL0dMRVMyQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ3LDYgKzQ3LDggQEAKIC8vICAgICAgV2ViR0xFUzJDb250ZXh0LiBUaGlzIGlzIGRvbmUgc28g d2UgaGF2ZSBhIHBsYWNlIHRvIGluamVjdCBhbgogLy8gICAgICBpbXBsZW1lbnRhdGlvbiB3aGlj aCBjcmVhdGVzIHRoZSBHTCBFUyBjb250ZXh0LgogCit1c2luZyBuYW1lc3BhY2UgV2ViS2l0Owor CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEdMRVMyQ29udGV4dEludGVybmFsIHsKQEAg LTU2LDIzICs1OCwyMCBAQCBwdWJsaWM6CiAKICAgICBib29sIGluaXRpYWxpemUoUGFnZSopOwog Ci0gICAgV2ViS2l0OjpXZWJHTEVTMkNvbnRleHQqIGdldFdlYkdMRVMyQ29udGV4dCgpIHsgcmV0 dXJuIG1faW1wbC5nZXQoKTsgfQorICAgIFdlYkdMRVMyQ29udGV4dCogZ2V0V2ViR0xFUzJDb250 ZXh0KCkgeyByZXR1cm4gbV9pbXBsOyB9CiAKIHByaXZhdGU6Ci0gICAgT3duUHRyPFdlYktpdDo6 V2ViR0xFUzJDb250ZXh0PiBtX2ltcGw7CisgICAgV2ViR0xFUzJDb250ZXh0KiBtX2ltcGw7CiB9 OwogCiBib29sIEdMRVMyQ29udGV4dEludGVybmFsOjppbml0aWFsaXplKFBhZ2UqIHBhZ2UpCiB7 Ci0gICAgbV9pbXBsID0gV2ViS2l0Ojp3ZWJLaXRDbGllbnQoKS0+Y3JlYXRlR0xFUzJDb250ZXh0 KCk7CisgICAgQVNTRVJUKHBhZ2UpOworICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gV2ViVmll d0ltcGw6OmZyb21QYWdlKHBhZ2UpOworICAgIG1faW1wbCA9IHdlYlZpZXctPmdsZXMyQ29udGV4 dCgpOwogICAgIGlmICghbV9pbXBsKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBXZWJL aXQ6OldlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZnJvbVBhZ2Uo cGFnZSk7Ci0gICAgaWYgKCFtX2ltcGwtPmluaXRpYWxpemUod2ViVmlldykpIHsKLSAgICAgICAg bV9pbXBsLmNsZWFyKCk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9CiAgICAgcmV0dXJu IHRydWU7CiB9CiAKQEAgLTk0LDcgKzkzLDcgQEAgR0xFUzJDb250ZXh0Ojp+R0xFUzJDb250ZXh0 KCkKIAogYm9vbCBHTEVTMkNvbnRleHQ6Om1ha2VDdXJyZW50KCkKIHsKLSAgICBXZWJLaXQ6Oldl YkdMRVMyQ29udGV4dCogd2ViQ29udGV4dCA9IG1faW50ZXJuYWwtPmdldFdlYkdMRVMyQ29udGV4 dCgpOworICAgIFdlYkdMRVMyQ29udGV4dCogd2ViQ29udGV4dCA9IG1faW50ZXJuYWwtPmdldFdl YkdMRVMyQ29udGV4dCgpOwogICAgIGlmICghd2ViQ29udGV4dCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIHJldHVybiB3ZWJDb250ZXh0LT5tYWtlQ3VycmVudCgpOwpAQCAtMTAyLDcgKzEw MSw3IEBAIGJvb2wgR0xFUzJDb250ZXh0OjptYWtlQ3VycmVudCgpCiAKIGJvb2wgR0xFUzJDb250 ZXh0OjpkZXN0cm95KCkKIHsKLSAgICBXZWJLaXQ6OldlYkdMRVMyQ29udGV4dCogd2ViQ29udGV4 dCA9IG1faW50ZXJuYWwtPmdldFdlYkdMRVMyQ29udGV4dCgpOworICAgIFdlYkdMRVMyQ29udGV4 dCogd2ViQ29udGV4dCA9IG1faW50ZXJuYWwtPmdldFdlYkdMRVMyQ29udGV4dCgpOwogICAgIGlm ICghd2ViQ29udGV4dCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiB3ZWJDb250 ZXh0LT5kZXN0cm95KCk7CkBAIC0xMTAsNyArMTA5LDcgQEAgYm9vbCBHTEVTMkNvbnRleHQ6OmRl c3Ryb3koKQogCiBib29sIEdMRVMyQ29udGV4dDo6c3dhcEJ1ZmZlcnMoKQogewotICAgIFdlYktp dDo6V2ViR0xFUzJDb250ZXh0KiB3ZWJDb250ZXh0ID0gbV9pbnRlcm5hbC0+Z2V0V2ViR0xFUzJD b250ZXh0KCk7CisgICAgV2ViR0xFUzJDb250ZXh0KiB3ZWJDb250ZXh0ID0gbV9pbnRlcm5hbC0+ Z2V0V2ViR0xFUzJDb250ZXh0KCk7CiAgICAgaWYgKCF3ZWJDb250ZXh0KQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgcmV0dXJuIHdlYkNvbnRleHQtPnN3YXBCdWZmZXJzKCk7CkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkocmV2aXNpb24gNjE2MjEpCisrKyBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIsNiArOTIs OCBAQAogI2luY2x1ZGUgIldlYkltYWdlLmgiCiAjaW5jbHVkZSAiV2ViSW5wdXRFdmVudC5oIgog I2luY2x1ZGUgIldlYklucHV0RXZlbnRDb252ZXJzaW9uLmgiCisjaW5jbHVkZSAiV2ViS2l0Lmgi CisjaW5jbHVkZSAiV2ViS2l0Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViTWVkaWFQbGF5ZXJBY3Rp b24uaCIKICNpbmNsdWRlICJXZWJOb2RlLmgiCiAjaW5jbHVkZSAiV2ViUG9pbnQuaCIKQEAgLTI0 Niw2ICsyNDgsNyBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogCiAg ICAgLCBtX2xheWVyUmVuZGVyZXIoMCkKICAgICAsIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5n QWN0aXZlKGZhbHNlKQogI2VuZGlmCisgICAgLCBtX2dsZXMyQ29udGV4dCgwKQogewogICAgIC8v IFdlYktpdC93aW4vV2ViVmlldy5jcHAgZG9lcyB0aGUgc2FtZSB0aGluZywgZXhjZXB0IHRoZXkg Y2FsbCB0aGUKICAgICAvLyBLSlMgc3BlY2lmaWMgd3JhcHBlciBhcm91bmQgdGhpcyBtZXRob2Qu IFdlIG5lZWQgdG8gaGF2ZSB0aHJlYWRpbmcKQEAgLTIyNzksNyArMjI4MiwyMyBAQCB2b2lkIFdl YlZpZXdJbXBsOjpzZXRSb290TGF5ZXJOZWVkc0Rpc3BsCiAgICAgaWYgKG1fbGF5ZXJSZW5kZXJl cikKICAgICAgICAgbV9sYXllclJlbmRlcmVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKIH0KKyNlbmRp ZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAKLSNlbmRpZgorLy8gUmV0dXJucyB0 aGUgR0xFUzIgY29udGV4dCBhc3NvY2lhdGVkIHdpdGggdGhpcyBWaWV3LiBJZiBvbmUgZG9lc24n dCBleGlzdAorLy8gaXQgd2lsbCBnZXQgY3JlYXRlZCBmaXJzdC4KK1dlYkdMRVMyQ29udGV4dCog V2ViVmlld0ltcGw6OmdsZXMyQ29udGV4dCgpCit7CisgICAgaWYgKCFtX2dsZXMyQ29udGV4dCkg eworICAgICAgICBtX2dsZXMyQ29udGV4dCA9IHdlYktpdENsaWVudCgpLT5jcmVhdGVHTEVTMkNv bnRleHQoKTsKKyAgICAgICAgaWYgKCFtX2dsZXMyQ29udGV4dCkKKyAgICAgICAgICAgIHJldHVy biAwOworCisgICAgICAgIGlmICghbV9nbGVzMkNvbnRleHQtPmluaXRpYWxpemUodGhpcywgMCkp IHsKKyAgICAgICAgICAgIG1fZ2xlczJDb250ZXh0LmNsZWFyKCk7CisgICAgICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbV9nbGVzMkNvbnRleHQuZ2V0KCk7 Cit9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAkocmV2aXNpb24gNjE2MjEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgV2ViVmlld0ltcGxf aAogI2RlZmluZSBXZWJWaWV3SW1wbF9oCiAKKyNpbmNsdWRlICJXZWJHTEVTMkNvbnRleHQuaCIK ICNpbmNsdWRlICJXZWJOYXZpZ2F0aW9uUG9saWN5LmgiCiAjaW5jbHVkZSAiV2ViUG9pbnQuaCIK ICNpbmNsdWRlICJXZWJTaXplLmgiCkBAIC0zMzQsNiArMzM1LDEwIEBAIHB1YmxpYzoKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV2ViQ29yZTo6U2Nyb2xsRGlyZWN0aW9uKiBz Y3JvbGxEaXJlY3Rpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYkNv cmU6OlNjcm9sbEdyYW51bGFyaXR5KiBzY3JvbGxHcmFudWxhcml0eSk7CiAKKyAgICAvLyBSZXR1 cm5zIHRoZSBHTEVTMkNvbnRleHQgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViVmlldy4gT25lIHdp bGwgYmUgY3JlYXRlZAorICAgIC8vIGlmIGl0IGRvZXNuJ3QgYWxyZWFkeSBleGlzdC4KKyAgICBX ZWJHTEVTMkNvbnRleHQqIGdsZXMyQ29udGV4dCgpOworCiBwcml2YXRlOgogICAgIGZyaWVuZCBj bGFzcyBXZWJWaWV3OyAgLy8gU28gV2ViVmlldzo6Q3JlYXRlIGNhbiBjYWxsIG91ciBjb25zdHJ1 Y3RvcgogICAgIGZyaWVuZCBjbGFzcyBXVEY6OlJlZkNvdW50ZWQ8V2ViVmlld0ltcGw+OwpAQCAt NTIxLDYgKzUyNiw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0FjdGl2ZTsKICNlbmRpZgogICAgIHN0YXRpYyBjb25zdCBXZWJJbnB1dEV2ZW50KiBtX2N1 cnJlbnRJbnB1dEV2ZW50OworCisgICAgT3duUHRyPFdlYkdMRVMyQ29udGV4dD4gbV9nbGVzMkNv bnRleHQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK