103079 2012-11-22 09:33:58 -0800 [EFL][WK2] MiniBrowser rendering should not get blurry when scrolled down with different scale values 2012-11-28 05:10:47 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103105 1 webkit.review.bot kenneth d-r gyuyoung.kim jesus joone kalyan.kondapally kenneth laszlo.gombos lauro.neto mikhail.pozdnyakov noam ostap73 rafael.lobo rakuco tmpsantos yael oldest_to_newest 774006 0 webkit.review.bot 2012-11-22 09:33:58 -0800 [EFL][WK2] MiniBrowser rendering gets blurry when scroll down with scale != 1.0 Requested by rafaelbrandao on #webkit. 774008 1 rafael.lobo 2012-11-22 09:35:42 -0800 How to reproduce: 1. Run MiniBrowser on http://uol.com.br (or any other site that forces scale to be different than 1.0) 2. Observe the font rendered with this initial state. 3. Scroll down with mouse wheel once. 4. Now compare the font rendered with the previous state. There are differences. 774012 2 kenneth 2012-11-22 09:40:33 -0800 I can confirm this scrolling with the wheel. I also notice that at specific steps (say every 5 steps on google.com searching for 'hest') the text becomes clear again. 775519 3 rafael.lobo 2012-11-26 08:41:50 -0800 I've found out so far that rendering the debugging lines (when using WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS=1) does not get blurry, while the repaint counter does (the rectangle and the number on it). Does this ring any bell? I'm still trying to understand how rendering works. 776230 4 kalyan.kondapally 2012-11-26 19:49:57 -0800 (In reply to comment #3) > I've found out so far that rendering the debugging lines (when using WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS=1) does not get blurry, while the repaint counter does (the rectangle and the number on it). Does this ring any bell? I'm still trying to understand how rendering works. Difference between two: Debugging lines: Debugging lines being drawn are nothing but quads with a line width and particular color drawn using shaders. In case of repaintcounter: We use an intermediate surface(cairo_image_surface) to draw the contents of repaint counter. The contents of surface are than copied into a texture. 776679 5 kenneth 2012-11-27 05:59:33 -0800 Description is wrong, it works fine with scale 0.5, 0.75, 0.80, and event 0.85, but a scale such as 0.86 triggers it though 776683 6 kenneth 2012-11-27 06:05:01 -0800 With scale 0.86 y pos 0 is sharp and so it y pos 200 and 400 (didn't test 300) - same with scale 0.81. But with scale 0.816327 it is sharp at 0, 120, 240, 360 776695 7 rafael.lobo 2012-11-27 06:16:49 -0800 (In reply to comment #6) > With scale 0.86 y pos 0 is sharp and so it y pos 200 and 400 (didn't test 300) - same with scale 0.81. > > But with scale 0.816327 it is sharp at 0, 120, 240, 360 Hm, *that* is interesting. :-) 776696 8 176253 kenneth 2012-11-27 06:16:50 -0800 Created attachment 176253 Test case 776704 9 kenneth 2012-11-27 06:31:22 -0800 im wrong, changed scroll step to 1. 0.35: 0 looks fine, then 1 (off like 2 pixels), 2 (off like 1 pixel), 3 (perfect), etc. 0.816327: 0 perfect 1 worse 2 worse 3 worse 4 better 5 better 6 perfect ... 11 perfect It looks like the same font is being painted on top with an offset 776706 10 kenneth 2012-11-27 06:32:49 -0800 At 0.90 every 10 steps are fine. 776707 11 kenneth 2012-11-27 06:34:04 -0800 Trick to scroll per 1 pixel, modify Source/WebKit2/Shared/efl/WebEventFactory.cpp 158 deltaX *= 1; //static_cast<float>(Scrollbar::pixelsPerLineStep()); 159 deltaY *= 1; //static_cast<float>(Scrollbar::pixelsPerLineStep()); 776730 12 kenneth 2012-11-27 07:26:36 -0800 It should be noted that while scrolling the tiles are not updated, so this is not a font issue AFAIK 776757 13 kenneth 2012-11-27 08:10:26 -0800 This seems to be from the fact that we send wheel events to the web process, it sends back css positions, which doesn't align to device pixels positions. Ie. we are told to move 10 css pixels but move 8.12339 instead with a scale of 0.812339. Instead of storing css scroll position, we should store the page position, as we also want the user to pan page in device units in the near future. 777052 14 rafael.lobo 2012-11-27 11:51:37 -0800 I will need to work on something else right now, Kenneth is almost there on this bug so please take it! :-) 777715 15 176449 kenneth 2012-11-28 03:54:14 -0800 Created attachment 176449 Patch 777773 16 kenneth 2012-11-28 05:10:47 -0800 Landed in 136000 176253 2012-11-27 06:16:50 -0800 2012-11-27 06:16:50 -0800 Test case test.html text/html 6898 kenneth PG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9Im1heGltdW0tc2NhbGU9MC4zNSI+CjxzdHls ZT4KICAgIGJvZHkgewogICAgICAgIGZvbnQtc2l6ZTogNTBweDsKICAgIH0KCjwvc3R5bGU+Cjxi b2R5PgogICAgTG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2Np bmcgZWxpdC4gTWF1cmlzIHRpbmNpZHVudCBpbXBlcmRpZXQgZmFjaWxpc2lzLiBBZW5lYW4gaW50 ZXJkdW0sIGxvcmVtIG5vbiBwbGFjZXJhdCBwcmV0aXVtLCBudWxsYSBpcHN1bSBjb25ndWUganVz dG8sIHF1aXMgZ3JhdmlkYSB0b3J0b3IgbWF1cmlzIGV1IG5pYmguIER1aXMgZXJhdCBmZWxpcywg dmVzdGlidWx1bSBhYyBmYXVjaWJ1cyBzZWQsIGRpY3R1bSBhYyBqdXN0by4gUGVsbGVudGVzcXVl IHRlbXBvciwgbWV0dXMgYSBjb25zZWN0ZXR1ciB2dWxwdXRhdGUsIGp1c3RvIG1hc3NhIGFsaXF1 YW0gbWksIGV0IGJsYW5kaXQgbGlndWxhIHB1cnVzIHNlZCBuaWJoLiBWZXN0aWJ1bHVtIGV0IGxp Z3VsYSBuaXNsLiBQZWxsZW50ZXNxdWUgYmxhbmRpdCB2ZW5lbmF0aXMgYWNjdW1zYW4uIEN1cmFi aXR1ciBzYWdpdHRpcywgdG9ydG9yIGV0IGRhcGlidXMgbW9sZXN0aWUsIHJpc3VzIGVzdCBwdWx2 aW5hciBuZXF1ZSwgdXQgY29uc2VxdWF0IGxpYmVybyBtYXNzYSBhIGFyY3UuIEN1cmFiaXR1ciBh bGlxdWV0LCBvZGlvIGlkIG1hbGVzdWFkYSB2b2x1dHBhdCwgbG9yZW0ganVzdG8gY29tbW9kbyBu ZXF1ZSwgbmVjIG9ybmFyZSBpcHN1bSB0dXJwaXMgdXQgbWFzc2EuIFZlc3RpYnVsdW0gbmlzaSBl cmF0LCBkaWN0dW0gaW4gYWNjdW1zYW4gZXUsIGVsZWlmZW5kIG5vbiBkb2xvci4gQWVuZWFuIHBy ZXRpdW0gbmliaCBub24gbGliZXJvIHNvbGxpY2l0dWRpbiBzZWQgYWxpcXVhbSBlcmF0IGNvbnNl cXVhdC4gQWVuZWFuIHZlbmVuYXRpcyBtb2xlc3RpZSBkaWduaXNzaW0uIEFlbmVhbiBsYWN1cyBy aXN1cywgYXVjdG9yIHF1aXMgaW50ZXJkdW0gaW4sIGludGVyZHVtIGF0IGVsaXQuCgogICAgUHJh ZXNlbnQgdXQgbG9yZW0gbGlndWxhLiBEb25lYyBsdWN0dXMgcHJldGl1bSBsYWN1cywgc2l0IGFt ZXQgdWxsYW1jb3JwZXIgdXJuYSBmYWNpbGlzaXMgaW4uIFV0IG1vbGVzdGllIG1hbGVzdWFkYSB2 b2x1dHBhdC4gUXVpc3F1ZSBub24gbmliaCBzaXQgYW1ldCBudW5jIGxhY2luaWEgc2VtcGVyIHNp dCBhbWV0IGV1IGVuaW0uIE1hZWNlbmFzIGFkaXBpc2NpbmcgZGFwaWJ1cyBlcm9zLCBub24gZWxl bWVudHVtIGVsaXQgc2FnaXR0aXMgc2VkLiBOdWxsYW0gc2l0IGFtZXQgbGlndWxhIGF1Z3VlLCBh dCB0ZW1wb3IgYXVndWUuIEN1cmFiaXR1ciB2ZWwgbGliZXJvIGVsaXQsIGV1IGNvbnZhbGxpcyBl bGl0LiBDcmFzIGlkIGxlY3R1cyBxdWFtLCBhYyBjb25ndWUgYXJjdS4gQ3VyYWJpdHVyIGV1IG1h Z25hIGxvcmVtLCBldCBjb252YWxsaXMgdHVycGlzLiBTZWQgYSBuaXNpIGxpYmVyby4gTnVsbGEg ZWxpdCByaXN1cywgY29uZGltZW50dW0gdml0YWUgcmhvbmN1cyBhdCwgbWFsZXN1YWRhIHZpdGFl IG1hdXJpcy4gVXQganVzdG8gbmlzaSwgbW9sbGlzIHZlbCBncmF2aWRhIHNlZCwgcHVsdmluYXIg YXQgYXVndWUuIFNlZCBlZ2VzdGFzIGZhY2lsaXNpcyBxdWFtLCBxdWlzIGludGVyZHVtIHVybmEg YWxpcXVhbSBuZWMuIFByYWVzZW50IHRyaXN0aXF1ZSB2ZW5lbmF0aXMgdGVsbHVzLCBhIG1hbGVz dWFkYSBtYXNzYSB2b2x1dHBhdCBhdC4gRG9uZWMgZWdldCBkaWFtIG51bGxhLgoKICAgIFZlc3Rp YnVsdW0gYW50ZSBpcHN1bSBwcmltaXMgaW4gZmF1Y2lidXMgb3JjaSBsdWN0dXMgZXQgdWx0cmlj ZXMgcG9zdWVyZSBjdWJpbGlhIEN1cmFlOyBQZWxsZW50ZXNxdWUgcG9ydHRpdG9yIGxhY3VzIHNl ZCBxdWFtIHByZXRpdW0gcHVsdmluYXIuIEludGVnZXIgbWFsZXN1YWRhIGFyY3UgZXUgbGVvIGdy YXZpZGEgdXQgdWxsYW1jb3JwZXIgdXJuYSBzYWdpdHRpcy4gSW50ZWdlciB0cmlzdGlxdWUsIHF1 YW0gYXQgc2VtcGVyIGNvbmd1ZSwgb3JjaSB2ZWxpdCBlbGVtZW50dW0gYW50ZSwgZXUgYWxpcXVh bSBzZW0gc2VtIGluIGxlby4gUHJhZXNlbnQgc3VzY2lwaXQgdWxsYW1jb3JwZXIgcmlzdXMsIG5l YyB0aW5jaWR1bnQgZXJhdCBjb25ndWUgaW4uIENyYXMgbmlzaSB0dXJwaXMsIHNhZ2l0dGlzIG5l YyBkaWduaXNzaW0gYWMsIHB1bHZpbmFyIHV0IGVzdC4gTnVuYyBpZCB2ZXN0aWJ1bHVtIGFyY3Uu IFByb2luIGEgdXJuYSBpbiBtYXVyaXMgbGFvcmVldCBoZW5kcmVyaXQuIENyYXMgZmF1Y2lidXMs IGxvcmVtIGFjIGFsaXF1ZXQgYWRpcGlzY2luZywgbnVsbGEgbnVsbGEgZXVpc21vZCBtZXR1cywg bm9uIG1hdHRpcyBhcmN1IG5pc2kgaWQgcmlzdXMuIE51bGxhbSBhdCBsYW9yZWV0IGVsaXQuCgog ICAgVXQgZGljdHVtIHJob25jdXMgYmxhbmRpdC4gVXQgaWQgZXJvcyB0dXJwaXMsIHZpdGFlIHZv bHV0cGF0IG51bGxhLiBQcmFlc2VudCBzb2RhbGVzIG1hdHRpcyBoZW5kcmVyaXQuIERvbmVjIHNp dCBhbWV0IHRlbGx1cyBhdWd1ZS4gTnVsbGEgcG9ydGEgdmVsaXQgc2VkIHJpc3VzIG9ybmFyZSBh YyBtYWxlc3VhZGEgbGVvIGx1Y3R1cy4gTG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNl Y3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gQ3VyYWJpdHVyIHZlbCBkdWkgYXJjdS4gQWxpcXVhbSBu ZWMgcmlzdXMgbGliZXJvLCBuZWMgZGlnbmlzc2ltIGZlbGlzLiBNYWVjZW5hcyBkdWkgbmVxdWUs IHVsdHJpY2llcyBhdCBvcm5hcmUgZXQsIG1hdHRpcyBhdCBtYWduYS4gRG9uZWMgZXUgZWxpdCBz aXQgYW1ldCBtYXVyaXMgZXVpc21vZCBpbnRlcmR1bSBxdWlzIGFjIHRvcnRvci4gU3VzcGVuZGlz c2UgcG90ZW50aS4gTnVsbGEgZXUgbWF1cmlzIG1hZ25hLgoKICAgIEZ1c2NlIGFjIG51bmMgbWFn bmEsIGZhY2lsaXNpcyBzZW1wZXIgbWkuIER1aXMgc2VtcGVyIGlhY3VsaXMgbWV0dXMsIHNpdCBh bWV0IGF1Y3RvciBudW5jIHBvcnRhIGNvbmRpbWVudHVtLiBQcmFlc2VudCBzZWQgcmlzdXMgZWxp dC4gSW4gbGFjdXMgZW5pbSwgZnJpbmdpbGxhIHNlZCB0cmlzdGlxdWUgdnVscHV0YXRlLCBjb25k aW1lbnR1bSBxdWlzIGxpYmVyby4gRXRpYW0gbGlndWxhIHZlbGl0LCBhdWN0b3IgbmVjIHNvZGFs ZXMgaW4sIGRpY3R1bSBhIHZlbGl0LiBDcmFzIHZlbCBsZW8gc2l0IGFtZXQgbWF1cmlzIGdyYXZp ZGEgZWxlaWZlbmQgdGVtcHVzIGFjIHR1cnBpcy4gVmVzdGlidWx1bSBlZ2V0IGlwc3VtIHNlZCB0 dXJwaXMgYXVjdG9yIGdyYXZpZGEuIE1hdXJpcyBpbnRlcmR1bSBjdXJzdXMgbmVxdWUuIFZlc3Rp YnVsdW0gYW50ZSBpcHN1bSBwcmltaXMgaW4gZmF1Y2lidXMgb3JjaSBsdWN0dXMgZXQgdWx0cmlj ZXMgcG9zdWVyZSBjdWJpbGlhIEN1cmFlOyBEdWlzIHF1aXMgdmVsaXQgdmVsIHNlbSB0ZW1wb3Ig cmhvbmN1cy4gUGhhc2VsbHVzIGNvbW1vZG8gYWNjdW1zYW4gbWF1cmlzLCBhIHZlbmVuYXRpcyBw dXJ1cyB2b2x1dHBhdCBlZ2V0LgoKICAgIER1aXMgaGVuZHJlcml0LCBhdWd1ZSBzaXQgYW1ldCBp bXBlcmRpZXQgdm9sdXRwYXQsIHF1YW0gdGVsbHVzIGNvbmRpbWVudHVtIGVyb3MsIG5vbiBjb25z ZXF1YXQgbmlzbCBuaXNpIHZpdGFlIGVsaXQuIEN1cmFiaXR1ciBldCBwdXJ1cyBmZWxpcywgdml0 YWUgZWxlaWZlbmQgbmlzbC4gUGhhc2VsbHVzIHZlc3RpYnVsdW0gbW9sbGlzIG1ldHVzLCBuZWMg aW1wZXJkaWV0IHR1cnBpcyBzb2RhbGVzIGF0LiBQZWxsZW50ZXNxdWUgdmVsIGNvbnNlY3RldHVy IGRpYW0uIEV0aWFtIGF1Y3RvciBpYWN1bGlzIG5pYmggYWMgb3JuYXJlLiBQZWxsZW50ZXNxdWUg ZXUgZG9sb3IgbmVjIHZlbGl0IGV1aXNtb2QgZnJpbmdpbGxhLiBRdWlzcXVlIHNjZWxlcmlzcXVl LCBlcmF0IGVnZXQgc29sbGljaXR1ZGluIHBoYXJldHJhLCBsb3JlbSBsZWN0dXMgdGVtcG9yIG1p LCBuZWMgc2NlbGVyaXNxdWUgdXJuYSBkdWkgaWQgbGVjdHVzLgoKICAgIE5hbSBwcmV0aXVtIGZy aW5naWxsYSBtYXVyaXMgZWdldCByaG9uY3VzLiBTdXNwZW5kaXNzZSBkaWFtIHJpc3VzLCByaG9u Y3VzIGlkIG1vbGxpcyBkaWN0dW0sIGVsZW1lbnR1bSB1dCBlcmF0LiBBbGlxdWFtIGVyYXQgdm9s dXRwYXQuIEludGVnZXIgbmVjIHNhcGllbiBuaXNsLiBBbGlxdWFtIGx1Y3R1cyBlcmF0IGEgbmli aCBibGFuZGl0IGZyaW5naWxsYSB1dCByaG9uY3VzIG51bGxhLiBJbnRlZ2VyIG5vbiBsZWN0dXMg ZGlhbSwgZWdlc3RhcyBhdWN0b3IgZGlhbS4gTnVuYyBhZGlwaXNjaW5nIGVsZWlmZW5kIHRpbmNp ZHVudC4gRXRpYW0gb3JuYXJlIHR1cnBpcyBpZCBvcmNpIHBoYXJldHJhIGxhb3JlZXQuIFN1c3Bl bmRpc3NlIHBvdGVudGkuIEFlbmVhbiBwbGFjZXJhdCBkYXBpYnVzIHR1cnBpcyB2ZWwgZ3Jhdmlk YS4KCiAgICBQZWxsZW50ZXNxdWUgbWF1cmlzIHB1cnVzLCB2ZXN0aWJ1bHVtIGF0IGltcGVyZGll dCB2ZWwsIHNhZ2l0dGlzIHZlbCBkdWkuIE1hdXJpcyBvcm5hcmUgbmliaCBzYWdpdHRpcyBvZGlv IG1vbGxpcyBydXRydW0gbmVjIGFjIGVsaXQuIEludGVnZXIgbG9ib3J0aXMgZmVybWVudHVtIHBv cnRhLiBJbnRlZ2VyIGZldWdpYXQgdXJuYSBub24gZWxpdCBwb3J0YSBoZW5kcmVyaXQuIFN1c3Bl bmRpc3NlIG5pYmggbmVxdWUsIG1vbGxpcyB2aXRhZSBzb2RhbGVzIHZlbCwgdWx0cmljaWVzIGVn ZXQgZG9sb3IuIERvbmVjIGF0IG1ldHVzIGluIGFudGUgYWRpcGlzY2luZyB1bGxhbWNvcnBlciBl dCBzZWQgcHVydXMuIE51bmMgYXQgbWFzc2EgdG9ydG9yLiBOdWxsYSBhIHB1cnVzIG5vbiBzZW0g ZWxlbWVudHVtIGJpYmVuZHVtIHF1aXMgZnJpbmdpbGxhIGVyb3MuIEN1cmFiaXR1ciBwb3N1ZXJl IHNvZGFsZXMgYXJjdSwgYXQgY3Vyc3VzIG51bGxhIGxhY2luaWEgaW4uIEFsaXF1YW0gZXJhdCB2 b2x1dHBhdC4gU2VkIGV1IGZlbGlzIG5lYyBtYWduYSB0aW5jaWR1bnQgaWFjdWxpcy4gUHJvaW4g YXJjdSBuaXNpLCBwbGFjZXJhdCBhIHBvcnR0aXRvciB2ZWwsIHBsYWNlcmF0IGV0IGlwc3VtLiBB ZW5lYW4gdWxsYW1jb3JwZXIgbGVvIGV1IG51bmMgZGFwaWJ1cyBpZCBjb25kaW1lbnR1bSBzYXBp ZW4gY29uc2VjdGV0dXIuIE51bGxhIHV0IHB1cnVzIGFudGUsIGluIG1vbGxpcyBtZXR1cy4KCiAg ICBOdW5jIGluIG5pYmggdmVsaXQuIFZpdmFtdXMgdWx0cmljZXMgdm9sdXRwYXQgdHVycGlzIGlu IGF1Y3Rvci4gU3VzcGVuZGlzc2UgaW1wZXJkaWV0LCB0dXJwaXMgdml0YWUgYXVjdG9yIGNvbnNl Y3RldHVyLCBqdXN0byBvZGlvIGJsYW5kaXQgYXVndWUsIG5lYyBzZW1wZXIgbWV0dXMgbmlzbCBh dCBuaXNsLiBTZWQgdWx0cmljaWVzLCBsYWN1cyB0ZW1wb3IgdWx0cmljaWVzIHBoYXJldHJhLCBh bnRlIG9yY2kgbG9ib3J0aXMgdmVsaXQsIGV1IGVsZW1lbnR1bSBtYWduYSBmZWxpcyBldCBuZXF1 ZS4gTnVsbGEgdmVoaWN1bGEgc2FwaWVuIGFjIHZlbGl0IHByZXRpdW0gcGxhY2VyYXQgdWx0cmlj ZXMgZXN0IGZlcm1lbnR1bS4gVml2YW11cyBwdXJ1cyBsaWd1bGEsIHZvbHV0cGF0IHF1aXMgYWRp cGlzY2luZyBzZWQsIHNvZGFsZXMgcXVpcyBmZWxpcy4gUGVsbGVudGVzcXVlIGZldWdpYXQgaW50 ZXJkdW0gbWFzc2Egbm9uIGVsZW1lbnR1bS4gQWVuZWFuIHZpdmVycmEgc2NlbGVyaXNxdWUgZGln bmlzc2ltLiBQcmFlc2VudCBuZWMgbGVjdHVzIHNhZ2l0dGlzIGxlbyBwaGFyZXRyYSB0aW5jaWR1 bnQuIFByb2luIHZhcml1cywganVzdG8gdGVtcHVzIHBlbGxlbnRlc3F1ZSBjb25kaW1lbnR1bSwg bWF1cmlzIHRvcnRvciBjdXJzdXMgbGliZXJvLCBxdWlzIG1hbGVzdWFkYSBhbnRlIGRpYW0gYWMg bGFjdXMuIEFsaXF1YW0gc29sbGljaXR1ZGluIHBvcnR0aXRvciBsZWN0dXMsIGluIG1vbGVzdGll IG9yY2kgY3Vyc3VzIHNlZC4gQ3JhcyBhIGF1Z3VlIGF1Z3VlLCBzZWQgdmVoaWN1bGEgZXN0LiBB bGlxdWFtIHV0IGRpY3R1bSBtYWduYS4gQ3JhcyB1cm5hIGlwc3VtLCBtb2xsaXMgaW4gcGxhY2Vy YXQgc29kYWxlcywgdmVzdGlidWx1bSB2aXRhZSBuaXNsLiBOdWxsYSB2aXRhZSBjb25zZWN0ZXR1 ciBsZW8uCgogICAgTnVsbGFtIGxvYm9ydGlzIGlwc3VtIGlkIHJpc3VzIG1hdHRpcyBldCBwcmV0 aXVtIHF1YW0gY29tbW9kby4gTmFtIHZhcml1cyBjb25zZWN0ZXR1ciBuZXF1ZSBub24gbG9ib3J0 aXMuIEFlbmVhbiBub24gbGlndWxhIGVyYXQuIEFsaXF1YW0gZXJhdCB2b2x1dHBhdC4gUXVpc3F1 ZSB2ZWwgdGVtcG9yIGRvbG9yLiBGdXNjZSBhdWN0b3IgcG9ydGEgbGVjdHVzLCBhIHVsdHJpY2Vz IHF1YW0gZnJpbmdpbGxhIHNlZC4gTW9yYmkgdWx0cmljaWVzIGJpYmVuZHVtIGxhY2luaWEuIElu IGFjIGNvbW1vZG8gbGliZXJvLiBVdCBqdXN0byBsb3JlbSwgYWNjdW1zYW4gZXUgY29uc2VjdGV0 dXIgdml0YWUsIGNvbmd1ZSBldSBudW5jLiBNYXVyaXMgdGVtcHVzLCBudWxsYSBsdWN0dXMgdm9s dXRwYXQgcHVsdmluYXIsIG9yY2kgc2VtIGZlcm1lbnR1bSBsb3JlbSwgYmliZW5kdW0gbHVjdHVz IGF1Z3VlIGxpZ3VsYSBzaXQgYW1ldCBudWxsYS4gUXVpc3F1ZSBldCBncmF2aWRhIG9yY2kuIERv bmVjIG5lYyBsb3JlbSB2ZWwgaXBzdW0gbWF0dGlzIHByZXRpdW0gbmVjIGEgdmVsaXQuIFZlc3Rp YnVsdW0gYW50ZSBpcHN1bSBwcmltaXMgaW4gZmF1Y2lidXMgb3JjaSBsdWN0dXMgZXQgdWx0cmlj ZXMgcG9zdWVyZSBjdWJpbGlhIEN1cmFlOyBQZWxsZW50ZXNxdWUgb3JuYXJlIHN1c2NpcGl0IGxv cmVtLCBlZ2V0IGNvbnZhbGxpcyBuaXNpIGltcGVyZGlldCBub24uIFBoYXNlbGx1cyBldCBuaXNs IHB1cnVzLCBzaXQgYW1ldCBwaGFyZXRyYSByaXN1cy4gTnVsbGFtIHBlbGxlbnRlc3F1ZSBmZXJt ZW50dW0gbnVsbGEsIGV0IGJpYmVuZHVtIGF1Z3VlIGZhY2lsaXNpcyBlZ2VzdGFzLgo8L2JvZHk+ Cg== 176449 2012-11-28 03:54:14 -0800 2012-11-28 04:57:49 -0800 Patch bug-103079-20121128125147.patch text/plain 10575 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1ODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGY4MTI0ZjdjZjQ4ZjVi Y2Q2NDI1NWRkMTdmOTE1YjYwOTBjNmIxOS4uYzgwZTBhOGRjZGY1YTBmNzQxMzhjMDc3NTc1N2Q2 MzdhMTkyOTcxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTExLTI4ICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb RUZMXVtXSzJdIE1pbmlCcm93c2VyIHJlbmRlcmluZyBzaG91bGQgbm90IGdldCBibHVycnkgd2hl biBzY3JvbGxlZCBkb3duIHdpdGggZGlmZmVyZW50IHNjYWxlIHZhbHVlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMDc5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHByb2JsZW0gd2FzIGNhdXNl ZCBiZWNhdXNlIHdlIG1vdmVkIHRoZSBwYWdlIGluc2lkZSBvdXIgdmlld3BvcnQKKyAgICAgICAg aW4gbm9uLWRpc2NyZXRlIHVuaXRzLgorCisgICAgICAgIE5vdyBpbnN0ZWFkIG9mIGNoYW5naW5n IHRoZSBjb250ZW50IHZpc2libGUgaW4gb3VyIHZpZXdwb3J0IGJ5CisgICAgICAgIGFwcGx5aW5n IHNjYWxlLCBhbmQgdGhlbiB0cmFuc2Zvcm1pbmcgdGhlIENTUyBvZmZzZXQsIHdlIG5vdyBmaXJz dAorICAgICAgICBkaXNjcmV0ZWx5IHBvc2l0aW9uIHRoZSBwYWdlIGluIFVJIGNvb3JkaW5hdGVz LgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyByZW1vdmVzIHNvbWUgZGVhZCBjb2RlLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwOgorICAgICAgICAoRXdr Vmlld0ltcGw6OnRyYW5zZm9ybUZyb21TY2VuZSk6CisgICAgICAgIChFd2tWaWV3SW1wbDo6ZGlz cGxheVRpbWVyRmlyZWQpOgorCisgICAgICAgICAgIFRyYW5zZm9ybSBhY2NvcmRpbmcgdG8gdGhl IHBhZ2UgcG9zaXRpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5oOgorICAgICAgICAoRXdrVmlld0ltcGw6OnNldFBhZ2VQb3NpdGlvbik6IE5vdyBzdG9yZXMg YSBmbG9hdC4KKyAgICAgICAgKEV3a1ZpZXdJbXBsOjpkaXNjcmV0ZVBhZ2VQb3NpdGlvbik6IFJl dHVybnMgdGhlIGRpc2NyZXRlIHBhZ2UgcG9zaXRpb24uCisgICAgICAgIChFd2tWaWV3SW1wbCk6 CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9QYWdlQ2xpZW50TGVnYWN5SW1wbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRMZWdhY3lJbXBsOjp1cGRhdGVWaWV3cG9ydFNpemUpOgor ICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50TGVnYWN5SW1wbDo6cGFnZURpZFJlcXVlc3RTY3Jv bGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVu dEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRF Zmw6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwpOgorICAgICAgICAoV2ViS2l0OjpQ YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBvc2l0aW9uKTogQ29u dmVydCB0byBwYWdlIHBvc2l0aW9uLgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsOjpzZXRDb250ZW50c1NjYWxlKToKKyAgICAgICAgKFdlYktpdDo6UGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6ZGlkUmVzdW1lQ29udGVudCk6CisgICAgICAg ICogVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmg6CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnNjYWxlRmFjdG9y KTogVXNlIHRoZSB2YWx1ZQorICAgICAgICBmcm9tIHRoZSB2aWV3IGRpcmVjdGx5LgorICAgICAg ICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpjb250ZW50UG9zaXRp b24pOgorICAgICAgICAoUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCk6CisKIDIwMTIt MTEtMjcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAg W1gxMV0gQWxsb3cgZW1wdHkgcGx1Z2luIG5hbWUgYW5kIGRlc2NyaXB0aW9uIGR1cmluZyBzY2Fu IHBsdWdpbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdr Vmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0lt cGwuY3BwCmluZGV4IDI5MTYxZmYyM2IxZDY1MzE0NTBkM2Y2Y2I0NjQwMGNhOGYxOGQzNTQuLmQ5 OWM1N2JhY2YyMzFlOTAxMzI4M2NjNTNmNDNjZmUxMmQzNGJmOTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKQEAgLTI4OCw4ICsyODgs OCBAQCBBZmZpbmVUcmFuc2Zvcm0gRXdrVmlld0ltcGw6OnRyYW5zZm9ybUZyb21TY2VuZSgpIGNv bnN0CiAgICAgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybTsKIAogI2lmIFVTRShUSUxFRF9CQUNL SU5HX1NUT1JFKQotICAgIHRyYW5zZm9ybS50cmFuc2xhdGUobV9zY3JvbGxQb3NpdGlvbi54KCks IG1fc2Nyb2xsUG9zaXRpb24ueSgpKTsKICAgICB0cmFuc2Zvcm0uc2NhbGUoMSAvIG1fc2NhbGVG YWN0b3IpOworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUoZGlzY3JldGVQYWdlUG9zaXRpb24oKS54 KCksIGRpc2NyZXRlUGFnZVBvc2l0aW9uKCkueSgpKTsKICNlbmRpZgogCiAgICAgRXdrX1ZpZXdf U21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKQEAgLTM4MCw4ICszODAsOCBAQCB2b2lkIEV3 a1ZpZXdJbXBsOjpkaXNwbGF5VGltZXJGaXJlZChUaW1lcjxFd2tWaWV3SW1wbD4qKQogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIFJlZlB0cjxjYWlyb190PiBncmFwaGljc0NvbnRleHQg PSBhZG9wdFJlZihjYWlyb19jcmVhdGUoc3VyZmFjZS5nZXQoKSkpOworICAgICAgICBjYWlyb190 cmFuc2xhdGUoZ3JhcGhpY3NDb250ZXh0LmdldCgpLCAtIGRpc2NyZXRlUGFnZVBvc2l0aW9uKCku eCgpLCAtIGRpc2NyZXRlUGFnZVBvc2l0aW9uKCkueSgpKTsKICAgICAgICAgY2Fpcm9fc2NhbGUo Z3JhcGhpY3NDb250ZXh0LmdldCgpLCBtX3NjYWxlRmFjdG9yLCBtX3NjYWxlRmFjdG9yKTsKLSAg ICAgICAgY2Fpcm9fdHJhbnNsYXRlKGdyYXBoaWNzQ29udGV4dC5nZXQoKSwgLW1fc2Nyb2xsUG9z aXRpb24ueCgpLCAtbV9zY3JvbGxQb3NpdGlvbi55KCkpOwogICAgICAgICByZW5kZXJlci0+cGFp bnRUb0dyYXBoaWNzQ29udGV4dChncmFwaGljc0NvbnRleHQuZ2V0KCkpOwogICAgICAgICBldmFz X29iamVjdF9pbWFnZV9kYXRhX3VwZGF0ZV9hZGQoc2QtPmltYWdlLCAwLCAwLCB2aWV3cG9ydC53 aWR0aCgpLCB2aWV3cG9ydC5oZWlnaHQoKSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKaW5kZXggMzc5YjU3ZWJlMGZhZGUyMWIwM2I3 M2ZmY2FmNjI5NWIyZjMyM2JiYS4uN2MzYTZmNzZhOTk0YzU5MGYyZjA5ZmZmMjliNDM5YjFjMTcz Y2ZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmll d0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiV0tHZW9tZXRyeS5oIgogI2luY2x1ZGUg IldLUmV0YWluUHRyLmgiCiAjaW5jbHVkZSA8RXZhcy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRmxv YXRQb2ludC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgogI2luY2x1ZGUgPFdlYkNv cmUvVGV4dERpcmVjdGlvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVGltZXIuaD4KQEAgLTIwMCw4 ICsyMDEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRTY2FsZUZhY3RvcihmbG9hdCBzY2FsZUZh Y3RvcikgeyBtX3NjYWxlRmFjdG9yID0gc2NhbGVGYWN0b3I7IH0KICAgICBmbG9hdCBzY2FsZUZh Y3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fc2NhbGVGYWN0b3I7IH0KIAotICAgIHZvaWQgc2V0U2Ny b2xsUG9zaXRpb24oV2ViQ29yZTo6SW50UG9pbnQgcG9zaXRpb24pIHsgbV9zY3JvbGxQb3NpdGlv biA9IHBvc2l0aW9uOyB9Ci0gICAgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQgc2Nyb2xsUG9zaXRp b24oKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbFBvc2l0aW9uOyB9CisgICAgdm9pZCBzZXRQYWdl UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgcG9zaXRpb24pIHsgbV9wYWdlUG9z aXRpb24gPSBwb3NpdGlvbjsgfQorICAgIGNvbnN0IFdlYkNvcmU6OkludFBvaW50IGRpc2NyZXRl UGFnZVBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gcm91bmRlZEludFBvaW50KG1fcGFnZVBvc2l0 aW9uKTsgfQogI2VuZGlmCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIEV2 YXNfR0wqIGV2YXNHTCgpIHsgcmV0dXJuIG1fZXZhc0dMLmdldCgpOyB9CkBAIC0yNTksNyArMjYw LDcgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8RXdrQmFja0ZvcndhcmRMaXN0PiBtX2JhY2tGb3J3 YXJkTGlzdDsKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICBmbG9hdCBtX3NjYWxl RmFjdG9yOwotICAgIFdlYkNvcmU6OkludFBvaW50IG1fc2Nyb2xsUG9zaXRpb247CisgICAgV2Vi Q29yZTo6RmxvYXRQb2ludCBtX3BhZ2VQb3NpdGlvbjsKICNlbmRpZgogICAgIE93blB0cjxFd2tT ZXR0aW5ncz4gbV9zZXR0aW5nczsKICAgICBSZWZQdHI8RXdrV2luZG93RmVhdHVyZXM+IG1fd2lu ZG93RmVhdHVyZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Bh Z2VDbGllbnRMZWdhY3lJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFn ZUNsaWVudExlZ2FjeUltcGwuY3BwCmluZGV4IDZmMzA1YmRkNjMwNzAzYTE5ZWZkYTYzYTZhNTgz MWNmYzdhMTdkZGUuLmY2MmI4NjcxYTkzMDg4MjY4YjlkYWVkNDk4M2E1NDNjMGFjMTZlMzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZUNsaWVudExlZ2FjeUlt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZUNsaWVudExlZ2Fj eUltcGwuY3BwCkBAIC00OSw3ICs0OSw3IEBAIHZvaWQgUGFnZUNsaWVudExlZ2FjeUltcGw6OmRp ZENvbW1pdExvYWQoKQogdm9pZCBQYWdlQ2xpZW50TGVnYWN5SW1wbDo6dXBkYXRlVmlld3BvcnRT aXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNpemUpCiB7CiAjaWYgVVNFKFRJTEVEX0JBQ0tJ TkdfU1RPUkUpCi0gICAgbV92aWV3SW1wbC0+cGFnZSgpLT5kcmF3aW5nQXJlYSgpLT5zZXRWaXNp YmxlQ29udGVudHNSZWN0KEludFJlY3QobV92aWV3SW1wbC0+c2Nyb2xsUG9zaXRpb24oKSwgc2l6 ZSksIG1fdmlld0ltcGwtPnNjYWxlRmFjdG9yKCksIEZsb2F0UG9pbnQoKSk7CisgICAgbV92aWV3 SW1wbC0+cGFnZSgpLT5kcmF3aW5nQXJlYSgpLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KEludFJl Y3QobV92aWV3SW1wbC0+ZGlzY3JldGVQYWdlUG9zaXRpb24oKSwgc2l6ZSksIG1fdmlld0ltcGwt PnNjYWxlRmFjdG9yKCksIEZsb2F0UG9pbnQoKSk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShz aXplKTsKICNlbmRpZgpAQCAtODYsNyArODYsNyBAQCB2b2lkIFBhZ2VDbGllbnRMZWdhY3lJbXBs OjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSkKICNp ZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKIHZvaWQgUGFnZUNsaWVudExlZ2FjeUltcGw6OnBh Z2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IEludFBvaW50JiBwb3NpdGlvbikKIHsKLSAgICBtX3Zp ZXdJbXBsLT5zZXRTY3JvbGxQb3NpdGlvbihwb3NpdGlvbik7CisgICAgbV92aWV3SW1wbC0+c2V0 UGFnZVBvc2l0aW9uKEZsb2F0UG9pbnQocG9zaXRpb24pKTsKICAgICBtX3ZpZXdJbXBsLT51cGRh dGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAKaW5kZXggY2RkNTY1MDA4 NWY5MjgxOTg5MjBhOThjYzZjMzM1ZWY5MjIwYjFjMC4uZmUyOTEzOTY5MzZiMjU3Nzc5NzU5NjM4 N2M1Y2I2NmZkOWFlMGRjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Vm bC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCkBAIC00 MCw3ICs0MCw2IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBQYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50RWZsOjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsKEV3a1ZpZXdJbXBsKiB2 aWV3SW1wbCkKICAgICA6IG1fdmlld0ltcGwodmlld0ltcGwpCi0gICAgLCBtX3NjYWxlRmFjdG9y KDEpCiAgICAgLCBtX2NvbnRyb2xsZXIoMCkKIHsKICAgICBBU1NFUlQobV92aWV3SW1wbCk7CkBA IC02OCwxNSArNjcsNiBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnVw ZGF0ZVZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiB2aWV3cG9ydAogICAgIG1fY29udHJvbGxl ci0+ZGlkQ2hhbmdlVmlld3BvcnRTaXplKHZpZXdwb3J0U2l6ZSk7CiB9CiAKLXZvaWQgUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBJ bnRQb2ludCYgbmV3U2Nyb2xsUG9zaXRpb24sIGZsb2F0IG5ld1NjYWxlLCBjb25zdCBGbG9hdFBv aW50JiB0cmFqZWN0b3J5KQotewotICAgIG1fc2NhbGVGYWN0b3IgPSBuZXdTY2FsZTsKLSAgICBt X3Njcm9sbFBvc2l0aW9uID0gbmV3U2Nyb2xsUG9zaXRpb247Ci0KLSAgICBBU1NFUlQobV9jb250 cm9sbGVyKTsKLSAgICBtX2NvbnRyb2xsZXItPmRpZENoYW5nZUNvbnRlbnRzVmlzaWJpbGl0eSht X3Njcm9sbFBvc2l0aW9uLCBtX3NjYWxlRmFjdG9yLCB0cmFqZWN0b3J5KTsKLX0KLQogdm9pZCBQ YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgY29udGVudHNTaXplKQogewogICAgIGRyYXdpbmdBcmVhKCkt PmxheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkoKS0+c2V0Q29udGVudHNTaXplKGNvbnRlbnRzU2l6 ZSk7CkBAIC04NSwyNSArNzUsMjcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50 RWZsOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgV2ViQ29yZTo6SW50U2kKIAogdm9pZCBQ YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBvc2l0aW9uKGNvbnN0 IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGNvbnRlbnRzUG9pbnQpCiB7Ci0gICAgSW50UG9pbnQgcG9z aXRpb24oY29udGVudHNQb2ludC54KCksIGNvbnRlbnRzUG9pbnQueSgpKTsKLSAgICBzZXRWaXNp YmxlQ29udGVudHNSZWN0KHBvc2l0aW9uLCBtX3NjYWxlRmFjdG9yLCBGbG9hdFBvaW50KCkpOwot ICAgIG1fdmlld0ltcGwtPnNldFNjcm9sbFBvc2l0aW9uKHBvc2l0aW9uKTsKKyAgICBtX2NvbnRl bnRQb3NpdGlvbiA9IHJvdW5kZWRJbnRQb2ludChjb250ZW50c1BvaW50KTsKKworICAgIEZsb2F0 UG9pbnQgcG9zKGNvbnRlbnRzUG9pbnQpOworICAgIHBvcy5zY2FsZShzY2FsZUZhY3RvcigpLCBz Y2FsZUZhY3RvcigpKTsKKyAgICBtX3ZpZXdJbXBsLT5zZXRQYWdlUG9zaXRpb24ocG9zKTsKKwor ICAgIG1fY29udHJvbGxlci0+ZGlkQ2hhbmdlQ29udGVudHNWaXNpYmlsaXR5KG1fY29udGVudFBv c2l0aW9uLCBzY2FsZUZhY3RvcigpKTsKIH0KIAogdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50RWZsOjpzZXRDb250ZW50c1NjYWxlKGZsb2F0IG5ld1NjYWxlLCBib29sIHRyZWF0QXNJ bml0aWFsVmFsdWUpCiB7Ci0gICAgaWYgKHRyZWF0QXNJbml0aWFsVmFsdWUpIHsKLSAgICAgICAg bV9zY3JvbGxQb3NpdGlvbiA9IEludFBvaW50KCk7Ci0gICAgICAgIG1fdmlld0ltcGwtPnNldFNj cm9sbFBvc2l0aW9uKEludFBvaW50KCkpOwotICAgIH0KLSAgICBtX3NjYWxlRmFjdG9yID0gbmV3 U2NhbGU7CisgICAgaWYgKHRyZWF0QXNJbml0aWFsVmFsdWUpCisgICAgICAgIHNldFZpZXdwb3J0 UG9zaXRpb24oRmxvYXRQb2ludCgwLCAwKSk7CisKICAgICBtX3ZpZXdJbXBsLT5zZXRTY2FsZUZh Y3RvcihuZXdTY2FsZSk7CiB9CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVm bDo6ZGlkUmVzdW1lQ29udGVudCgpCiB7CiAgICAgQVNTRVJUKG1fY29udHJvbGxlcik7Ci0gICAg bV9jb250cm9sbGVyLT5kaWRDaGFuZ2VDb250ZW50c1Zpc2liaWxpdHkobV9zY3JvbGxQb3NpdGlv biwgbV9zY2FsZUZhY3Rvcik7CisgICAgbV9jb250cm9sbGVyLT5kaWRDaGFuZ2VDb250ZW50c1Zp c2liaWxpdHkobV9jb250ZW50UG9zaXRpb24sIHNjYWxlRmFjdG9yKCkpOwogfQogCiB2b2lkIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OmRpZENoYW5nZVZpc2libGVDb250ZW50cygp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRFZmwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5oCmluZGV4IGVlOWQzNzY5MDg3ODg3NjU0M2Y3NDAz MjhkYmRjNDc3YWViNDQzZmUuLjFhZTZhNTQxZDQwZDQwNDgzNDM4NGYyYThiM2FkOWVmZWM2ODlh MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5oCkBAIC0yOCwxMiArMjgsMTEgQEAKIAog I2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogCisjaW5jbHVkZSAiRXdrVmlld0ltcGwuaCIK ICNpbmNsdWRlICJQYWdlQ2xpZW50QmFzZS5oIgogI2luY2x1ZGUgIlBhZ2VWaWV3cG9ydENvbnRy b2xsZXJDbGllbnQuaCIKICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogCi1jbGFzcyBFd2tW aWV3SW1wbDsKLQogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFBhZ2VWaWV3cG9ydENvbnRy b2xsZXJDbGllbnRFZmwgOiBwdWJsaWMgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCB7CkBA IC00NiwxMSArNDUsMTAgQEAgcHVibGljOgogCiAgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2lu Z0FyZWEoKSBjb25zdDsKICAgICBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCkgeyByZXR1cm4g bV92aWV3cG9ydFNpemU7IH0KLSAgICBmbG9hdCBzY2FsZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJu IG1fc2NhbGVGYWN0b3I7IH0KLSAgICBXZWJDb3JlOjpJbnRQb2ludCBzY3JvbGxQb3NpdGlvbigp IHsgcmV0dXJuIG1fc2Nyb2xsUG9zaXRpb247IH0KKyAgICBmbG9hdCBzY2FsZUZhY3RvcigpIGNv bnN0IHsgcmV0dXJuIG1fdmlld0ltcGwtPnNjYWxlRmFjdG9yKCk7IH0KKyAgICBXZWJDb3JlOjpJ bnRQb2ludCBjb250ZW50UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRQb3NpdGlv bjsgfQogCiAgICAgdm9pZCB1cGRhdGVWaWV3cG9ydFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6 ZSYgdmlld3BvcnRTaXplKTsKLSAgICB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmLCBmbG9hdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpOwog ICAgIHZvaWQgc2V0UmVuZGVyZXJBY3RpdmUoYm9vbCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0 Vmlld3BvcnRQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBjb250ZW50c1BvaW50 KTsKQEAgLTY4LDggKzY2LDcgQEAgcHJpdmF0ZToKIAogICAgIEV3a1ZpZXdJbXBsKiBtX3ZpZXdJ bXBsOwogICAgIFdlYkNvcmU6OkludFNpemUgbV92aWV3cG9ydFNpemU7Ci0gICAgV2ViQ29yZTo6 SW50UG9pbnQgbV9zY3JvbGxQb3NpdGlvbjsKLSAgICBmbG9hdCBtX3NjYWxlRmFjdG9yOworICAg IFdlYkNvcmU6OkludFBvaW50IG1fY29udGVudFBvc2l0aW9uOwogICAgIFBhZ2VWaWV3cG9ydENv bnRyb2xsZXIqIG1fY29udHJvbGxlcjsKIH07CiAK