54406 2011-02-14 11:59:15 -0800 png-1.5 fixes 2011-07-12 19:42:06 -0700 1 1 1 Unclassified WebKit Images 420+ All All RESOLVED FIXED P2 Normal --- 57304 1 wiz webkit-unassigned abarth commit-queue dglazkov eric evan gnome gustavo.noronha gustavo levin me paroga webkit.review.bot xan.lopez oldest_to_newest 350806 0 82349 wiz 2011-02-14 11:59:15 -0800 Created attachment 82349 Patch fixing the problem, needs png-1.5.1. png-1.5 hides structure members from public view. For this reason, some code doesn't compile any more. The attached patch, mostly from John Bowler <jbowler@acm.org> fixes the problem. Some discussion on the solution: https://sourceforge.net/mailarchive/forum.php?thread_name=000a01cbb6d5%241c18d5b0%24544a8110%24%40acm.org&forum_name=png-mng-implement Since webkit-gtk used internal data that wasn't available via the public interface, the interface has been extended. The patch already makes use of it, which requires png-1.5.1 though. I'm not sure how you want to handle that. 350808 1 wiz 2011-02-14 12:02:15 -0800 One more thing -- the patch is against webkit-gtk-1.2.7. 354153 2 paroga 2011-02-19 07:23:13 -0800 View in context: https://bugs.webkit.org/attachment.cgi?id=82349&action=review Welcome to the WebKit bugzilla and thx for the patch. Every patch requries a ChangeLog and should be based on the trunk version, so it can apply on the tree. For more information about contributing to WebKit see http://www.webkit.org/coding/contributing.html. FYI: If you set the review flag to "?" your patch gets better attention and the EWS (the bubbles beside the attachment) fill process it. > WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:67 > +#if (PNG_LIBPNG_VER < 10500) > longjmp(JMPBUF(png), 1); > +#else > + png_longjmp(png, 1); > +#endif You use this many times in you code. IMHO sth like the following on top of the file would be better: #if (PNG_LIBPNG_VER >= 10500) static void png_longjmp(png_structp png, int value) { longjmp(JMPBUF(png), value) } #endif > WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:292 > - m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size); > - png->buffer_size = 0; > + m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0/*do not save the data*/)); png_process_data_pause doesn't exist in the "old" libpng. > WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:320 > - if (m_reader->pngPtr()->interlaced) > + if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) > + != PNG_INTERLACE_NONE) > m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height()); Please write the if in only one line. 358643 3 83967 wiz 2011-02-26 23:02:49 -0800 Created attachment 83967 Patch implementing review comments Thanks for your comments, Patrick. I've addressed all the points you raised, but I couldn't test it since my glib2 isn't new enough. Please review. 358644 4 webkit.review.bot 2011-02-26 23:05:31 -0800 Attachment 83967 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/image-decoders/png/PNGImageDecoder.cpp:51: png_longjmp is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 358645 5 wiz 2011-02-26 23:09:40 -0800 Re comment #4: The function is called png_longjmp in png-1.5, and the patch adds a replacement for it when compiling against older png versions, per Patrick's suggestion. Should I really handle this differently? 358646 6 webkit.review.bot 2011-02-26 23:12:41 -0800 Attachment 83967 did not build on chromium: Build output: http://queues.webkit.org/results/8024767 358647 7 83968 wiz 2011-02-26 23:22:38 -0800 Created attachment 83968 Patch addressing review problems. Addresses compilation problem and style issue. 358648 8 webkit.review.bot 2011-02-26 23:25:00 -0800 Attachment 83968 did not build on chromium: Build output: http://queues.webkit.org/results/8070043 358650 9 gustavo.noronha 2011-02-26 23:31:00 -0800 Attachment 83968 did not build on gtk: Build output: http://queues.webkit.org/results/8031984 358651 10 83969 wiz 2011-02-26 23:31:37 -0800 Created attachment 83969 Patch fixing bug in previous. 358661 11 83969 paroga 2011-02-27 02:46:41 -0800 Comment on attachment 83969 Patch fixing bug in previous. View in context: https://bugs.webkit.org/attachment.cgi?id=83969&action=review Why does http://trac.webkit.org/browser/trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp#L134 compile? What's the exact compile error? I'm not sure it the longjmp part is really required. > Source/WebCore/ChangeLog:6 > + Fix compilation with png-1.5, and use new API to terminate data > + processing. Please include the bug number. If you have a look at the other changelogs the first line is usually the bug title, followed by the bug# and then a detailed description. Please also include more information about what's the new api and why it doesn't compile any more (some mebers moved from public to private). You can pass the bug# via "--bug" to preparechangelog. > Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:50 > +static void pnglongjmp(png_structp png, int value) Please don't use png as prefix. This function isn't part of libpng. Maybe you can use the first approach with png_longjmp and ignore the style warning, or use a function name without a png prefix. Adding a inline keyword would be good too. > Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:56 > +#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5)) > + png_longjmp(png, value); > +#else > + longjmp(JMPBUF(png), value); > +#endif Can we merge this with the #define of JMPBUF ? > Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:332 > + m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0/*do not save the data*/)); Please don't use this "inline" comment. If you think the comment is required, write it in the line above as a one line comment (//) as a full sentence. 358666 12 83972 wiz 2011-02-27 04:42:07 -0800 Created attachment 83972 Patch implementing review comments Thanks for the feedback, Patrick. I've taken out the longjmp changes; they are not necessary. I was following the new png style guide for this kind of code. I've also implemented all your other suggestions. New patch attached. (What does the color purple in the bubbles mean, like for "mac" for the previous patch?) 358670 13 83972 paroga 2011-02-27 04:52:40 -0800 Comment on attachment 83972 Patch implementing review comments (In reply to comment #12) > Thanks for the feedback, Patrick. Thanks for the patch! > What does the color purple in the bubbles mean, like for "mac" for the previous patch? You don't have commit rights for the SVN repository (no committer) and the mac bots cannot process patches from non-committers. You can click on them for more info. That's ok! Also setting cq?. So a reviewer will (usually) set r+ _and_ cq+ on the patch and the commit-queue will commit it without further work. 373743 14 levin 2011-03-25 15:06:44 -0700 *** Bug 51041 has been marked as a duplicate of this bug. *** 373753 15 83972 levin 2011-03-25 15:27:57 -0700 Comment on attachment 83972 Patch implementing review comments View in context: https://bugs.webkit.org/attachment.cgi?id=83972&action=review Just a minor fix up needed and then this can go in. > Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:323 > + /* '0' argument to png_process_data_pause means: do not save the data */ Use C++ style comments and whole sentences. // '0' argument to png_process_data_pause means: Do not save the data. I was confused by what "saving the data" referred to. From reading http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=blobdiff;f=libpng-manual.txt;h=3caff8f9b7019891fd3d0b08ce134ea7e99140e2;hp=b34ffcc1343407687d6723f1132e69f0cdc34941;hb=0a5c9c02faf9c6ceb7acc40e6219e04194581287;hpb=155ce4021812da5629aaebcc9484094944e7d7ae, it means that png should not cache unprocessed bytes. Perhaps something like this instead? m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0 /* Don't cache unprocessed data. */ )); 373755 16 levin 2011-03-25 15:28:44 -0700 *** Bug 51041 has been marked as a duplicate of this bug. *** 374056 17 levin 2011-03-26 23:21:04 -0700 Just adding myself to the cc line, so I'll see any new patch uploads. 374363 18 87118 wiz 2011-03-28 02:24:59 -0700 Created attachment 87118 Patch implementing review comments by David Levin David, thanks for your feedback. I've changed the comment as suggested. I didn't make it an inline comment again, since Patrick requested previously to avoid them. 375046 19 87118 commit-queue 2011-03-28 23:20:30 -0700 Comment on attachment 87118 Patch implementing review comments by David Levin Clearing flags on attachment: 87118 Committed r82198: <http://trac.webkit.org/changeset/82198> 375047 20 commit-queue 2011-03-28 23:20:36 -0700 All reviewed patches have been landed. Closing bug. 375057 21 webkit.review.bot 2011-03-28 23:38:53 -0700 http://trac.webkit.org/changeset/82198 might have broken Chromium Win Release 375066 22 levin 2011-03-28 23:43:57 -0700 This got rolled out. Due to Chromium Windows build break: 5>..\platform\image-decoders\png\PNGImageDecoder.cpp(244) : error C3861: 'wk_png_get_image_width': identifier not found 4>ppb_pdf_impl.cc 5>..\platform\image-decoders\png\PNGImageDecoder.cpp(245) : error C3861: 'wk_png_get_image_height': identifier not found 4>ppb_font_impl.cc 4>ppb_video_decoder_impl.cc 5>..\platform\image-decoders\png\PNGImageDecoder.cpp(351) : error C3861: 'wk_png_get_interlace_type': identifier not found which could be seen here: http://build.webkit.org/builders/Chromium%20Win%20Release%20%28Tests%29/builds/11702/steps/compile-webkit/logs/stdio 375500 23 levin 2011-03-29 10:38:21 -0700 We should reland this after http://codereview.chromium.org/6708113 lands and we change WebKit/chromium/DEPS to point to that revision of late. 375675 24 wiz 2011-03-29 12:43:23 -0700 The referenced chromium patch has landed as http://src.chromium.org/viewvc/chrome?view=rev&revision=79710 What next? 375687 25 levin 2011-03-29 13:01:04 -0700 Let me roll deps and land this in about 7 hours which should be off peak time for commits. 375710 26 87118 levin 2011-03-29 13:30:23 -0700 Comment on attachment 87118 Patch implementing review comments by David Levin Since DEPS have been rolled, thanks to Tony. I'll r+, cq+ this. Thanks for your patience. 375792 27 87118 commit-queue 2011-03-29 15:05:56 -0700 Comment on attachment 87118 Patch implementing review comments by David Levin Rejecting attachment 87118 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-a..." exit_code: 1 Last 500 characters of output: autoinstalled/mechanize/_urllib2_fork.py", line 332, in _call_chain result = func(*args) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1170, in https_open return self.do_open(conn_factory, req) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1118, in do_open raise URLError(err) urllib2.URLError: <urlopen error [Errno 60] Operation timed out> Full output: http://queues.webkit.org/results/8285495 375834 28 87118 commit-queue 2011-03-29 15:57:08 -0700 Comment on attachment 87118 Patch implementing review comments by David Levin Clearing flags on attachment: 87118 Committed r82344: <http://trac.webkit.org/changeset/82344> 375835 29 commit-queue 2011-03-29 15:57:15 -0700 All reviewed patches have been landed. Closing bug. 375861 30 me 2011-03-29 16:23:39 -0700 FYI, I needed this too to avoid conversion error: #ifdef PNG_iCCP_SUPPORTED char* profileName; int compressionType; - char* profile; + png_byte* profile; png_uint_32 profileLength; if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) { ColorProfile colorProfile; 375903 31 webkit.review.bot 2011-03-29 17:02:59 -0700 http://trac.webkit.org/changeset/82344 might have broken GTK Linux 32-bit Release The following tests are not passing: css1/basic/comments.html css1/basic/containment.html css1/basic/id_as_selector.html css1/basic/inheritance.html css1/box_properties/border.html css1/box_properties/border_bottom.html css1/box_properties/border_bottom_width.html css1/box_properties/border_left.html css1/box_properties/border_left_width.html css1/box_properties/border_right_inline.html css1/box_properties/border_right_width.html css1/box_properties/border_style.html css1/box_properties/border_top.html css1/box_properties/border_top_width.html css1/box_properties/border_width.html css1/box_properties/clear.html css1/box_properties/clear_float.html css1/box_properties/float_elements_in_series.html css1/box_properties/float_margin.html css1/box_properties/float_on_text_elements.html css1/box_properties/height.html css1/box_properties/margin.html css1/box_properties/margin_bottom.html css1/box_properties/margin_inline.html css1/box_properties/margin_left.html css1/box_properties/margin_right.html css1/box_properties/margin_top.html css1/box_properties/padding.html css1/box_properties/padding_bottom.html css1/box_properties/padding_inline.html css1/box_properties/padding_left.html css1/box_properties/padding_right.html css1/box_properties/padding_top.html css1/box_properties/width.html css1/cascade/cascade_order.html css1/classification/display.html css1/classification/list_style_type.html css1/classification/white_space.html css1/color_and_background/background.html css1/color_and_background/background_attachment.html css1/color_and_background/background_position.html css1/color_and_background/background_repeat.html css1/conformance/forward_compatible_parsing.html css1/font_properties/font.html css1/font_properties/font_family.html css1/font_properties/font_size.html css1/font_properties/font_weight.html css1/formatting_model/floating_elements.html css1/formatting_model/height_of_lines.html css1/formatting_model/horizontal_formatting.html css1/formatting_model/inline_elements.html css1/formatting_model/replaced_elements.html css1/formatting_model/vertical_formatting.html css1/pseudo/anchor.html css1/pseudo/firstletter.html css1/pseudo/firstline.html css1/pseudo/multiple_pseudo_elements.html css1/text_properties/letter_spacing.html css1/text_properties/line_height.html css1/text_properties/text_decoration.html css1/text_properties/text_indent.html css1/text_properties/text_transform.html css1/text_properties/vertical_align.html css1/text_properties/word_spacing.html css1/units/color_units.html css1/units/length_units.html css2.1/t0803-c5502-mrgn-r-02-c.html css2.1/t0803-c5505-mrgn-02-c.html css2.1/t080301-c411-vt-mrgn-00-b.html css2.1/t0905-c5525-fltclr-00-c-ag.html css2.1/t0905-c5525-fltmrgn-00-c-ag.html css2.1/t0905-c5525-fltwidth-00-c-g.html css2.1/t0905-c5526-fltclr-00-c-ag.html css2.1/t1002-c5523-width-02-b-g.html css2.1/t1202-counters-08-b.html css2.1/t1202-counters-09-b.html css2.1/t140201-c535-bg-fixd-00-b-g.html css2.1/t140201-c537-bgfxps-00-c-ag.html css2.1/t1508-c527-font-07-b.html editing/deleting/delete-after-span-ws-001.html editing/deleting/delete-after-span-ws-002.html editing/deleting/delete-after-span-ws-003.html editing/deleting/delete-line-end-ws-001.html editing/deleting/delete-line-end-ws-002.html editing/inserting/insert-div-023.html editing/selection/focus_editable_html.html editing/selection/select-all-001.html editing/selection/select-all-002.html editing/selection/select-all-003.html editing/selection/select-all-004.html editing/selection/unrendered-001.html editing/selection/unrendered-002.html editing/selection/unrendered-003.html editing/selection/unrendered-004.html editing/selection/unrendered-005.html fast/text/international/complex-character-based-fallback.html fast/text/international/thai-line-breaks.html fonts/cursive.html fonts/default.html fonts/fantasy.html fonts/monospace.html fonts/sans-serif.html fonts/serif.html http/tests/misc/link-rel-icon-beforeload.html media/video-controls-rendering.html media/video-zoom.html tables/mozilla/bugs/bug101674.html tables/mozilla/bugs/bug10269-2.html tables/mozilla/bugs/bug10296-1.html tables/mozilla/bugs/bug1055-1.html tables/mozilla/bugs/bug113235-1.html tables/mozilla/bugs/bug113235-3.html tables/mozilla/bugs/bug11944.html tables/mozilla/bugs/bug120364.html tables/mozilla/bugs/bug12384.html tables/mozilla/bugs/bug1302.html tables/mozilla/bugs/bug131020.html tables/mozilla/bugs/bug131020_iframe.html tables/mozilla/bugs/bug137388-2.html tables/mozilla/bugs/bug194024.html tables/mozilla/bugs/bug22019.html tables/mozilla/bugs/bug23151.html tables/mozilla/bugs/bug2479-1.html tables/mozilla/bugs/bug2479-3.html tables/mozilla/bugs/bug2479-4.html tables/mozilla/bugs/bug27038-2.html tables/mozilla/bugs/bug29314.html tables/mozilla/bugs/bug2947.html tables/mozilla/bugs/bug32205-2.html tables/mozilla/bugs/bug38916.html tables/mozilla/bugs/bug3977.html tables/mozilla/bugs/bug43039.html tables/mozilla/bugs/bug43854-1.html tables/mozilla/bugs/bug44505.html tables/mozilla/bugs/bug46480-1.html tables/mozilla/bugs/bug46480-2.html tables/mozilla/bugs/bug50695-1.html tables/mozilla/bugs/bug56405.html tables/mozilla/bugs/bug5797.html tables/mozilla/bugs/bug5835.html tables/mozilla/bugs/bug625.html tables/mozilla/bugs/bug650.html tables/mozilla/bugs/bug67915-1.html tables/mozilla/bugs/bug7112-1.html tables/mozilla/bugs/bug7112-2.html tables/mozilla/bugs/bug73321.html tables/mozilla/bugs/bug92143.html tables/mozilla/bugs/bug96334.html tables/mozilla/bugs/bug96343.html tables/mozilla/collapsing_borders/bug41262-3.html tables/mozilla/core/bloomberg.html tables/mozilla/core/captions.html tables/mozilla/core/cell_heights.html tables/mozilla/core/col_span.html tables/mozilla/core/col_widths_auto_fix.html tables/mozilla/core/col_widths_fix_fixPer.html tables/mozilla/core/nested1.html tables/mozilla/core/one_row.html tables/mozilla/core/row_span.html tables/mozilla/marvin/backgr_index.html tables/mozilla/marvin/backgr_layers-opacity.html tables/mozilla/marvin/backgr_position-table.html tables/mozilla/marvin/backgr_simple-table-cell.html tables/mozilla/marvin/backgr_simple-table-column-group.html tables/mozilla/marvin/backgr_simple-table-column.html tables/mozilla/marvin/backgr_simple-table-row-group.html tables/mozilla/marvin/backgr_simple-table-row.html tables/mozilla/marvin/backgr_simple-table.html tables/mozilla/marvin/x_table_bgcolor_name.xml tables/mozilla/marvin/x_table_bgcolor_rgb.xml tables/mozilla/marvin/x_td_bgcolor_name.xml tables/mozilla/marvin/x_td_bgcolor_rgb.xml tables/mozilla/marvin/x_td_height.xml tables/mozilla/marvin/x_td_nowrap.xml tables/mozilla/marvin/x_th_bgcolor_name.xml tables/mozilla/marvin/x_th_bgcolor_rgb.xml tables/mozilla/marvin/x_th_height.xml tables/mozilla/marvin/x_th_nowrap.xml tables/mozilla/marvin/x_tr_bgcolor_name.xml tables/mozilla/marvin/x_tr_bgcolor_rgb.xml tables/mozilla/other/cell_widths.html tables/mozilla/other/nestedTables.html tables/mozilla/other/test3.html tables/mozilla/other/test6.html tables/mozilla/other/wa_table_thtd_rowspan.html tables/mozilla/other/wa_table_tr_align.html tables/mozilla_expected_failures/bugs/bug10140.html tables/mozilla_expected_failures/bugs/bug101759.html tables/mozilla_expected_failures/bugs/bug10216.html tables/mozilla_expected_failures/bugs/bug1055-2.html tables/mozilla_expected_failures/bugs/bug106966.html tables/mozilla_expected_failures/bugs/bug131020-3.html tables/mozilla_expected_failures/bugs/bug14007-1.html tables/mozilla_expected_failures/bugs/bug14007-2.html tables/mozilla_expected_failures/bugs/bug19526.html tables/mozilla_expected_failures/bugs/bug220653.html tables/mozilla_expected_failures/bugs/bug22122.html tables/mozilla_expected_failures/bugs/bug2479-5.html tables/mozilla_expected_failures/bugs/bug32205-1.html tables/mozilla_expected_failures/bugs/bug67915-2.html tables/mozilla_expected_failures/bugs/bug7243.html tables/mozilla_expected_failures/bugs/bug80762-2.html tables/mozilla_expected_failures/bugs/bug85016.html tables/mozilla_expected_failures/bugs/bug89315.html tables/mozilla_expected_failures/bugs/bug91057.html tables/mozilla_expected_failures/core/backgrounds.html tables/mozilla_expected_failures/core/captions1.html tables/mozilla_expected_failures/core/captions2.html tables/mozilla_expected_failures/core/captions3.html tables/mozilla_expected_failures/core/col_span2.html tables/mozilla_expected_failures/core/columns.html tables/mozilla_expected_failures/core/conflicts.html tables/mozilla_expected_failures/core/standards1.html tables/mozilla_expected_failures/marvin/backgr_border-table-cell.html tables/mozilla_expected_failures/marvin/backgr_border-table-column-group.html tables/mozilla_expected_failures/marvin/backgr_border-table-column.html tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html tables/mozilla_expected_failures/marvin/backgr_border-table-row.html tables/mozilla_expected_failures/marvin/backgr_border-table.html tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html tables/mozilla_expected_failures/marvin/backgr_layers-hide.html tables/mozilla_expected_failures/marvin/backgr_layers-show.html tables/mozilla_expected_failures/marvin/backgr_position-table-cell.html tables/mozilla_expected_failures/marvin/backgr_position-table-column-group.html tables/mozilla_expected_failures/marvin/backgr_position-table-column.html tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html tables/mozilla_expected_failures/marvin/backgr_position-table-row.html tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row.html tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling.html tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling.html tables/mozilla_expected_failures/other/empty_cells.html tables/mozilla_expected_failures/other/test4.html transforms/2d/hindi-rotated.html transforms/2d/transform-fixed-container.html 378537 32 wiz 2011-04-03 04:44:16 -0700 @Nezmer: usually this is only a warning. Unconditionally changing the type as you suggest will just shift the warning to users of png<1.5; you need to change it depending on libpng>=1.5 if you want to get rid of it. 82349 2011-02-14 11:59:15 -0800 2011-02-26 23:02:49 -0800 Patch fixing the problem, needs png-1.5.1. patch-ab text/plain 2857 wiz JE5ldEJTRDogcGF0Y2gtYWIsdiAxLjYgMjAxMS8wMS8yNSAxODozODoxNiBkcm9jaG5lciBFeHAg JAoKRml4IGJ1aWxkIHdpdGggcG5nLTEuNS4gRnJvbSBKb2huIEJvd2xlci4KCi0tLSBXZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIuY3BwLm9yaWcJMjAx MC0xMi0yOCAxMjoyODo1MS4wMDAwMDAwMDAgKzAwMDAKKysrIFdlYkNvcmUvcGxhdGZvcm0vaW1h Z2UtZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKQEAgLTYwLDcgKzYwLDExIEBAIGNv bnN0IHVuc2lnbmVkIGxvbmcgY01heFBOR1NpemUgPSAxMDAwMDAKIC8vIENhbGxlZCBpZiB0aGUg ZGVjb2Rpbmcgb2YgdGhlIGltYWdlIGZhaWxzLgogc3RhdGljIHZvaWQgUE5HQVBJIGRlY29kaW5n RmFpbGVkKHBuZ19zdHJ1Y3RwIHBuZywgcG5nX2NvbnN0X2NoYXJwKQogeworI2lmIChQTkdfTElC UE5HX1ZFUiA8IDEwNTAwKQogICAgIGxvbmdqbXAoSk1QQlVGKHBuZyksIDEpOworI2Vsc2UKKyAg ICBwbmdfbG9uZ2ptcChwbmcsIDEpOworI2VuZGlmCiB9CiAKIC8vIENhbGxiYWNrcyBnaXZlbiB0 byB0aGUgcmVhZCBzdHJ1Y3QuICBUaGUgZmlyc3QgaXMgZm9yIHdhcm5pbmdzICh3ZSB3YW50IHRv CkBAIC0yMTYsMTggKzIyMCwyNiBAQCB2b2lkIFBOR0ltYWdlRGVjb2Rlcjo6aGVhZGVyQXZhaWxh YmxlKCkKIHsKICAgICBwbmdfc3RydWN0cCBwbmcgPSBtX3JlYWRlci0+cG5nUHRyKCk7CiAgICAg cG5nX2luZm9wIGluZm8gPSBtX3JlYWRlci0+aW5mb1B0cigpOwotICAgIHBuZ191aW50XzMyIHdp ZHRoID0gcG5nLT53aWR0aDsKLSAgICBwbmdfdWludF8zMiBoZWlnaHQgPSBwbmctPmhlaWdodDsK KyAgICBwbmdfdWludF8zMiB3aWR0aCA9IHBuZ19nZXRfaW1hZ2Vfd2lkdGgocG5nLCBpbmZvKTsK KyAgICBwbmdfdWludF8zMiBoZWlnaHQgPSBwbmdfZ2V0X2ltYWdlX2hlaWdodChwbmcsIGluZm8p OwogICAgIAogICAgIC8vIFByb3RlY3QgYWdhaW5zdCBsYXJnZSBpbWFnZXMuCi0gICAgaWYgKHBu Zy0+d2lkdGggPiBjTWF4UE5HU2l6ZSB8fCBwbmctPmhlaWdodCA+IGNNYXhQTkdTaXplKSB7Cisg ICAgaWYgKHdpZHRoID4gY01heFBOR1NpemUgfHwgaGVpZ2h0ID4gY01heFBOR1NpemUpIHsKKyNp ZiAoUE5HX0xJQlBOR19WRVIgPCAxMDUwMCkKICAgICAgICAgbG9uZ2ptcChKTVBCVUYocG5nKSwg MSk7CisjZWxzZQorICAgICAgICBwbmdfbG9uZ2ptcChwbmcsIDEpOworI2VuZGlmCiAgICAgICAg IHJldHVybjsKICAgICB9CiAgICAgCiAgICAgLy8gV2UgY2FuIGZpbGwgaW4gdGhlIHNpemUgbm93 IHRoYXQgdGhlIGhlYWRlciBpcyBhdmFpbGFibGUuCiAgICAgaWYgKCFzZXRTaXplKHdpZHRoLCBo ZWlnaHQpKSB7CisjaWYgKFBOR19MSUJQTkdfVkVSIDwgMTA1MDApCiAgICAgICAgIGxvbmdqbXAo Sk1QQlVGKHBuZyksIDEpOworI2Vsc2UKKyAgICAgICAgcG5nX2xvbmdqbXAocG5nLCAxKTsKKyNl bmRpZgogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yNzcsOCArMjg5LDcgQEAgdm9pZCBQ TkdJbWFnZURlY29kZXI6OmhlYWRlckF2YWlsYWJsZSgpCiAKICAgICBpZiAobV9yZWFkZXItPmRl Y29kaW5nU2l6ZU9ubHkoKSkgewogICAgICAgICAvLyBJZiB3ZSBvbmx5IG5lZWRlZCB0aGUgc2l6 ZSwgaGFsdCB0aGUgcmVhZGVyLiAgICAgCi0gICAgICAgIG1fcmVhZGVyLT5zZXRSZWFkT2Zmc2V0 KG1fcmVhZGVyLT5jdXJyZW50QnVmZmVyU2l6ZSgpIC0gcG5nLT5idWZmZXJfc2l6ZSk7Ci0gICAg ICAgIHBuZy0+YnVmZmVyX3NpemUgPSAwOworICAgICAgICBtX3JlYWRlci0+c2V0UmVhZE9mZnNl dChtX3JlYWRlci0+Y3VycmVudEJ1ZmZlclNpemUoKSAtIHBuZ19wcm9jZXNzX2RhdGFfcGF1c2Uo cG5nLCAwLypkbyBub3Qgc2F2ZSB0aGUgZGF0YSovKSk7CiAgICAgfQogfQogCkBAIC0yOTEsNyAr MzAyLDExIEBAIHZvaWQgUE5HSW1hZ2VEZWNvZGVyOjpyb3dBdmFpbGFibGUodW5zaWcKICAgICBS R0JBMzJCdWZmZXImIGJ1ZmZlciA9IG1fZnJhbWVCdWZmZXJDYWNoZVswXTsKICAgICBpZiAoYnVm ZmVyLnN0YXR1cygpID09IFJHQkEzMkJ1ZmZlcjo6RnJhbWVFbXB0eSkgewogICAgICAgICBpZiAo IWJ1ZmZlci5zZXRTaXplKHNjYWxlZFNpemUoKS53aWR0aCgpLCBzY2FsZWRTaXplKCkuaGVpZ2h0 KCkpKSB7CisjaWYgKFBOR19MSUJQTkdfVkVSIDwgMTA1MDApCiAgICAgICAgICAgICBsb25nam1w KEpNUEJVRihtX3JlYWRlci0+cG5nUHRyKCkpLCAxKTsKKyNlbHNlCisgICAgICAgICAgICBwbmdf bG9uZ2ptcChtX3JlYWRlci0+cG5nUHRyKCksIDEpOworI2VuZGlmCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KICAgICAgICAgYnVmZmVyLnNldFN0YXR1cyhSR0JBMzJCdWZmZXI6OkZy YW1lUGFydGlhbCk7CkBAIC0zMDAsNyArMzE1LDggQEAgdm9pZCBQTkdJbWFnZURlY29kZXI6OnJv d0F2YWlsYWJsZSh1bnNpZwogICAgICAgICAvLyBGb3IgUE5HcywgdGhlIGZyYW1lIGFsd2F5cyBm aWxscyB0aGUgZW50aXJlIGltYWdlLgogICAgICAgICBidWZmZXIuc2V0UmVjdChJbnRSZWN0KElu dFBvaW50KCksIHNpemUoKSkpOwogCi0gICAgICAgIGlmIChtX3JlYWRlci0+cG5nUHRyKCktPmlu dGVybGFjZWQpCisgICAgICAgIGlmIChwbmdfZ2V0X2ludGVybGFjZV90eXBlKG1fcmVhZGVyLT5w bmdQdHIoKSwgbV9yZWFkZXItPmluZm9QdHIoKSkKKwkJIT0gUE5HX0lOVEVSTEFDRV9OT05FKQog ICAgICAgICAgICAgbV9yZWFkZXItPmNyZWF0ZUludGVybGFjZUJ1ZmZlcigobV9yZWFkZXItPmhh c0FscGhhKCkgPyA0IDogMykgKiBzaXplKCkud2lkdGgoKSAqIHNpemUoKS5oZWlnaHQoKSk7CiAg ICAgfQogCg== 83967 2011-02-26 23:02:49 -0800 2011-02-26 23:22:38 -0800 Patch implementing review comments png-1.5.diff text/plain 3873 wiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5ODE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDItMjYgIFRob21hcyBL bGF1c25lciAgPHRrQGdpZ2Eub3IuYXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRml4IGNvbXBpbGF0aW9uIHdpdGggcG5nLTEuNSwgYW5kIHVzZSBu ZXcgQVBJIHRvIHRlcm1pbmF0ZSBkYXRhCisgICAgICAgIHByb2Nlc3NpbmcuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcvUE5HSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAg ICAgKHBuZ19sb25nam1wKToKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kaW5nRmFpbGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlBOR0ltYWdlRGVjb2Rlcjo6aGVhZGVyQXZhaWxhYmxlKToKKyAgICAg ICAgKFdlYkNvcmU6OlBOR0ltYWdlRGVjb2Rlcjo6cm93QXZhaWxhYmxlKToKKwogMjAxMS0wMi0y NiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAJKHJldmlzaW9u IDc5ODE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BO R0ltYWdlRGVjb2Rlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDEzIEBACiAjZGVm aW5lIEpNUEJVRihwbmdfcHRyKSBwbmdfcHRyLT5qbXBidWYKICNlbmRpZgogCisjaWYgZGVmaW5l ZChQTkdfTElCUE5HX1ZFUiA8IDEwNTAwKQorc3RhdGljIHZvaWQgcG5nX2xvbmdqbXAocG5nX3N0 cnVjdHAgcG5nLCBpbnQgdmFsdWUpCit7CisgICAgIGxvbmdqbXAoSk1QQlVGKHBuZyksIHZhbHVl KQorfQorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogLy8gR2FtbWEgY29uc3RhbnRz LgpAQCAtNjAsNyArNjcsNyBAQCBjb25zdCB1bnNpZ25lZCBsb25nIGNNYXhQTkdTaXplID0gMTAw MDAwCiAvLyBDYWxsZWQgaWYgdGhlIGRlY29kaW5nIG9mIHRoZSBpbWFnZSBmYWlscy4KIHN0YXRp YyB2b2lkIFBOR0FQSSBkZWNvZGluZ0ZhaWxlZChwbmdfc3RydWN0cCBwbmcsIHBuZ19jb25zdF9j aGFycCkKIHsKLSAgICBsb25nam1wKEpNUEJVRihwbmcpLCAxKTsKKyAgICBwbmdfbG9uZ2ptcChw bmcsIDEpOwogfQogCiAvLyBDYWxsYmFja3MgZ2l2ZW4gdG8gdGhlIHJlYWQgc3RydWN0LiAgVGhl IGZpcnN0IGlzIGZvciB3YXJuaW5ncyAod2Ugd2FudCB0bwpAQCAtMjQxLDEyICsyNDgsMTIgQEAg dm9pZCBQTkdJbWFnZURlY29kZXI6OmhlYWRlckF2YWlsYWJsZSgpCiB7CiAgICAgcG5nX3N0cnVj dHAgcG5nID0gbV9yZWFkZXItPnBuZ1B0cigpOwogICAgIHBuZ19pbmZvcCBpbmZvID0gbV9yZWFk ZXItPmluZm9QdHIoKTsKLSAgICBwbmdfdWludF8zMiB3aWR0aCA9IHBuZy0+d2lkdGg7Ci0gICAg cG5nX3VpbnRfMzIgaGVpZ2h0ID0gcG5nLT5oZWlnaHQ7CisgICAgcG5nX3VpbnRfMzIgd2lkdGgg PSBwbmdfZ2V0X2ltYWdlX3dpZHRoKHBuZywgaW5mbyk7CisgICAgcG5nX3VpbnRfMzIgaGVpZ2h0 ID0gcG5nX2dldF9pbWFnZV9oZWlnaHQocG5nLCBpbmZvKTsKICAgICAKICAgICAvLyBQcm90ZWN0 IGFnYWluc3QgbGFyZ2UgaW1hZ2VzLgotICAgIGlmIChwbmctPndpZHRoID4gY01heFBOR1NpemUg fHwgcG5nLT5oZWlnaHQgPiBjTWF4UE5HU2l6ZSkgewotICAgICAgICBsb25nam1wKEpNUEJVRihw bmcpLCAxKTsKKyAgICBpZiAod2lkdGggPiBjTWF4UE5HU2l6ZSB8fCBoZWlnaHQgPiBjTWF4UE5H U2l6ZSkgeworICAgICAgICBwbmdfbG9uZ2ptcChwbmcsIDEpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogICAgIApAQCAtMjU5LDcgKzI2Niw3IEBAIHZvaWQgUE5HSW1hZ2VEZWNvZGVyOjpoZWFk ZXJBdmFpbGFibGUoKQogICAgIGJvb2wgcmVzdWx0ID0gc2V0U2l6ZSh3aWR0aCwgaGVpZ2h0KTsK ICAgICBtX2RvTm90aGluZ09uRmFpbHVyZSA9IGZhbHNlOwogICAgIGlmICghcmVzdWx0KSB7Ci0g ICAgICAgIGxvbmdqbXAoSk1QQlVGKHBuZyksIDEpOworICAgICAgICBwbmdfbG9uZ2ptcChwbmcs IDEpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0zMTgsOSArMzI1LDEzIEBAIHZvaWQg UE5HSW1hZ2VEZWNvZGVyOjpoZWFkZXJBdmFpbGFibGUoKQogICAgIG1fcmVhZGVyLT5zZXRIYXNB bHBoYShjaGFubmVscyA9PSA0KTsKIAogICAgIGlmIChtX3JlYWRlci0+ZGVjb2RpbmdTaXplT25s eSgpKSB7Ci0gICAgICAgIC8vIElmIHdlIG9ubHkgbmVlZGVkIHRoZSBzaXplLCBoYWx0IHRoZSBy ZWFkZXIuICAgICAKKyAgICAgICAgLy8gSWYgd2Ugb25seSBuZWVkZWQgdGhlIHNpemUsIGhhbHQg dGhlIHJlYWRlci4KKyNpZiAoUE5HX0xJQlBOR19WRVIgPCAxMDUwMCkKICAgICAgICAgbV9yZWFk ZXItPnNldFJlYWRPZmZzZXQobV9yZWFkZXItPmN1cnJlbnRCdWZmZXJTaXplKCkgLSBwbmctPmJ1 ZmZlcl9zaXplKTsKICAgICAgICAgcG5nLT5idWZmZXJfc2l6ZSA9IDA7CisjZWxzZQorICAgICAg ICBtX3JlYWRlci0+c2V0UmVhZE9mZnNldChtX3JlYWRlci0+Y3VycmVudEJ1ZmZlclNpemUoKSAt IHBuZ19wcm9jZXNzX2RhdGFfcGF1c2UocG5nLCAwLypkbyBub3Qgc2F2ZSB0aGUgZGF0YSovKSk7 CisjZW5kaWYKICAgICB9CiB9CiAKQEAgLTMzMyw3ICszNDQsNyBAQCB2b2lkIFBOR0ltYWdlRGVj b2Rlcjo6cm93QXZhaWxhYmxlKHVuc2lnCiAgICAgSW1hZ2VGcmFtZSYgYnVmZmVyID0gbV9mcmFt ZUJ1ZmZlckNhY2hlWzBdOwogICAgIGlmIChidWZmZXIuc3RhdHVzKCkgPT0gSW1hZ2VGcmFtZTo6 RnJhbWVFbXB0eSkgewogICAgICAgICBpZiAoIWJ1ZmZlci5zZXRTaXplKHNjYWxlZFNpemUoKS53 aWR0aCgpLCBzY2FsZWRTaXplKCkuaGVpZ2h0KCkpKSB7Ci0gICAgICAgICAgICBsb25nam1wKEpN UEJVRihtX3JlYWRlci0+cG5nUHRyKCkpLCAxKTsKKyAgICAgICAgICAgIHBuZ19sb25nam1wKG1f cmVhZGVyLT5wbmdQdHIoKSwgMSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAg ICAgICAgYnVmZmVyLnNldFN0YXR1cyhJbWFnZUZyYW1lOjpGcmFtZVBhcnRpYWwpOwpAQCAtMzQz LDcgKzM1NCw3IEBAIHZvaWQgUE5HSW1hZ2VEZWNvZGVyOjpyb3dBdmFpbGFibGUodW5zaWcKICAg ICAgICAgLy8gRm9yIFBOR3MsIHRoZSBmcmFtZSBhbHdheXMgZmlsbHMgdGhlIGVudGlyZSBpbWFn ZS4KICAgICAgICAgYnVmZmVyLnNldE9yaWdpbmFsRnJhbWVSZWN0KEludFJlY3QoSW50UG9pbnQo KSwgc2l6ZSgpKSk7CiAKLSAgICAgICAgaWYgKG1fcmVhZGVyLT5wbmdQdHIoKS0+aW50ZXJsYWNl ZCkKKyAgICAgICAgaWYgKHBuZ19nZXRfaW50ZXJsYWNlX3R5cGUobV9yZWFkZXItPnBuZ1B0cigp LCBtX3JlYWRlci0+aW5mb1B0cigpKSAhPSBQTkdfSU5URVJMQUNFX05PTkUpCiAgICAgICAgICAg ICBtX3JlYWRlci0+Y3JlYXRlSW50ZXJsYWNlQnVmZmVyKChtX3JlYWRlci0+aGFzQWxwaGEoKSA/ IDQgOiAzKSAqIHNpemUoKS53aWR0aCgpICogc2l6ZSgpLmhlaWdodCgpKTsKICAgICB9CiAK 83968 2011-02-26 23:22:38 -0800 2011-02-26 23:31:37 -0800 Patch addressing review problems. png-1.5v2.diff text/plain 3911 wiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5ODE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDItMjYgIFRob21hcyBL bGF1c25lciAgPHRrQGdpZ2Eub3IuYXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRml4IGNvbXBpbGF0aW9uIHdpdGggcG5nLTEuNSwgYW5kIHVzZSBu ZXcgQVBJIHRvIHRlcm1pbmF0ZSBkYXRhCisgICAgICAgIHByb2Nlc3NpbmcuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcvUE5HSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAg ICAgKHBuZ19sb25nam1wKToKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kaW5nRmFpbGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlBOR0ltYWdlRGVjb2Rlcjo6aGVhZGVyQXZhaWxhYmxlKToKKyAgICAg ICAgKFdlYkNvcmU6OlBOR0ltYWdlRGVjb2Rlcjo6cm93QXZhaWxhYmxlKToKKwogMjAxMS0wMi0y NiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAJKHJldmlzaW9u IDc5ODE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BO R0ltYWdlRGVjb2Rlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDE1IEBACiAjZGVm aW5lIEpNUEJVRihwbmdfcHRyKSBwbmdfcHRyLT5qbXBidWYKICNlbmRpZgogCitzdGF0aWMgdm9p ZCBwbmdsb25nam1wKHBuZ19zdHJ1Y3RwIHBuZywgaW50IHZhbHVlKQoreworI2lmIGRlZmluZWQo UE5HX0xJQlBOR19WRVJfTUFKT1IpICYmIGRlZmluZWQoUE5HX0xJQlBOR19WRVJfTUlOT1IpICYm IChQTkdfTElCUE5HX1ZFUl9NQUpPUiA+IDEgfHwgKFBOR19MSUJQTkdfVkVSX01BSk9SID09IDEg JiYgUE5HX0xJQlBOR19WRVJfTUlOT1IgPj0gNSkpCisgICAgIHBuZ19sb25nam1wKHBuZywgdmFs dWUpCisjZWxzZQorICAgICBsb25nam1wKEpNUEJVRihwbmcpLCB2YWx1ZSkKKyNlbmRpZgorfQor CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8vIEdhbW1hIGNvbnN0YW50cy4KQEAgLTYwLDcgKzY5 LDcgQEAKIC8vIENhbGxlZCBpZiB0aGUgZGVjb2Rpbmcgb2YgdGhlIGltYWdlIGZhaWxzLgogc3Rh dGljIHZvaWQgUE5HQVBJIGRlY29kaW5nRmFpbGVkKHBuZ19zdHJ1Y3RwIHBuZywgcG5nX2NvbnN0 X2NoYXJwKQogewotICAgIGxvbmdqbXAoSk1QQlVGKHBuZyksIDEpOworICAgIHBuZ2xvbmdqbXAo cG5nLCAxKTsKIH0KIAogLy8gQ2FsbGJhY2tzIGdpdmVuIHRvIHRoZSByZWFkIHN0cnVjdC4gIFRo ZSBmaXJzdCBpcyBmb3Igd2FybmluZ3MgKHdlIHdhbnQgdG8KQEAgLTI0MSwxMiArMjUwLDEyIEBA CiB7CiAgICAgcG5nX3N0cnVjdHAgcG5nID0gbV9yZWFkZXItPnBuZ1B0cigpOwogICAgIHBuZ19p bmZvcCBpbmZvID0gbV9yZWFkZXItPmluZm9QdHIoKTsKLSAgICBwbmdfdWludF8zMiB3aWR0aCA9 IHBuZy0+d2lkdGg7Ci0gICAgcG5nX3VpbnRfMzIgaGVpZ2h0ID0gcG5nLT5oZWlnaHQ7CisgICAg cG5nX3VpbnRfMzIgd2lkdGggPSBwbmdfZ2V0X2ltYWdlX3dpZHRoKHBuZywgaW5mbyk7CisgICAg cG5nX3VpbnRfMzIgaGVpZ2h0ID0gcG5nX2dldF9pbWFnZV9oZWlnaHQocG5nLCBpbmZvKTsKICAg ICAKICAgICAvLyBQcm90ZWN0IGFnYWluc3QgbGFyZ2UgaW1hZ2VzLgotICAgIGlmIChwbmctPndp ZHRoID4gY01heFBOR1NpemUgfHwgcG5nLT5oZWlnaHQgPiBjTWF4UE5HU2l6ZSkgewotICAgICAg ICBsb25nam1wKEpNUEJVRihwbmcpLCAxKTsKKyAgICBpZiAod2lkdGggPiBjTWF4UE5HU2l6ZSB8 fCBoZWlnaHQgPiBjTWF4UE5HU2l6ZSkgeworICAgICAgICBwbmdsb25nam1wKHBuZywgMSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCkBAIC0yNTksNyArMjY4LDcgQEAKICAgICBib29s IHJlc3VsdCA9IHNldFNpemUod2lkdGgsIGhlaWdodCk7CiAgICAgbV9kb05vdGhpbmdPbkZhaWx1 cmUgPSBmYWxzZTsKICAgICBpZiAoIXJlc3VsdCkgewotICAgICAgICBsb25nam1wKEpNUEJVRihw bmcpLCAxKTsKKyAgICAgICAgcG5nbG9uZ2ptcChwbmcsIDEpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC0zMTgsOSArMzI3LDEzIEBACiAgICAgbV9yZWFkZXItPnNldEhhc0FscGhhKGNo YW5uZWxzID09IDQpOwogCiAgICAgaWYgKG1fcmVhZGVyLT5kZWNvZGluZ1NpemVPbmx5KCkpIHsK LSAgICAgICAgLy8gSWYgd2Ugb25seSBuZWVkZWQgdGhlIHNpemUsIGhhbHQgdGhlIHJlYWRlci4g ICAgIAorICAgICAgICAvLyBJZiB3ZSBvbmx5IG5lZWRlZCB0aGUgc2l6ZSwgaGFsdCB0aGUgcmVh ZGVyLgorI2lmIGRlZmluZWQoUE5HX0xJQlBOR19WRVJfTUFKT1IpICYmIGRlZmluZWQoUE5HX0xJ QlBOR19WRVJfTUlOT1IpICYmIChQTkdfTElCUE5HX1ZFUl9NQUpPUiA+IDEgfHwgKFBOR19MSUJQ TkdfVkVSX01BSk9SID09IDEgJiYgUE5HX0xJQlBOR19WRVJfTUlOT1IgPj0gNSkpCisgICAgICAg IG1fcmVhZGVyLT5zZXRSZWFkT2Zmc2V0KG1fcmVhZGVyLT5jdXJyZW50QnVmZmVyU2l6ZSgpIC0g cG5nX3Byb2Nlc3NfZGF0YV9wYXVzZShwbmcsIDAvKmRvIG5vdCBzYXZlIHRoZSBkYXRhKi8pKTsK KyNlbHNlCiAgICAgICAgIG1fcmVhZGVyLT5zZXRSZWFkT2Zmc2V0KG1fcmVhZGVyLT5jdXJyZW50 QnVmZmVyU2l6ZSgpIC0gcG5nLT5idWZmZXJfc2l6ZSk7CiAgICAgICAgIHBuZy0+YnVmZmVyX3Np emUgPSAwOworI2VuZGlmCiAgICAgfQogfQogCkBAIC0zMzMsNyArMzQ2LDcgQEAKICAgICBJbWFn ZUZyYW1lJiBidWZmZXIgPSBtX2ZyYW1lQnVmZmVyQ2FjaGVbMF07CiAgICAgaWYgKGJ1ZmZlci5z dGF0dXMoKSA9PSBJbWFnZUZyYW1lOjpGcmFtZUVtcHR5KSB7CiAgICAgICAgIGlmICghYnVmZmVy LnNldFNpemUoc2NhbGVkU2l6ZSgpLndpZHRoKCksIHNjYWxlZFNpemUoKS5oZWlnaHQoKSkpIHsK LSAgICAgICAgICAgIGxvbmdqbXAoSk1QQlVGKG1fcmVhZGVyLT5wbmdQdHIoKSksIDEpOworICAg ICAgICAgICAgcG5nbG9uZ2ptcChtX3JlYWRlci0+cG5nUHRyKCksIDEpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGJ1ZmZlci5zZXRTdGF0dXMoSW1hZ2VGcmFtZTo6 RnJhbWVQYXJ0aWFsKTsKQEAgLTM0Myw3ICszNTYsNyBAQAogICAgICAgICAvLyBGb3IgUE5Hcywg dGhlIGZyYW1lIGFsd2F5cyBmaWxscyB0aGUgZW50aXJlIGltYWdlLgogICAgICAgICBidWZmZXIu c2V0T3JpZ2luYWxGcmFtZVJlY3QoSW50UmVjdChJbnRQb2ludCgpLCBzaXplKCkpKTsKIAotICAg ICAgICBpZiAobV9yZWFkZXItPnBuZ1B0cigpLT5pbnRlcmxhY2VkKQorICAgICAgICBpZiAocG5n X2dldF9pbnRlcmxhY2VfdHlwZShtX3JlYWRlci0+cG5nUHRyKCksIG1fcmVhZGVyLT5pbmZvUHRy KCkpICE9IFBOR19JTlRFUkxBQ0VfTk9ORSkKICAgICAgICAgICAgIG1fcmVhZGVyLT5jcmVhdGVJ bnRlcmxhY2VCdWZmZXIoKG1fcmVhZGVyLT5oYXNBbHBoYSgpID8gNCA6IDMpICogc2l6ZSgpLndp ZHRoKCkgKiBzaXplKCkuaGVpZ2h0KCkpOwogICAgIH0KIAo= 83969 2011-02-26 23:31:37 -0800 2011-02-27 04:42:07 -0800 Patch fixing bug in previous. png-1.5v3.diff text/plain 3911 wiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5ODE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDItMjYgIFRob21hcyBL bGF1c25lciAgPHRrQGdpZ2Eub3IuYXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRml4IGNvbXBpbGF0aW9uIHdpdGggcG5nLTEuNSwgYW5kIHVzZSBu ZXcgQVBJIHRvIHRlcm1pbmF0ZSBkYXRhCisgICAgICAgIHByb2Nlc3NpbmcuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcvUE5HSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAg ICAgKHBuZ19sb25nam1wKToKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kaW5nRmFpbGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlBOR0ltYWdlRGVjb2Rlcjo6aGVhZGVyQXZhaWxhYmxlKToKKyAgICAg ICAgKFdlYkNvcmU6OlBOR0ltYWdlRGVjb2Rlcjo6cm93QXZhaWxhYmxlKToKKwogMjAxMS0wMi0y NiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAJKHJldmlzaW9u IDc5ODE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BO R0ltYWdlRGVjb2Rlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDE1IEBACiAjZGVm aW5lIEpNUEJVRihwbmdfcHRyKSBwbmdfcHRyLT5qbXBidWYKICNlbmRpZgogCitzdGF0aWMgdm9p ZCBwbmdsb25nam1wKHBuZ19zdHJ1Y3RwIHBuZywgaW50IHZhbHVlKQoreworI2lmIGRlZmluZWQo UE5HX0xJQlBOR19WRVJfTUFKT1IpICYmIGRlZmluZWQoUE5HX0xJQlBOR19WRVJfTUlOT1IpICYm IChQTkdfTElCUE5HX1ZFUl9NQUpPUiA+IDEgfHwgKFBOR19MSUJQTkdfVkVSX01BSk9SID09IDEg JiYgUE5HX0xJQlBOR19WRVJfTUlOT1IgPj0gNSkpCisgICAgcG5nX2xvbmdqbXAocG5nLCB2YWx1 ZSk7CisjZWxzZQorICAgIGxvbmdqbXAoSk1QQlVGKHBuZyksIHZhbHVlKTsKKyNlbmRpZgorfQor CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8vIEdhbW1hIGNvbnN0YW50cy4KQEAgLTYwLDcgKzY5 LDcgQEAKIC8vIENhbGxlZCBpZiB0aGUgZGVjb2Rpbmcgb2YgdGhlIGltYWdlIGZhaWxzLgogc3Rh dGljIHZvaWQgUE5HQVBJIGRlY29kaW5nRmFpbGVkKHBuZ19zdHJ1Y3RwIHBuZywgcG5nX2NvbnN0 X2NoYXJwKQogewotICAgIGxvbmdqbXAoSk1QQlVGKHBuZyksIDEpOworICAgIHBuZ2xvbmdqbXAo cG5nLCAxKTsKIH0KIAogLy8gQ2FsbGJhY2tzIGdpdmVuIHRvIHRoZSByZWFkIHN0cnVjdC4gIFRo ZSBmaXJzdCBpcyBmb3Igd2FybmluZ3MgKHdlIHdhbnQgdG8KQEAgLTI0MSwxMiArMjUwLDEyIEBA CiB7CiAgICAgcG5nX3N0cnVjdHAgcG5nID0gbV9yZWFkZXItPnBuZ1B0cigpOwogICAgIHBuZ19p bmZvcCBpbmZvID0gbV9yZWFkZXItPmluZm9QdHIoKTsKLSAgICBwbmdfdWludF8zMiB3aWR0aCA9 IHBuZy0+d2lkdGg7Ci0gICAgcG5nX3VpbnRfMzIgaGVpZ2h0ID0gcG5nLT5oZWlnaHQ7CisgICAg cG5nX3VpbnRfMzIgd2lkdGggPSBwbmdfZ2V0X2ltYWdlX3dpZHRoKHBuZywgaW5mbyk7CisgICAg cG5nX3VpbnRfMzIgaGVpZ2h0ID0gcG5nX2dldF9pbWFnZV9oZWlnaHQocG5nLCBpbmZvKTsKICAg ICAKICAgICAvLyBQcm90ZWN0IGFnYWluc3QgbGFyZ2UgaW1hZ2VzLgotICAgIGlmIChwbmctPndp ZHRoID4gY01heFBOR1NpemUgfHwgcG5nLT5oZWlnaHQgPiBjTWF4UE5HU2l6ZSkgewotICAgICAg ICBsb25nam1wKEpNUEJVRihwbmcpLCAxKTsKKyAgICBpZiAod2lkdGggPiBjTWF4UE5HU2l6ZSB8 fCBoZWlnaHQgPiBjTWF4UE5HU2l6ZSkgeworICAgICAgICBwbmdsb25nam1wKHBuZywgMSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCkBAIC0yNTksNyArMjY4LDcgQEAKICAgICBib29s IHJlc3VsdCA9IHNldFNpemUod2lkdGgsIGhlaWdodCk7CiAgICAgbV9kb05vdGhpbmdPbkZhaWx1 cmUgPSBmYWxzZTsKICAgICBpZiAoIXJlc3VsdCkgewotICAgICAgICBsb25nam1wKEpNUEJVRihw bmcpLCAxKTsKKyAgICAgICAgcG5nbG9uZ2ptcChwbmcsIDEpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC0zMTgsOSArMzI3LDEzIEBACiAgICAgbV9yZWFkZXItPnNldEhhc0FscGhhKGNo YW5uZWxzID09IDQpOwogCiAgICAgaWYgKG1fcmVhZGVyLT5kZWNvZGluZ1NpemVPbmx5KCkpIHsK LSAgICAgICAgLy8gSWYgd2Ugb25seSBuZWVkZWQgdGhlIHNpemUsIGhhbHQgdGhlIHJlYWRlci4g ICAgIAorICAgICAgICAvLyBJZiB3ZSBvbmx5IG5lZWRlZCB0aGUgc2l6ZSwgaGFsdCB0aGUgcmVh ZGVyLgorI2lmIGRlZmluZWQoUE5HX0xJQlBOR19WRVJfTUFKT1IpICYmIGRlZmluZWQoUE5HX0xJ QlBOR19WRVJfTUlOT1IpICYmIChQTkdfTElCUE5HX1ZFUl9NQUpPUiA+IDEgfHwgKFBOR19MSUJQ TkdfVkVSX01BSk9SID09IDEgJiYgUE5HX0xJQlBOR19WRVJfTUlOT1IgPj0gNSkpCisgICAgICAg IG1fcmVhZGVyLT5zZXRSZWFkT2Zmc2V0KG1fcmVhZGVyLT5jdXJyZW50QnVmZmVyU2l6ZSgpIC0g cG5nX3Byb2Nlc3NfZGF0YV9wYXVzZShwbmcsIDAvKmRvIG5vdCBzYXZlIHRoZSBkYXRhKi8pKTsK KyNlbHNlCiAgICAgICAgIG1fcmVhZGVyLT5zZXRSZWFkT2Zmc2V0KG1fcmVhZGVyLT5jdXJyZW50 QnVmZmVyU2l6ZSgpIC0gcG5nLT5idWZmZXJfc2l6ZSk7CiAgICAgICAgIHBuZy0+YnVmZmVyX3Np emUgPSAwOworI2VuZGlmCiAgICAgfQogfQogCkBAIC0zMzMsNyArMzQ2LDcgQEAKICAgICBJbWFn ZUZyYW1lJiBidWZmZXIgPSBtX2ZyYW1lQnVmZmVyQ2FjaGVbMF07CiAgICAgaWYgKGJ1ZmZlci5z dGF0dXMoKSA9PSBJbWFnZUZyYW1lOjpGcmFtZUVtcHR5KSB7CiAgICAgICAgIGlmICghYnVmZmVy LnNldFNpemUoc2NhbGVkU2l6ZSgpLndpZHRoKCksIHNjYWxlZFNpemUoKS5oZWlnaHQoKSkpIHsK LSAgICAgICAgICAgIGxvbmdqbXAoSk1QQlVGKG1fcmVhZGVyLT5wbmdQdHIoKSksIDEpOworICAg ICAgICAgICAgcG5nbG9uZ2ptcChtX3JlYWRlci0+cG5nUHRyKCksIDEpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGJ1ZmZlci5zZXRTdGF0dXMoSW1hZ2VGcmFtZTo6 RnJhbWVQYXJ0aWFsKTsKQEAgLTM0Myw3ICszNTYsNyBAQAogICAgICAgICAvLyBGb3IgUE5Hcywg dGhlIGZyYW1lIGFsd2F5cyBmaWxscyB0aGUgZW50aXJlIGltYWdlLgogICAgICAgICBidWZmZXIu c2V0T3JpZ2luYWxGcmFtZVJlY3QoSW50UmVjdChJbnRQb2ludCgpLCBzaXplKCkpKTsKIAotICAg ICAgICBpZiAobV9yZWFkZXItPnBuZ1B0cigpLT5pbnRlcmxhY2VkKQorICAgICAgICBpZiAocG5n X2dldF9pbnRlcmxhY2VfdHlwZShtX3JlYWRlci0+cG5nUHRyKCksIG1fcmVhZGVyLT5pbmZvUHRy KCkpICE9IFBOR19JTlRFUkxBQ0VfTk9ORSkKICAgICAgICAgICAgIG1fcmVhZGVyLT5jcmVhdGVJ bnRlcmxhY2VCdWZmZXIoKG1fcmVhZGVyLT5oYXNBbHBoYSgpID8gNCA6IDMpICogc2l6ZSgpLndp ZHRoKCkgKiBzaXplKCkuaGVpZ2h0KCkpOwogICAgIH0KIAo= 83972 2011-02-27 04:42:07 -0800 2011-03-28 02:24:59 -0700 Patch implementing review comments png-1.5v4.diff text/plain 2911 wiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5ODE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMjcgIFRob21hcyBL bGF1c25lciAgPHRrQGdpZ2Eub3IuYXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgcG5nLTEuNSBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ0MDYKKworICAgICAgICBGaXggY29tcGlsYXRpb24g d2l0aCBwbmctMS41OiBzdHJ1Y3QgbWVtYmVycyB3ZXJlIGhpZGRlbiwgYW5kCisgICAgICAgIGEg bmV3IEFQSSB0byB0ZXJtaW5hdGUgZGF0YSBwcm9jZXNzaW5nIHdhcyBhZGRlZCAoZXNwZWNpYWxs eSBmb3IKKyAgICAgICAgV2ViS2l0KS4KKworICAgICAgICBDb21waWxhdGlvbiBmaXhlcywgc28g bm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BO R0ltYWdlRGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQTkdJbWFnZURlY29kZXI6Omhl YWRlckF2YWlsYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpQTkdJbWFnZURlY29kZXI6OnJvd0F2 YWlsYWJsZSk6CisKIDIwMTEtMDItMjYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFn ZURlY29kZXIuY3BwCShyZXZpc2lvbiA3OTgxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNDEsMTEgKzI0MSwxMSBAQCB2b2lkIFBOR0ltYWdlRGVjb2Rlcjo6aGVhZGVyQXZhaWxhYmxl KCkKIHsKICAgICBwbmdfc3RydWN0cCBwbmcgPSBtX3JlYWRlci0+cG5nUHRyKCk7CiAgICAgcG5n X2luZm9wIGluZm8gPSBtX3JlYWRlci0+aW5mb1B0cigpOwotICAgIHBuZ191aW50XzMyIHdpZHRo ID0gcG5nLT53aWR0aDsKLSAgICBwbmdfdWludF8zMiBoZWlnaHQgPSBwbmctPmhlaWdodDsKKyAg ICBwbmdfdWludF8zMiB3aWR0aCA9IHBuZ19nZXRfaW1hZ2Vfd2lkdGgocG5nLCBpbmZvKTsKKyAg ICBwbmdfdWludF8zMiBoZWlnaHQgPSBwbmdfZ2V0X2ltYWdlX2hlaWdodChwbmcsIGluZm8pOwog ICAgIAogICAgIC8vIFByb3RlY3QgYWdhaW5zdCBsYXJnZSBpbWFnZXMuCi0gICAgaWYgKHBuZy0+ d2lkdGggPiBjTWF4UE5HU2l6ZSB8fCBwbmctPmhlaWdodCA+IGNNYXhQTkdTaXplKSB7CisgICAg aWYgKHdpZHRoID4gY01heFBOR1NpemUgfHwgaGVpZ2h0ID4gY01heFBOR1NpemUpIHsKICAgICAg ICAgbG9uZ2ptcChKTVBCVUYocG5nKSwgMSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0z MTgsOSArMzE4LDE0IEBAIHZvaWQgUE5HSW1hZ2VEZWNvZGVyOjpoZWFkZXJBdmFpbGFibGUoKQog ICAgIG1fcmVhZGVyLT5zZXRIYXNBbHBoYShjaGFubmVscyA9PSA0KTsKIAogICAgIGlmIChtX3Jl YWRlci0+ZGVjb2RpbmdTaXplT25seSgpKSB7Ci0gICAgICAgIC8vIElmIHdlIG9ubHkgbmVlZGVk IHRoZSBzaXplLCBoYWx0IHRoZSByZWFkZXIuICAgICAKKyAgICAgICAgLy8gSWYgd2Ugb25seSBu ZWVkZWQgdGhlIHNpemUsIGhhbHQgdGhlIHJlYWRlci4KKyNpZiBkZWZpbmVkKFBOR19MSUJQTkdf VkVSX01BSk9SKSAmJiBkZWZpbmVkKFBOR19MSUJQTkdfVkVSX01JTk9SKSAmJiAoUE5HX0xJQlBO R19WRVJfTUFKT1IgPiAxIHx8IChQTkdfTElCUE5HX1ZFUl9NQUpPUiA9PSAxICYmIFBOR19MSUJQ TkdfVkVSX01JTk9SID49IDUpKQorICAgICAgICAvKiAnMCcgYXJndW1lbnQgdG8gcG5nX3Byb2Nl c3NfZGF0YV9wYXVzZSBtZWFuczogZG8gbm90IHNhdmUgdGhlIGRhdGEgKi8KKyAgICAgICAgbV9y ZWFkZXItPnNldFJlYWRPZmZzZXQobV9yZWFkZXItPmN1cnJlbnRCdWZmZXJTaXplKCkgLSBwbmdf cHJvY2Vzc19kYXRhX3BhdXNlKHBuZywgMCkpOworI2Vsc2UKICAgICAgICAgbV9yZWFkZXItPnNl dFJlYWRPZmZzZXQobV9yZWFkZXItPmN1cnJlbnRCdWZmZXJTaXplKCkgLSBwbmctPmJ1ZmZlcl9z aXplKTsKICAgICAgICAgcG5nLT5idWZmZXJfc2l6ZSA9IDA7CisjZW5kaWYKICAgICB9CiB9CiAK QEAgLTM0Myw3ICszNDgsNyBAQCB2b2lkIFBOR0ltYWdlRGVjb2Rlcjo6cm93QXZhaWxhYmxlKHVu c2lnCiAgICAgICAgIC8vIEZvciBQTkdzLCB0aGUgZnJhbWUgYWx3YXlzIGZpbGxzIHRoZSBlbnRp cmUgaW1hZ2UuCiAgICAgICAgIGJ1ZmZlci5zZXRPcmlnaW5hbEZyYW1lUmVjdChJbnRSZWN0KElu dFBvaW50KCksIHNpemUoKSkpOwogCi0gICAgICAgIGlmIChtX3JlYWRlci0+cG5nUHRyKCktPmlu dGVybGFjZWQpCisgICAgICAgIGlmIChwbmdfZ2V0X2ludGVybGFjZV90eXBlKG1fcmVhZGVyLT5w bmdQdHIoKSwgbV9yZWFkZXItPmluZm9QdHIoKSkgIT0gUE5HX0lOVEVSTEFDRV9OT05FKQogICAg ICAgICAgICAgbV9yZWFkZXItPmNyZWF0ZUludGVybGFjZUJ1ZmZlcigobV9yZWFkZXItPmhhc0Fs cGhhKCkgPyA0IDogMykgKiBzaXplKCkud2lkdGgoKSAqIHNpemUoKS5oZWlnaHQoKSk7CiAgICAg fQogCg== 87118 2011-03-28 02:24:59 -0700 2011-03-29 15:57:08 -0700 Patch implementing review comments by David Levin webkit.png.diff text/plain 2797 wiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5ODE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMjcgIFRob21hcyBL bGF1c25lciAgPHRrQGdpZ2Eub3IuYXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgcG5nLTEuNSBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ0MDYKKworICAgICAgICBGaXggY29tcGlsYXRpb24g d2l0aCBwbmctMS41OiBzdHJ1Y3QgbWVtYmVycyB3ZXJlIGhpZGRlbiwgYW5kCisgICAgICAgIGEg bmV3IEFQSSB0byB0ZXJtaW5hdGUgZGF0YSBwcm9jZXNzaW5nIHdhcyBhZGRlZCAoZXNwZWNpYWxs eSBmb3IKKyAgICAgICAgV2ViS2l0KS4KKworICAgICAgICBDb21waWxhdGlvbiBmaXhlcywgc28g bm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BO R0ltYWdlRGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQTkdJbWFnZURlY29kZXI6Omhl YWRlckF2YWlsYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpQTkdJbWFnZURlY29kZXI6OnJvd0F2 YWlsYWJsZSk6CisKIDIwMTEtMDItMjYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFn ZURlY29kZXIuY3BwCShyZXZpc2lvbiA3OTgxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNDEsMTEgKzI0MSwxMSBAQAogewogICAgIHBuZ19zdHJ1Y3RwIHBuZyA9IG1fcmVhZGVyLT5w bmdQdHIoKTsKICAgICBwbmdfaW5mb3AgaW5mbyA9IG1fcmVhZGVyLT5pbmZvUHRyKCk7Ci0gICAg cG5nX3VpbnRfMzIgd2lkdGggPSBwbmctPndpZHRoOwotICAgIHBuZ191aW50XzMyIGhlaWdodCA9 IHBuZy0+aGVpZ2h0OworICAgIHBuZ191aW50XzMyIHdpZHRoID0gcG5nX2dldF9pbWFnZV93aWR0 aChwbmcsIGluZm8pOworICAgIHBuZ191aW50XzMyIGhlaWdodCA9IHBuZ19nZXRfaW1hZ2VfaGVp Z2h0KHBuZywgaW5mbyk7CiAgICAgCiAgICAgLy8gUHJvdGVjdCBhZ2FpbnN0IGxhcmdlIGltYWdl cy4KLSAgICBpZiAocG5nLT53aWR0aCA+IGNNYXhQTkdTaXplIHx8IHBuZy0+aGVpZ2h0ID4gY01h eFBOR1NpemUpIHsKKyAgICBpZiAod2lkdGggPiBjTWF4UE5HU2l6ZSB8fCBoZWlnaHQgPiBjTWF4 UE5HU2l6ZSkgewogICAgICAgICBsb25nam1wKEpNUEJVRihwbmcpLCAxKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTMxOCw5ICszMTgsMTQgQEAKICAgICBtX3JlYWRlci0+c2V0SGFzQWxw aGEoY2hhbm5lbHMgPT0gNCk7CiAKICAgICBpZiAobV9yZWFkZXItPmRlY29kaW5nU2l6ZU9ubHko KSkgewotICAgICAgICAvLyBJZiB3ZSBvbmx5IG5lZWRlZCB0aGUgc2l6ZSwgaGFsdCB0aGUgcmVh ZGVyLiAgICAgCisgICAgICAgIC8vIElmIHdlIG9ubHkgbmVlZGVkIHRoZSBzaXplLCBoYWx0IHRo ZSByZWFkZXIuCisjaWYgZGVmaW5lZChQTkdfTElCUE5HX1ZFUl9NQUpPUikgJiYgZGVmaW5lZChQ TkdfTElCUE5HX1ZFUl9NSU5PUikgJiYgKFBOR19MSUJQTkdfVkVSX01BSk9SID4gMSB8fCAoUE5H X0xJQlBOR19WRVJfTUFKT1IgPT0gMSAmJiBQTkdfTElCUE5HX1ZFUl9NSU5PUiA+PSA1KSkKKyAg ICAgICAgLy8gJzAnIGFyZ3VtZW50IHRvIHBuZ19wcm9jZXNzX2RhdGFfcGF1c2UgbWVhbnM6IERv IG5vdCBjYWNoZSB1bnByb2Nlc3NlZCBkYXRhLgorICAgICAgICBtX3JlYWRlci0+c2V0UmVhZE9m ZnNldChtX3JlYWRlci0+Y3VycmVudEJ1ZmZlclNpemUoKSAtIHBuZ19wcm9jZXNzX2RhdGFfcGF1 c2UocG5nLCAwKSk7CisjZWxzZQogICAgICAgICBtX3JlYWRlci0+c2V0UmVhZE9mZnNldChtX3Jl YWRlci0+Y3VycmVudEJ1ZmZlclNpemUoKSAtIHBuZy0+YnVmZmVyX3NpemUpOwogICAgICAgICBw bmctPmJ1ZmZlcl9zaXplID0gMDsKKyNlbmRpZgogICAgIH0KIH0KIApAQCAtMzQzLDcgKzM0OCw3 IEBACiAgICAgICAgIC8vIEZvciBQTkdzLCB0aGUgZnJhbWUgYWx3YXlzIGZpbGxzIHRoZSBlbnRp cmUgaW1hZ2UuCiAgICAgICAgIGJ1ZmZlci5zZXRPcmlnaW5hbEZyYW1lUmVjdChJbnRSZWN0KElu dFBvaW50KCksIHNpemUoKSkpOwogCi0gICAgICAgIGlmIChtX3JlYWRlci0+cG5nUHRyKCktPmlu dGVybGFjZWQpCisgICAgICAgIGlmIChwbmdfZ2V0X2ludGVybGFjZV90eXBlKG1fcmVhZGVyLT5w bmdQdHIoKSwgbV9yZWFkZXItPmluZm9QdHIoKSkgIT0gUE5HX0lOVEVSTEFDRV9OT05FKQogICAg ICAgICAgICAgbV9yZWFkZXItPmNyZWF0ZUludGVybGFjZUJ1ZmZlcigobV9yZWFkZXItPmhhc0Fs cGhhKCkgPyA0IDogMykgKiBzaXplKCkud2lkdGgoKSAqIHNpemUoKS5oZWlnaHQoKSk7CiAgICAg fQogCg==