101883 2012-11-11 18:58:08 -0800 [TexMap][Cairo] Accelerated compositing debug visuals 2012-11-14 15:24:00 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 helder.correia webkit-unassigned laszlo.gombos mrobinson noam ostap73 webkit.review.bot yael zeno oldest_to_newest 763973 0 helder.correia 2012-11-11 18:58:08 -0800 Add a Cairo implementation to complement the patch from bug 90116. 763978 1 173539 helder.correia 2012-11-11 19:16:01 -0800 Created attachment 173539 Patch 763979 2 webkit.review.bot 2012-11-11 19:17:47 -0800 Attachment 173539 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:44: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 767265 3 173539 ostap73 2012-11-14 13:53:02 -0800 Comment on attachment 173539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173539&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:365 > + cairo_set_source_rgb(cr, 1, 0, 0); Qt has comment about blue color that it will turn red because R+B are not swapped. Will it result blue or red here? If it will result in different color from specified, IMHO, it requires comment here. > Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp:114 > + return (String(getenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS")) == "1"); Should we use EFL prefix as Qt does? 767276 4 noam 2012-11-14 13:56:57 -0800 > > Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp:114 > > + return (String(getenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS")) == "1"); > > Should we use EFL prefix as Qt does? I don't think that's needed, since Cairo is not EFL specific. 767280 5 173539 mrobinson 2012-11-14 13:58:44 -0800 Comment on attachment 173539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173539&action=review Looks sane to me. >> Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:365 >> + cairo_set_source_rgb(cr, 1, 0, 0); > > Qt has comment about blue color that it will turn red because R+B are not swapped. > Will it result blue or red here? If it will result in different color from specified, IMHO, it requires comment here. You probably want to do the same thing as Qt above here. > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:372 > + cairo_move_to(cr, 2, pointSize); Is this 2 pixels just padding? 767285 6 helder.correia 2012-11-14 14:00:49 -0800 (In reply to comment #3) > You probably want to do the same thing as Qt above here. For Cairo, this patch will paint in red, just like the code above for Qt. > Is this 2 pixels just padding? Yes, could be anything. 767301 7 ostap73 2012-11-14 14:12:14 -0800 (In reply to comment #6) > (In reply to comment #3) > > You probably want to do the same thing as Qt above here. > > For Cairo, this patch will paint in red, just like the code above for Qt. Yes, it seems it will be red, because updateContents always swizzles. 767309 8 174259 helder.correia 2012-11-14 14:19:06 -0800 Created attachment 174259 Fix style 767320 9 174259 kenneth 2012-11-14 14:30:27 -0800 Comment on attachment 174259 Fix style View in context: https://bugs.webkit.org/attachment.cgi?id=174259&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:357 > + // cairo_text_extents() requires a cairo_t, so dimensions need to be guesstimated. no way of getting hold of that? > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:361 > + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); why not use RefPtr they work for cairo_surface_t! etc > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:362 > + cairo_t* cr = cairo_create(surface); Here you have one, a bit too late :) > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:363 > + cairo_surface_destroy(surface); Is this safe here? cr stays valid? 767324 10 helder.correia 2012-11-14 14:39:16 -0800 (In reply to comment #9) > (From update of attachment 174259 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=174259&action=review > > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:357 > > + // cairo_text_extents() requires a cairo_t, so dimensions need to be guesstimated. > > no way of getting hold of that? AFAIK no. We need the width and height to create the surface, which we need to create the context, which we need to use the text extents, which we need to create the surface in the first place. In Qt, QFontMetrics don't need a QPainter. There might be a way in Cairo, but I'm not aware of it. Of course I could create a separate context just for the purpose, but I think there's no point. > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:361 > > + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); > > why not use RefPtr they work for cairo_surface_t! etc I know, I chose to explicitly destroy it locally with no smart pointer allocation because its life cycle is pretty tiny and controlled. > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:363 > > + cairo_surface_destroy(surface); > > Is this safe here? cr stays valid? From http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-create : "This function references target, so you can immediately call cairo_surface_destroy() on it if you don't need to maintain a separate reference to it." 767347 11 174259 webkit.review.bot 2012-11-14 15:03:11 -0800 Comment on attachment 174259 Fix style Clearing flags on attachment: 174259 Committed r134676: <http://trac.webkit.org/changeset/134676> 767348 12 webkit.review.bot 2012-11-14 15:03:15 -0800 All reviewed patches have been landed. Closing bug. 767359 13 yael 2012-11-14 15:24:00 -0800 Can this new code be combined with TextureMapperLayer::drawRepaintCounter somehow? 173539 2012-11-11 19:16:01 -0800 2012-11-14 14:19:04 -0800 Patch bug-101883-20121111191404.patch text/plain 6194 helder.correia U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM2ZDk3ZTI0ZGNmZTBj YWEwZWNkOTFiYWUxMTA2ODM0MDc2OGNkYy4uNTVkNzM1YmI2M2U4NWNmOTVmYzk2YzE3ZDA3M2Ux N2Y5ZDE0NTY0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTExLTExICBIZWxk ZXIgQ29ycmVpYSAgPGhlbGRlci5jb3JyZWlhQG5va2lhLmNvbT4KKworICAgICAgICBbVGV4TWFw XVtDYWlyb10gQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgZGVidWcgdmlzdWFscworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxODgzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0 IGludHJvZHVjaW5nIGEgZGVidWcgZmVhdHVyZS4KKworICAgICAgICBBZGQgYSBDYWlybyBpbXBs ZW1lbnRhdGlvbiB0byBjb21wbGVtZW50IHRoZSBwYXRjaCBmcm9tIGJ1ZyA5MDExNgorICAgICAg ICAoaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTIyMjc1KS4KKworICAgICAgICBG b3IgdGhpcyBmZWF0dXJlIHRvIGJlIGVuYWJsZWQsIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZQor ICAgICAgICBXRUJLSVRfU0hPV19DT01QT1NJVElOR19ERUJVR19WSVNVQUxTIG11c3QgYmUgc2V0 IHRvIDEuIE9uY2UgZW5hYmxlZCwKKyAgICAgICAgYm90aCByZXBhaW50IGNvdW50ZXJzIGFuZCB0 aWxlIGJvcmRlcnMgd2lsbCBiZSBwYWludGVkLgorCisgICAgICAgIEEgQ2Fpcm8tc3BlY2lmaWMg ZHJhd1JlcGFpbnRDb3VudGVyKCkgaW1wbGVtZW50YXRpb24gd2FzIGFkZGVkIHRvCisgICAgICAg IFRleHR1cmVNYXBwZXJHTC4gQSBjYWlyb19zdXJmYWNlX3QgaXMgdXNlZCBhcyBzY3JhdGNoIGJ1 ZmZlciB0byBwYWludAorICAgICAgICB0aGUgY291bnRlcnMuIEl0IGlzIHRoZW4gdXBsb2FkZWQg dG8gYSBCaXRtYXBUZXh0dXJlIGFjcXVpcmVkCisgICAgICAgIGZyb20gdGhlIHBvb2wgYW5kIGZp bmFsbHkgZHJhdyBieSBUZXh0dXJlTWFwcGVyLiBUaGUgYWN0dWFsIGNvbXBvc2l0aW5nCisgICAg ICAgIGhhcHBlbnMgaW5zaWRlIExheWVyQmFja2luZ1N0b3JlOjpwYWludFRvVGV4dHVyZU1hcHBl cigpLiBFYWNoCisgICAgICAgIExheWVyQmFja2luZ1N0b3JlVGlsZSBoYXMgYSByZXBhaW50IGNv dW50ZXIgd2hpY2ggZ2V0cyBpbmNyZW1lbnRlZCBpbgorICAgICAgICBMYXllckJhY2tpbmdTdG9y ZTo6dXBkYXRlVGlsZSgpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJHTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmRy YXdSZXBhaW50Q291bnRlcik6CisKIDIwMTItMTEtMTEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MzQxNDQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGMzNmJiMDkzMDY1Njk3NzdiNjhjZTFkODc0OTk2NWJmMTZi ZGEzMy4uMDVkNzE0YWU4NDYyNDYyMzZjOWEzMDNlYTc5M2IzZWU3YjNhYjQyZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTExLTExICBIZWxkZXIgQ29ycmVpYSAgPGhlbGRlci5j b3JyZWlhQG5va2lhLmNvbT4KKworICAgICAgICBbVGV4TWFwXVtDYWlyb10gQWNjZWxlcmF0ZWQg Y29tcG9zaXRpbmcgZGVidWcgdmlzdWFscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAxODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IGludHJvZHVjaW5nIGEgZGVidWcg ZmVhdHVyZS4KKworICAgICAgICBBZGQgYSBDYWlybyBpbXBsZW1lbnRhdGlvbiB0byBjb21wbGVt ZW50IHRoZSBwYXRjaCBmcm9tIGJ1ZyA5MDExNgorICAgICAgICAoaHR0cDovL3RyYWMud2Via2l0 Lm9yZy9jaGFuZ2VzZXQvMTIyMjc1KS4KKworICAgICAgICBGb3IgdGhpcyBmZWF0dXJlIHRvIGJl IGVuYWJsZWQsIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZQorICAgICAgICBXRUJLSVRfU0hPV19D T01QT1NJVElOR19ERUJVR19WSVNVQUxTIG11c3QgYmUgc2V0IHRvIDEuIE9uY2UgZW5hYmxlZCwK KyAgICAgICAgYm90aCByZXBhaW50IGNvdW50ZXJzIGFuZCB0aWxlIGJvcmRlcnMgd2lsbCBiZSBw YWludGVkLgorCisgICAgICAgIEEgQ2Fpcm8tc3BlY2lmaWMgZHJhd1JlcGFpbnRDb3VudGVyKCkg aW1wbGVtZW50YXRpb24gd2FzIGFkZGVkIHRvCisgICAgICAgIFRleHR1cmVNYXBwZXJHTC4gQSBj YWlyb19zdXJmYWNlX3QgaXMgdXNlZCBhcyBzY3JhdGNoIGJ1ZmZlciB0byBwYWludAorICAgICAg ICB0aGUgY291bnRlcnMuIEl0IGlzIHRoZW4gdXBsb2FkZWQgdG8gYSBCaXRtYXBUZXh0dXJlIGFj cXVpcmVkCisgICAgICAgIGZyb20gdGhlIHBvb2wgYW5kIGZpbmFsbHkgZHJhdyBieSBUZXh0dXJl TWFwcGVyLiBUaGUgYWN0dWFsIGNvbXBvc2l0aW5nCisgICAgICAgIGhhcHBlbnMgaW5zaWRlIExh eWVyQmFja2luZ1N0b3JlOjpwYWludFRvVGV4dHVyZU1hcHBlcigpLiBFYWNoCisgICAgICAgIExh eWVyQmFja2luZ1N0b3JlVGlsZSBoYXMgYSByZXBhaW50IGNvdW50ZXIgd2hpY2ggZ2V0cyBpbmNy ZW1lbnRlZCBpbgorICAgICAgICBMYXllckJhY2tpbmdTdG9yZTo6dXBkYXRlVGlsZSgpLgorCisg ICAgICAgICogVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRCYWNraW5n U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpzaG91bGRTaG93VGlsZURlYnVnVmlzdWFscyk6 CisKIDIwMTItMTEtMTEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzQxNDQuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuY3BwCmluZGV4IDVlNmQyMDc1YWI0OWExNDY3YTEyM2RlZTcwMGRhNDVlMTA1YzQ2NDQu LjFkYWU0M2MzNzBhYjBiNmFlYTAzNjRmYjRkMjYzNWM1ODM3NDJmZmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuY3BwCkBAIC00MSw2ICs0MSw3IEBACiAjaWYgVVNFKENBSVJPKQogI2luY2x1ZGUgIkNh aXJvVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiUmVmUHRyQ2Fpcm8uaCIKKyNpbmNsdWRlIDx3dGYv dGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8Y2Fpcm8uaD4KICNlbmRpZgogCkBAIC0zNTAsNiAr MzUxLDM5IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpkcmF3UmVwYWludENvdW50ZXIoaW50IHZh bHVlLCBpbnQgcG9pbnRTaXplLCBjb25zdCBGbG9hdFBvCiAgICAgY29uc3QgdWNoYXIqIGJpdHMg PSBpbWFnZS5iaXRzKCk7CiAgICAgdGV4dHVyZS0+dXBkYXRlQ29udGVudHMoYml0cywgc291cmNl UmVjdCwgSW50UG9pbnQ6Onplcm8oKSwgaW1hZ2UuYnl0ZXNQZXJMaW5lKCksIEJpdG1hcFRleHR1 cmU6OlVwZGF0ZUNhbk1vZGlmeU9yaWdpbmFsSW1hZ2VEYXRhKTsKICAgICBkcmF3VGV4dHVyZSgq dGV4dHVyZSwgdGFyZ2V0UmVjdCwgbW9kZWxWaWV3TWF0cml4LCAxLjBmLCAwLCBBbGxFZGdlcyk7 CisKKyNlbGlmIFVTRShDQUlSTykKKyAgICBDU3RyaW5nIGNvdW50ZXJTdHJpbmcgPSBTdHJpbmc6 Om51bWJlcih2YWx1ZSkuYXNjaWkoKTsKKyAgICAvLyBjYWlyb190ZXh0X2V4dGVudHMoKSByZXF1 aXJlcyBhIGNhaXJvX3QsIHNvIGRpbWVuc2lvbnMgbmVlZCB0byBiZSBndWVzc3RpbWF0ZWQuCisg ICAgaW50IHdpZHRoID0gY291bnRlclN0cmluZy5sZW5ndGgoKSAqIHBvaW50U2l6ZSAqIDEuMjsK KyAgICBpbnQgaGVpZ2h0ID0gcG9pbnRTaXplICogMS41OworCisgICAgY2Fpcm9fc3VyZmFjZV90 KiBzdXJmYWNlID0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9jcmVhdGUoQ0FJUk9fRk9STUFUX0FSR0Iz Miwgd2lkdGgsIGhlaWdodCk7CisgICAgY2Fpcm9fdCogY3IgPSBjYWlyb19jcmVhdGUoc3VyZmFj ZSk7CisgICAgY2Fpcm9fc3VyZmFjZV9kZXN0cm95KHN1cmZhY2UpOworCisgICAgY2Fpcm9fc2V0 X3NvdXJjZV9yZ2IoY3IsIDEsIDAsIDApOworICAgIGNhaXJvX3JlY3RhbmdsZShjciwgMCwgMCwg d2lkdGgsIGhlaWdodCk7CisgICAgY2Fpcm9fZmlsbChjcik7CisKKyAgICBjYWlyb19zZWxlY3Rf Zm9udF9mYWNlKGNyLCAiTW9ub3NwYWNlIiwgQ0FJUk9fRk9OVF9TTEFOVF9OT1JNQUwsIENBSVJP X0ZPTlRfV0VJR0hUX0JPTEQpOworICAgIGNhaXJvX3NldF9mb250X3NpemUoY3IsIHBvaW50U2l6 ZSk7CisgICAgY2Fpcm9fc2V0X3NvdXJjZV9yZ2IoY3IsIDEsIDEsIDEpOworICAgIGNhaXJvX21v dmVfdG8oY3IsIDIsIHBvaW50U2l6ZSk7CisgICAgY2Fpcm9fc2hvd190ZXh0KGNyLCBjb3VudGVy U3RyaW5nLmRhdGEoKSk7CisKKyAgICBJbnRTaXplIHNpemUod2lkdGgsIGhlaWdodCk7CisgICAg SW50UmVjdCBzb3VyY2VSZWN0KEludFBvaW50Ojp6ZXJvKCksIHNpemUpOworICAgIEludFJlY3Qg dGFyZ2V0UmVjdChyb3VuZGVkSW50UG9pbnQodGFyZ2V0UG9pbnQpLCBzaXplKTsKKworICAgIFJl ZlB0cjxCaXRtYXBUZXh0dXJlPiB0ZXh0dXJlID0gYWNxdWlyZVRleHR1cmVGcm9tUG9vbChzaXpl KTsKKyAgICBjb25zdCB1bnNpZ25lZCBjaGFyKiBiaXRzID0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9n ZXRfZGF0YShzdXJmYWNlKTsKKyAgICBpbnQgc3RyaWRlID0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9n ZXRfc3RyaWRlKHN1cmZhY2UpOworICAgIHRleHR1cmUtPnVwZGF0ZUNvbnRlbnRzKGJpdHMsIHNv dXJjZVJlY3QsIEludFBvaW50Ojp6ZXJvKCksIHN0cmlkZSwgQml0bWFwVGV4dHVyZTo6VXBkYXRl Q2FuTW9kaWZ5T3JpZ2luYWxJbWFnZURhdGEpOworICAgIGRyYXdUZXh0dXJlKCp0ZXh0dXJlLCB0 YXJnZXRSZWN0LCBtb2RlbFZpZXdNYXRyaXgsIDEuMGYsIDAsIEFsbEVkZ2VzKTsKKworICAgIGNh aXJvX2Rlc3Ryb3koY3IpOworCiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTSh2YWx1ZSk7CiAgICAg VU5VU0VEX1BBUkFNKHBvaW50U2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEJhY2tpbmdTdG9yZS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEJh Y2tpbmdTdG9yZS5jcHAKaW5kZXggMzg1YWY0ZGRmZjI1MDUwYWUwOTU4NGEzODJhZTFmY2VjN2Fi MWUwZS4uMTFlNjRlMmE4MGIzZjc2Yjk5ODg1MzhkZmFiYWRkY2E3ZDZlYzVhZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0 ZWRCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGlu YXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkQmFja2luZ1N0b3JlLmNwcApAQCAtMTEwLDYgKzExMCw4 IEBAIHN0YXRpYyBib29sIHNob3VsZFNob3dUaWxlRGVidWdWaXN1YWxzKCkKIHsKICNpZiBQTEFU Rk9STShRVCkKICAgICByZXR1cm4gKHFnZXRlbnYoIlFUX1dFQktJVF9TSE9XX0NPTVBPU0lUSU5H X0RFQlVHX1ZJU1VBTFMiKSA9PSAiMSIpOworI2VsaWYgVVNFKENBSVJPKQorICAgIHJldHVybiAo U3RyaW5nKGdldGVudigiV0VCS0lUX1NIT1dfQ09NUE9TSVRJTkdfREVCVUdfVklTVUFMUyIpKSA9 PSAiMSIpOwogI2VuZGlmCiAgICAgcmV0dXJuIGZhbHNlOwogfQo= 174259 2012-11-14 14:19:06 -0800 2012-11-14 15:03:10 -0800 Fix style bug-101883-20121114141707.patch text/plain 6244 helder.correia U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjczNjRmNDU0YjNiNWI0 ZWNhN2Y3NGY5MTVmZWFlNDMzOTQxOTBlZS4uYjllMmRjOTJjMDI3MTAyMGNhOTE1ZTQ0MDllYTdh ZGVkZDYxMzVjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTExLTE0ICBIZWxk ZXIgQ29ycmVpYSAgPGhlbGRlci5jb3JyZWlhQG5va2lhLmNvbT4KKworICAgICAgICBbVGV4TWFw XVtDYWlyb10gQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgZGVidWcgdmlzdWFscworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxODgzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0 IGludHJvZHVjaW5nIGEgZGVidWcgZmVhdHVyZS4KKworICAgICAgICBBZGQgYSBDYWlybyBpbXBs ZW1lbnRhdGlvbiB0byBjb21wbGVtZW50IHRoZSBwYXRjaCBmcm9tIGJ1ZyA5MDExNgorICAgICAg ICAoaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTIyMjc1KS4KKworICAgICAgICBG b3IgdGhpcyBmZWF0dXJlIHRvIGJlIGVuYWJsZWQsIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZQor ICAgICAgICBXRUJLSVRfU0hPV19DT01QT1NJVElOR19ERUJVR19WSVNVQUxTIG11c3QgYmUgc2V0 IHRvIDEuIE9uY2UgZW5hYmxlZCwKKyAgICAgICAgYm90aCByZXBhaW50IGNvdW50ZXJzIGFuZCB0 aWxlIGJvcmRlcnMgd2lsbCBiZSBwYWludGVkLgorCisgICAgICAgIEEgQ2Fpcm8tc3BlY2lmaWMg ZHJhd1JlcGFpbnRDb3VudGVyKCkgaW1wbGVtZW50YXRpb24gd2FzIGFkZGVkIHRvCisgICAgICAg IFRleHR1cmVNYXBwZXJHTC4gQSBjYWlyb19zdXJmYWNlX3QgaXMgdXNlZCBhcyBzY3JhdGNoIGJ1 ZmZlciB0byBwYWludAorICAgICAgICB0aGUgY291bnRlcnMuIEl0IGlzIHRoZW4gdXBsb2FkZWQg dG8gYSBCaXRtYXBUZXh0dXJlIGFjcXVpcmVkCisgICAgICAgIGZyb20gdGhlIHBvb2wgYW5kIGZp bmFsbHkgZHJhdyBieSBUZXh0dXJlTWFwcGVyLiBUaGUgYWN0dWFsIGNvbXBvc2l0aW5nCisgICAg ICAgIGhhcHBlbnMgaW5zaWRlIExheWVyQmFja2luZ1N0b3JlOjpwYWludFRvVGV4dHVyZU1hcHBl cigpLiBFYWNoCisgICAgICAgIExheWVyQmFja2luZ1N0b3JlVGlsZSBoYXMgYSByZXBhaW50IGNv dW50ZXIgd2hpY2ggZ2V0cyBpbmNyZW1lbnRlZCBpbgorICAgICAgICBMYXllckJhY2tpbmdTdG9y ZTo6dXBkYXRlVGlsZSgpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJHTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmRy YXdSZXBhaW50Q291bnRlcik6CisKIDIwMTItMTEtMTQgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBGaXggY2hyb21pdW0gYXNzZXJ0cyBmcm9tIHIxMzQ2NDku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggOWIxOWE3YjhiOTliMjNhZmNhOWRjYWMxYWZmODBhODA1MGVlMTkyYS4u MjI2ZTAzNzJjN2E1YjQwZDhhNDhkMjQxYThjNDNmMDUyYTIxYzdhOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMwIEBACisyMDEyLTExLTE0ICBIZWxkZXIgQ29ycmVpYSAgPGhlbGRlci5jb3JyZWlh QG5va2lhLmNvbT4KKworICAgICAgICBbVGV4TWFwXVtDYWlyb10gQWNjZWxlcmF0ZWQgY29tcG9z aXRpbmcgZGVidWcgdmlzdWFscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTAxODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IGludHJvZHVjaW5nIGEgZGVidWcgZmVhdHVy ZS4KKworICAgICAgICBBZGQgYSBDYWlybyBpbXBsZW1lbnRhdGlvbiB0byBjb21wbGVtZW50IHRo ZSBwYXRjaCBmcm9tIGJ1ZyA5MDExNgorICAgICAgICAoaHR0cDovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvMTIyMjc1KS4KKworICAgICAgICBGb3IgdGhpcyBmZWF0dXJlIHRvIGJlIGVuYWJs ZWQsIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZQorICAgICAgICBXRUJLSVRfU0hPV19DT01QT1NJ VElOR19ERUJVR19WSVNVQUxTIG11c3QgYmUgc2V0IHRvIDEuIE9uY2UgZW5hYmxlZCwKKyAgICAg ICAgYm90aCByZXBhaW50IGNvdW50ZXJzIGFuZCB0aWxlIGJvcmRlcnMgd2lsbCBiZSBwYWludGVk LgorCisgICAgICAgIEEgQ2Fpcm8tc3BlY2lmaWMgZHJhd1JlcGFpbnRDb3VudGVyKCkgaW1wbGVt ZW50YXRpb24gd2FzIGFkZGVkIHRvCisgICAgICAgIFRleHR1cmVNYXBwZXJHTC4gQSBjYWlyb19z dXJmYWNlX3QgaXMgdXNlZCBhcyBzY3JhdGNoIGJ1ZmZlciB0byBwYWludAorICAgICAgICB0aGUg Y291bnRlcnMuIEl0IGlzIHRoZW4gdXBsb2FkZWQgdG8gYSBCaXRtYXBUZXh0dXJlIGFjcXVpcmVk CisgICAgICAgIGZyb20gdGhlIHBvb2wgYW5kIGZpbmFsbHkgZHJhdyBieSBUZXh0dXJlTWFwcGVy LiBUaGUgYWN0dWFsIGNvbXBvc2l0aW5nCisgICAgICAgIGhhcHBlbnMgaW5zaWRlIExheWVyQmFj a2luZ1N0b3JlOjpwYWludFRvVGV4dHVyZU1hcHBlcigpLiBFYWNoCisgICAgICAgIExheWVyQmFj a2luZ1N0b3JlVGlsZSBoYXMgYSByZXBhaW50IGNvdW50ZXIgd2hpY2ggZ2V0cyBpbmNyZW1lbnRl ZCBpbgorICAgICAgICBMYXllckJhY2tpbmdTdG9yZTo6dXBkYXRlVGlsZSgpLgorCisgICAgICAg ICogVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRCYWNraW5nU3RvcmUu Y3BwOgorICAgICAgICAoV2ViS2l0OjpzaG91bGRTaG93VGlsZURlYnVnVmlzdWFscyk6CisKIDIw MTItMTEtMTQgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KIAog ICAgICAgICBDb29yZGluYXRlZCBHcmFwaGljczogUmVuYW1lIG1fQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyQ2xpZW50IHRvIG1fY29vcmRpbmF0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKaW5kZXgg NWU2ZDIwNzVhYjQ5YTE0NjdhMTIzZGVlNzAwZGE0NWUxMDVjNDY0NC4uYjBmZTBmN2ExZWQ5NDEz OWY3MjM5MzgyOWEwNTRjMDE5OGExM2RmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKQEAgLTQy LDYgKzQyLDcgQEAKICNpbmNsdWRlICJDYWlyb1V0aWxpdGllcy5oIgogI2luY2x1ZGUgIlJlZlB0 ckNhaXJvLmgiCiAjaW5jbHVkZSA8Y2Fpcm8uaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAjZW5kaWYKIAogI2lmIEVOQUJMRShDU1NfU0hBREVSUykKQEAgLTM1MCw2ICszNTEsMzkg QEAgdm9pZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXdSZXBhaW50Q291bnRlcihpbnQgdmFsdWUsIGlu dCBwb2ludFNpemUsIGNvbnN0IEZsb2F0UG8KICAgICBjb25zdCB1Y2hhciogYml0cyA9IGltYWdl LmJpdHMoKTsKICAgICB0ZXh0dXJlLT51cGRhdGVDb250ZW50cyhiaXRzLCBzb3VyY2VSZWN0LCBJ bnRQb2ludDo6emVybygpLCBpbWFnZS5ieXRlc1BlckxpbmUoKSwgQml0bWFwVGV4dHVyZTo6VXBk YXRlQ2FuTW9kaWZ5T3JpZ2luYWxJbWFnZURhdGEpOwogICAgIGRyYXdUZXh0dXJlKCp0ZXh0dXJl LCB0YXJnZXRSZWN0LCBtb2RlbFZpZXdNYXRyaXgsIDEuMGYsIDAsIEFsbEVkZ2VzKTsKKworI2Vs aWYgVVNFKENBSVJPKQorICAgIENTdHJpbmcgY291bnRlclN0cmluZyA9IFN0cmluZzo6bnVtYmVy KHZhbHVlKS5hc2NpaSgpOworICAgIC8vIGNhaXJvX3RleHRfZXh0ZW50cygpIHJlcXVpcmVzIGEg Y2Fpcm9fdCwgc28gZGltZW5zaW9ucyBuZWVkIHRvIGJlIGd1ZXNzdGltYXRlZC4KKyAgICBpbnQg d2lkdGggPSBjb3VudGVyU3RyaW5nLmxlbmd0aCgpICogcG9pbnRTaXplICogMS4yOworICAgIGlu dCBoZWlnaHQgPSBwb2ludFNpemUgKiAxLjU7CisKKyAgICBjYWlyb19zdXJmYWNlX3QqIHN1cmZh Y2UgPSBjYWlyb19pbWFnZV9zdXJmYWNlX2NyZWF0ZShDQUlST19GT1JNQVRfQVJHQjMyLCB3aWR0 aCwgaGVpZ2h0KTsKKyAgICBjYWlyb190KiBjciA9IGNhaXJvX2NyZWF0ZShzdXJmYWNlKTsKKyAg ICBjYWlyb19zdXJmYWNlX2Rlc3Ryb3koc3VyZmFjZSk7CisKKyAgICBjYWlyb19zZXRfc291cmNl X3JnYihjciwgMSwgMCwgMCk7CisgICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCAwLCAwLCB3aWR0aCwg aGVpZ2h0KTsKKyAgICBjYWlyb19maWxsKGNyKTsKKworICAgIGNhaXJvX3NlbGVjdF9mb250X2Zh Y2UoY3IsICJNb25vc3BhY2UiLCBDQUlST19GT05UX1NMQU5UX05PUk1BTCwgQ0FJUk9fRk9OVF9X RUlHSFRfQk9MRCk7CisgICAgY2Fpcm9fc2V0X2ZvbnRfc2l6ZShjciwgcG9pbnRTaXplKTsKKyAg ICBjYWlyb19zZXRfc291cmNlX3JnYihjciwgMSwgMSwgMSk7CisgICAgY2Fpcm9fbW92ZV90byhj ciwgMiwgcG9pbnRTaXplKTsKKyAgICBjYWlyb19zaG93X3RleHQoY3IsIGNvdW50ZXJTdHJpbmcu ZGF0YSgpKTsKKworICAgIEludFNpemUgc2l6ZSh3aWR0aCwgaGVpZ2h0KTsKKyAgICBJbnRSZWN0 IHNvdXJjZVJlY3QoSW50UG9pbnQ6Onplcm8oKSwgc2l6ZSk7CisgICAgSW50UmVjdCB0YXJnZXRS ZWN0KHJvdW5kZWRJbnRQb2ludCh0YXJnZXRQb2ludCksIHNpemUpOworCisgICAgUmVmUHRyPEJp dG1hcFRleHR1cmU+IHRleHR1cmUgPSBhY3F1aXJlVGV4dHVyZUZyb21Qb29sKHNpemUpOworICAg IGNvbnN0IHVuc2lnbmVkIGNoYXIqIGJpdHMgPSBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9kYXRh KHN1cmZhY2UpOworICAgIGludCBzdHJpZGUgPSBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9zdHJp ZGUoc3VyZmFjZSk7CisgICAgdGV4dHVyZS0+dXBkYXRlQ29udGVudHMoYml0cywgc291cmNlUmVj dCwgSW50UG9pbnQ6Onplcm8oKSwgc3RyaWRlLCBCaXRtYXBUZXh0dXJlOjpVcGRhdGVDYW5Nb2Rp ZnlPcmlnaW5hbEltYWdlRGF0YSk7CisgICAgZHJhd1RleHR1cmUoKnRleHR1cmUsIHRhcmdldFJl Y3QsIG1vZGVsVmlld01hdHJpeCwgMS4wZiwgMCwgQWxsRWRnZXMpOworCisgICAgY2Fpcm9fZGVz dHJveShjcik7CisKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHZhbHVlKTsKICAgICBVTlVTRURf UEFSQU0ocG9pbnRTaXplKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkQmFja2luZ1N0 b3JlLmNwcAppbmRleCBkMDU0ZTYxMDgyZDI4YzE4YzdmMzk5MmRiZmEwMmFkZThlNmNiYTIxLi41 MWVkNmM4NTJlMWE1NDlkZmJkMjFmNDBmMWQ3ODY1YWQyNDkzZGI2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEJhY2tp bmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvQ29vcmRpbmF0ZWRCYWNraW5nU3RvcmUuY3BwCkBAIC0xMTAsNiArMTEwLDggQEAgc3Rh dGljIGJvb2wgc2hvdWxkU2hvd1RpbGVEZWJ1Z1Zpc3VhbHMoKQogewogI2lmIFBMQVRGT1JNKFFU KQogICAgIHJldHVybiAocWdldGVudigiUVRfV0VCS0lUX1NIT1dfQ09NUE9TSVRJTkdfREVCVUdf VklTVUFMUyIpID09ICIxIik7CisjZWxpZiBVU0UoQ0FJUk8pCisgICAgcmV0dXJuIChTdHJpbmco Z2V0ZW52KCJXRUJLSVRfU0hPV19DT01QT1NJVElOR19ERUJVR19WSVNVQUxTIikpID09ICIxIik7 CiAjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9Cg==