<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>84435</bug_id>
          
          <creation_ts>2012-04-20 04:51:08 -0700</creation_ts>
          <short_desc>[EFL][DRT] EFL&apos;s DRT needs to support LayoutTestController.dumpIconChanges()</short_desc>
          <delta_ts>2012-05-09 11:39:46 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit EFL</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>gyuyoung</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>lucas.de.marchi</cc>
    
    <cc>rakuco</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>606499</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-20 04:51:08 -0700</bug_when>
    <thetext>EFL&apos;s DRT needs to print information when the main frame icon is changed and LayoutTestController.dumpIconChanges() returns true.

This is allow unskipping fast/dom/icon-url-property.html.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>606508</commentid>
    <comment_count>1</comment_count>
      <attachid>138071</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-20 04:59:22 -0700</bug_when>
    <thetext>Created attachment 138071
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>607164</commentid>
    <comment_count>2</comment_count>
      <attachid>138071</attachid>
    <who name="Gyuyoung Kim">gyuyoung.kim</who>
    <bug_when>2012-04-21 00:58:31 -0700</bug_when>
    <thetext>Comment on attachment 138071
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=138071&amp;action=review

Almost looks good to me except for trivial comments.

&gt; Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:602
&gt; +    /* report received favicon only for main frame. */

Though this is trivial nits, it looks WebKit coding style tends to use &apos;//&apos; instead of &apos;/*..*/&apos; basically.

&gt; Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp:110
&gt; +    evas_object_smart_callback_add(mainFrame, &quot;icon,changed&quot;, onFrameIconChanged, 0);

Though I&apos;m not sure this is correct in this case, is it better to register this callback by alphabetical order ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>607470</commentid>
    <comment_count>3</comment_count>
      <attachid>138291</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-22 22:33:39 -0700</bug_when>
    <thetext>Created attachment 138291
Patch

Updated patch to take feedback into consideration.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>608312</commentid>
    <comment_count>4</comment_count>
      <attachid>138291</attachid>
    <who name="Raphael Kubo da Costa (:rakuco)">rakuco</who>
    <bug_when>2012-04-23 19:33:23 -0700</bug_when>
    <thetext>Comment on attachment 138291
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=138291&amp;action=review

&gt; Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:600
&gt;  void FrameLoaderClientEfl::dispatchDidChangeIcons(WebCore::IconType)

Shouldn&apos;t the parameter for this method be used now so the signal can be more useful? Right now it looks like only DRT has a good use for this feature.

&gt; Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:604
&gt; +    // report received favicon only for main frame.
&gt; +    if (ewk_view_frame_main_get(m_view) != m_frame)
&gt; +        return;

What&apos;s the reason for emitting this signal only for the main frame?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>608363</commentid>
    <comment_count>5</comment_count>
      <attachid>138495</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-23 22:38:06 -0700</bug_when>
    <thetext>Created attachment 138495
Patch

Update patch to pass the icon type with the &quot;icon,changed&quot; signal. Note that this signal is emitted only on the main frame for consistency.
Indeed, the &quot;icon,received&quot; signal was already existing and is only emitted on the main frame.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>610436</commentid>
    <comment_count>6</comment_count>
      <attachid>138291</attachid>
    <who name="Gyuyoung Kim">gyuyoung.kim</who>
    <bug_when>2012-04-26 02:09:56 -0700</bug_when>
    <thetext>Comment on attachment 138291
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=138291&amp;action=review

&gt;&gt; Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:604
&gt;&gt; +        return;
&gt; 
&gt; What&apos;s the reason for emitting this signal only for the main frame?

If icon means favicon for main frame, it seems to me that this is reasonable. Basically, main frame only has favicon.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>610438</commentid>
    <comment_count>7</comment_count>
      <attachid>138495</attachid>
    <who name="Gyuyoung Kim">gyuyoung.kim</who>
    <bug_when>2012-04-26 02:11:21 -0700</bug_when>
    <thetext>Comment on attachment 138495
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=138495&amp;action=review

&gt; Source/WebKit/efl/ewk/ewk_view.cpp:2914
&gt; +    evas_object_smart_callback_call(frame, &quot;icon,changed&quot;, &amp;iconType);

Don&apos;t you need to change from WebCore::IconType to Ewk_Icon_Type ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>610470</commentid>
    <comment_count>8</comment_count>
      <attachid>138965</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-26 03:37:08 -0700</bug_when>
    <thetext>Created attachment 138965
Patch

Take feedback into consideration.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>610569</commentid>
    <comment_count>9</comment_count>
    <who name="Raphael Kubo da Costa (:rakuco)">rakuco</who>
    <bug_when>2012-04-26 07:04:37 -0700</bug_when>
    <thetext>(In reply to comment #6)
&gt; If icon means favicon for main frame, it seems to me that this is reasonable. Basically, main frame only has favicon.

My point is that from the method name there&apos;s no mention that this is reported only for the main frame, so I&apos;d like to understand the reason for adding a restriction in our layer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>611260</commentid>
    <comment_count>10</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-26 22:57:11 -0700</bug_when>
    <thetext>If you check GTK port for example:

void FrameLoaderClient::dispatchDidReceiveIcon() {
  ASSERT(m_frame == webkit_web_view_get_main_frame(webView));
  ...
}

But the EFL port is doing:

void FrameLoaderClientEfl::dispatchDidChangeIcons(WebCore::IconType iconType)
{
    // report received favicon only for main frame.
    if (ewk_view_frame_main_get(m_view) != m_frame)
        return;
    ...
}

So I believe that even if we removed the main_frame check in the EFL port, we would still send the &quot;icon,received&quot; signal for the main frame only.

Now, I don&apos;t know if dispatchDidChangeIcons() is called for the main frame only or not but does it really make sense to emit the &quot;icon,changed&quot; signal potentially for all frame when we know for sure that we send the &quot;icon,received&quot; signal only for the main frame?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>616011</commentid>
    <comment_count>11</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-04 00:28:20 -0700</bug_when>
    <thetext>Any update on this?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>617256</commentid>
    <comment_count>12</comment_count>
    <who name="Raphael Kubo da Costa (:rakuco)">rakuco</who>
    <bug_when>2012-05-06 18:35:50 -0700</bug_when>
    <thetext>(In reply to comment #10)
&gt; So I believe that even if we removed the main_frame check in the EFL port, we would still send the &quot;icon,received&quot; signal for the main frame only.
&gt; 
&gt; Now, I don&apos;t know if dispatchDidChangeIcons() is called for the main frame only or not but does it really make sense to emit the &quot;icon,changed&quot; signal potentially for all frame when we know for sure that we send the &quot;icon,received&quot; signal only for the main frame?

Nope, we should either send both signals in all cases or only for the main frame. It&apos;d be nice if you could check whether the WebCore machinery that ends up in our FrameLoaderClient also makes this distinction between main frames and other frames or not -- from an API user point of view, it makes sense to provide as much information as possible (ie. if all frames have favicons, they should all be available for the user to query).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>617434</commentid>
    <comment_count>13</comment_count>
    <who name="Gyuyoung Kim">gyuyoung.kim</who>
    <bug_when>2012-05-07 00:29:25 -0700</bug_when>
    <thetext>(In reply to comment #12)
&gt; (In reply to comment #10)
&gt; &gt; So I believe that even if we removed the main_frame check in the EFL port, we would still send the &quot;icon,received&quot; signal for the main frame only.
&gt; &gt; 
&gt; &gt; Now, I don&apos;t know if dispatchDidChangeIcons() is called for the main frame only or not but does it really make sense to emit the &quot;icon,changed&quot; signal potentially for all frame when we know for sure that we send the &quot;icon,received&quot; signal only for the main frame?
&gt; 
&gt; Nope, we should either send both signals in all cases or only for the main frame. It&apos;d be nice if you could check whether the WebCore machinery that ends up in our FrameLoaderClient also makes this distinction between main frames and other frames or not -- from an API user point of view, it makes sense to provide as much information as possible (ie. if all frames have favicons, they should all be available for the user to query).

AFAIK, favicon is added in &lt;head&gt;...&lt;/head&gt; section. 
http://en.wikipedia.org/wiki/Favicon#cite_note-7

So, it seems to me that a main frame is only able to have favicon. However, I take a look other port implementations to check how to process this signal in other ports. It looks that is implemented differently by each port. Some ports send a signal to all frames, gtk port sends a signal for main frame. If all frames can have favicon, I also think we should send signal for all frames. If not so, in my opinion, we can send icon,changed for only main frame.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>617438</commentid>
    <comment_count>14</comment_count>
      <attachid>140487</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-07 00:51:04 -0700</bug_when>
    <thetext>Created attachment 140487
Patch

Now emitting the &quot;icon,changed&quot; signal on all frames, not just the main one. This is consistent with what the Chromium port is doing.
I also converted the main frame runtime check in FrameLoaderClientEfl::dispatchDidReceiveIcon() into an assertion since IconController loads icons only for the main frame (consistent with other ports such as Mac and GTK).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>617598</commentid>
    <comment_count>15</comment_count>
      <attachid>140487</attachid>
    <who name="Raphael Kubo da Costa (:rakuco)">rakuco</who>
    <bug_when>2012-05-07 07:58:10 -0700</bug_when>
    <thetext>Comment on attachment 140487
Patch

Looks good overall, but please add some documentation to Ewk_Icon_Type.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>618184</commentid>
    <comment_count>16</comment_count>
      <attachid>140487</attachid>
    <who name="Gyuyoung Kim">gyuyoung.kim</who>
    <bug_when>2012-05-07 18:02:59 -0700</bug_when>
    <thetext>Comment on attachment 140487
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=140487&amp;action=review

&gt; Source/WebKit/efl/ChangeLog:8
&gt; +        Emit a &quot;icon,changed&quot; signal when the frame when one of its icons has

Though I&apos;m not sure where my English is correct, I don&apos;t understand below sentence well.
* when the frame when one of its icons has changed.*</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>618322</commentid>
    <comment_count>17</comment_count>
      <attachid>140676</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-07 22:41:34 -0700</bug_when>
    <thetext>Created attachment 140676
Patch

Ok, back to the beginning :) As it turns out, the icon type is only relevant on apple (only apple has touch-icons, other ports only have favicons: Bug 59143).
Therefore, I removed the iconType parameter from the &quot;icon,changed&quot; signal and added an assert to make sure the iconType is always WebCore::Favicon.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>618328</commentid>
    <comment_count>18</comment_count>
    <who name="Gyuyoung Kim">gyuyoung</who>
    <bug_when>2012-05-07 22:56:29 -0700</bug_when>
    <thetext>Looks fine on my side.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>619677</commentid>
    <comment_count>19</comment_count>
      <attachid>140676</attachid>
    <who name="Antonio Gomes">tonikitoo</who>
    <bug_when>2012-05-09 11:27:28 -0700</bug_when>
    <thetext>Comment on attachment 140676
Patch

rs=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>619687</commentid>
    <comment_count>20</comment_count>
      <attachid>140676</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-05-09 11:39:40 -0700</bug_when>
    <thetext>Comment on attachment 140676
Patch

Clearing flags on attachment: 140676

Committed r116547: &lt;http://trac.webkit.org/changeset/116547&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>619688</commentid>
    <comment_count>21</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-05-09 11:39:46 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>138071</attachid>
            <date>2012-04-20 04:59:22 -0700</date>
            <delta_ts>2012-04-22 22:33:39 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>84435_dumpIconChanges.patch</filename>
            <type>text/plain</type>
            <size>7897</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCBjNDQ0ZGYxLi4wNGMyOTAwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDQt
MjAgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRlc3RDb250
cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFVuc2tpcCB0aGUgdGVzdCBjaGVja2luZyBmb3IgRHVtcFJlbmRlclRy
ZWUncyBzdXBwb3J0IGZvcgorICAgICAgICBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29u
Q2hhbmdlcygpIGluIEVGTCBwb3J0LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1NraXBwZWQ6
CisKIDIwMTItMDQtMjAgICdQYXZlbCBGZWxkbWFuJyAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4K
IAogICAgICAgICBOb3QgcmV2aWV3ZWQ6IGZpeGVkIGNocm9taXVtIHNhbml0eSB0ZXN0cyBmb3Ig
aW5zcGVjdG9yIHZpYSBhc3NpZ25pbmcgbGFzdCBwYXRoIGNvbXBvbmVudApkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9l
ZmwvU2tpcHBlZAppbmRleCBiYjMzYjEzLi5lZDg2MTBmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tp
cHBlZApAQCAtMiwxMCArMiw2IEBACiAjIFRlc3RzIHdoaWNoIGRlcGVuZCBvbiBmZWF0dXJlcyB3
aGljaCBoYXZlIG5vdCBiZWVuIGltcGxlbWVudGVkIHlldAogIyAtLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi0jIE5l
ZWRzIEFQSSB0byByZWNlaXZlIG5vdGlmaWNhdGlvbnMgYWJvdXQgY2hhbmdlZCBpY29ucwotIyBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM4MTIKLWZhc3QvZG9tL2lj
b24tdXJsLXByb3BlcnR5Lmh0bWwKLQogIyBFRkwncyBFdmVudFNlbmRlciBkb2VzIG5vdCBpbXBs
ZW1lbnQgZHVtcEZpbGVuYW1lQmVpbmdEcmFnZ2VkCiBmYXN0L2V2ZW50cy9kcmFnLWltYWdlLWZp
bGVuYW1lLmh0bWwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIv
U291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IDg3NjJiNmYuLjExN2FiMmIgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Vm
bC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wNC0yMCAgQ2hyaXN0b3BoZSBEdW1l
eiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW0RSVF0gRUZM
J3MgRFJUIG5lZWRzIHRvIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEljb25DaGFu
Z2VzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0
NDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW1p
dCBhICJpY29uLGNoYW5nZWQiIHNpZ25hbCB3aGVuIHRoZSBtYWluIGZyYW1lJ3MgaWNvbiBoYXMg
Y2hhbmdlZC4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZs
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp
ZENoYW5nZUljb25zKToKKyAgICAgICAgKiBld2svZXdrX3ByaXZhdGUuaDoKKyAgICAgICAgKiBl
d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YSk6CisgICAg
ICAgIChld2tfdmlld19mcmFtZV9tYWluX2ljb25fY2hhbmdlZCk6CisgICAgICAgICogZXdrL2V3
a192aWV3Lmg6CisKIDIwMTItMDQtMjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNv
bT4KIAogICAgICAgICBbRUZMXSBBZGQgc2V0dGluZyBBUEkgZm9yIGF1dGhvciBhbmQgdXNlciBz
dHlsZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFt
ZUxvYWRlckNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9G
cmFtZUxvYWRlckNsaWVudEVmbC5jcHAKaW5kZXggOGVhYmMwMy4uODcxYjYyZiAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwu
Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp
ZW50RWZsLmNwcApAQCAtNTk5LDcgKzU5OSwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZs
OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0aQog
CiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENoYW5nZUljb25zKFdlYkNv
cmU6Okljb25UeXBlKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgLyogcmVwb3J0IHJl
Y2VpdmVkIGZhdmljb24gb25seSBmb3IgbWFpbiBmcmFtZS4gKi8KKyAgICBpZiAoZXdrX3ZpZXdf
ZnJhbWVfbWFpbl9nZXQobV92aWV3KSAhPSBtX2ZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAg
ICBld2tfdmlld19mcmFtZV9tYWluX2ljb25fY2hhbmdlZChtX3ZpZXcpOwogfQogCiB2b2lkIEZy
YW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9l
d2svZXdrX3ByaXZhdGUuaAppbmRleCA5YzIyZDRhLi4xN2VkODhjIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l
d2svZXdrX3ByaXZhdGUuaApAQCAtMTEzLDYgKzExMyw3IEBAIHZvaWQgZXdrX3ZpZXdfbG9hZF9z
dGFydGVkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFdmFzX09iamVjdCogZXdrRnJhbWUpOwogdm9p
ZCBld2tfdmlld19sb2FkX3Byb3Zpc2lvbmFsKEV2YXNfT2JqZWN0KiBld2tWaWV3KTsKIHZvaWQg
ZXdrX3ZpZXdfZnJhbWVfbWFpbl9sb2FkX3N0YXJ0ZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpOwog
dm9pZCBld2tfdmlld19mcmFtZV9tYWluX2NsZWFyZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpOwor
dm9pZCBld2tfdmlld19mcmFtZV9tYWluX2ljb25fY2hhbmdlZChFdmFzX09iamVjdCogZXdrVmll
dyk7CiB2b2lkIGV3a192aWV3X2ZyYW1lX21haW5faWNvbl9yZWNlaXZlZChFdmFzX09iamVjdCog
ZXdrVmlldyk7CiB2b2lkIGV3a192aWV3X2xvYWRfZmluaXNoZWQoRXZhc19PYmplY3QqIGV3a1Zp
ZXcsIGNvbnN0IEV3a19GcmFtZV9Mb2FkX0Vycm9yKiBlcnJvcik7CiB2b2lkIGV3a192aWV3X2xv
YWRfZXJyb3IoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEV3a19GcmFtZV9Mb2FkX0Vycm9y
KiBlcnJvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3Bw
IGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCBmN2Y5M2Q5Li4xMTlj
NGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBi
L1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTI5MDEsNiArMjkwMSwyMSBA
QCB2b2lkIGV3a192aWV3X2ZyYW1lX21haW5fY2xlYXJlZChFdmFzX09iamVjdCogZXdrVmlldykK
IAogLyoqCiAgKiBAaW50ZXJuYWwKKyAqIFJlcG9ydHMgdGhlIG1haW4gZnJhbWUgaWNvbiBjaGFu
Z2VkLgorICoKKyAqIEBwYXJhbSBld2tWaWV3IFZpZXcuCisgKgorICogRW1pdHMgc2lnbmFsOiAi
aWNvbixjaGFuZ2VkIiB3aXRoIG5vIHBhcmFtZXRlcnMuCisgKi8KK3ZvaWQgZXdrX3ZpZXdfZnJh
bWVfbWFpbl9pY29uX2NoYW5nZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgREJHKCJl
d2tWaWV3PSVwIiwgZXdrVmlldyk7CisgICAgRXZhc19PYmplY3QqIGZyYW1lID0gZXdrX3ZpZXdf
ZnJhbWVfbWFpbl9nZXQoZXdrVmlldyk7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tf
Y2FsbChmcmFtZSwgImljb24sY2hhbmdlZCIsIDApOworfQorCisvKioKKyAqIEBpbnRlcm5hbAog
ICogUmVwb3J0cyB0aGUgbWFpbiBmcmFtZSByZWNlaXZlZCBhbiBpY29uLgogICoKICAqIEBwYXJh
bSBld2tWaWV3IFZpZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp
ZXcuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmluZGV4IGYyZjBiZTEuLjFj
NTM5NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCisrKyBi
L1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCkBAIC00Myw2ICs0Myw3IEBACiAgKiAg
LSAiZWRpdG9yY2xpZW50LGNvbnRlbnRzLGNoYW5nZWQiLCB2b2lkOiByZXBvcnRzIHRvIHRoZSB2
aWV3IHRoYXQgZWRpdG9yCiAgKiAgICBjbGllbnQncyBjb250ZW50cyB3ZXJlIGNoYW5nZWQKICAq
ICAtICJmcmFtZSxjcmVhdGVkIiwgRXZhc19PYmplY3QqOiBhIG5ldyBmcmFtZSBpcyBjcmVhdGVk
LgorICogIC0gImljb24sY2hhbmdlZCIsIHZvaWQ6IG1haW4gZnJhbWUgaWNvbiBjaGFuZ2VkLgog
ICogIC0gImljb24scmVjZWl2ZWQiLCB2b2lkOiBtYWluIGZyYW1lIHJlY2VpdmVkIGFuIGljb24u
CiAgKiAgLSAiaW5wdXRtZXRob2QsY2hhbmdlZCIsIEVpbmFfQm9vbDogcmVwb3J0cyB0aGF0IGlu
cHV0IG1ldGhvZCB3YXMgY2hhbmdlZCBhbmQKICAqICAgIGl0IGdpdmVzIGEgYm9vbGVhbiB2YWx1
ZSB3aGV0aGVyIGl0J3MgZW5hYmxlZCBvciBub3QgYXMgYW4gYXJndW1lbnQuCmRpZmYgLS1naXQg
YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2RmZDEwNi4uNTVhMmYz
YiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDE5IEBACisyMDEyLTA0LTIwICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5k
dW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBFRkwncyBEUlQgbmVlZHMgdG8g
c3VwcG9ydCBMYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wSWNvbkNoYW5nZXMoKQorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ0MzUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYXRjaCB0aGUgImljb24sY2hh
bmdlZCIgc2lnbmFsIG9uIHRoZSBtYWluIGZyYW1lIGluIEVGTCdzIERSVCB0bworICAgICAgICBz
dXBwb3J0IExheW91dFRlc3RDb250cm9sbGVyJ3MgZHVtcEljb25DaGFuZ2VzKCkuCisKKyAgICAg
ICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwOgorICAgICAg
ICAoRHVtcFJlbmRlclRyZWVDaHJvbWU6OmNyZWF0ZVZpZXcpOgorICAgICAgICAoRHVtcFJlbmRl
clRyZWVDaHJvbWU6Om9uRnJhbWVJY29uQ2hhbmdlZCk6CisgICAgICAgICogRHVtcFJlbmRlclRy
ZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmg6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZUNo
cm9tZSk6CisKIDIwMTItMDQtMjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4K
IAogICAgICAgICBbRUZMXSBBZGQgbWlzc2luZyByZXNldCBmb3Igc2V0QXV0aG9yQW5kVXNlclN0
eWxlc0VuYWJsZWQgaW5zaWRlIERSVC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl
L2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwv
RHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCmluZGV4IDQ0NmE2MzUuLmRlZWU3NTYgMTAwNjQ0Ci0t
LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKKysr
IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApAQCAt
MTA3LDYgKzEwNyw3IEBAIEV2YXNfT2JqZWN0KiBEdW1wUmVuZGVyVHJlZUNocm9tZTo6Y3JlYXRl
VmlldygpIGNvbnN0CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1haW5GcmFt
ZSwgImxvYWQsZXJyb3IiLCBvbkZyYW1lTG9hZEVycm9yLCAwKTsKICAgICBldmFzX29iamVjdF9z
bWFydF9jYWxsYmFja19hZGQobWFpbkZyYW1lLCAicmVkaXJlY3QsY2FuY2VsbGVkIiwgb25GcmFt
ZVJlZGlyZWN0Q2FuY2VsbGVkLCAwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19h
ZGQobWFpbkZyYW1lLCAieHNzLGRldGVjdGVkIiwgb25EaWREZXRlY3RYU1MsIDApOworICAgIGV2
YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChtYWluRnJhbWUsICJpY29uLGNoYW5nZWQiLCBv
bkZyYW1lSWNvbkNoYW5nZWQsIDApOwogCiAgICAgcmV0dXJuIHZpZXc7CiB9CkBAIC0yODIsNiAr
MjgzLDE0IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9uU3RhdHVzYmFyVGV4dFNldCh2
b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKiBldmVudEluCiAgICAgcHJpbnRmKCJVSSBERUxFR0FU
RSBTVEFUVVMgQ0FMTEJBQ0s6IHNldFN0YXR1c1RleHQ6JXNcbiIsIHN0YXR1c2JhclRleHQpOwog
fQogCit2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpvbkZyYW1lSWNvbkNoYW5nZWQodm9pZCos
IEV2YXNfT2JqZWN0KiBmcmFtZSwgdm9pZCopCit7CisgICAgaWYgKCFkb25lICYmIGdMYXlvdXRU
ZXN0Q29udHJvbGxlci0+ZHVtcEljb25DaGFuZ2VzKCkpIHsKKyAgICAgICAgY29uc3QgU3RyaW5n
IGZyYW1lTmFtZShEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnN1aXRhYmxlRFJURnJhbWVOYW1l
KGZyYW1lKSk7CisgICAgICAgIHByaW50ZigiJXMgLSBkaWRDaGFuZ2VJY29uc1xuIiwgZnJhbWVO
YW1lLnV0ZjgoKS5kYXRhKCkpOworICAgIH0KK30KKwogdm9pZCBEdW1wUmVuZGVyVHJlZUNocm9t
ZTo6b25UaXRsZUNoYW5nZWQodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCogZXZlbnRJbmZvKQog
ewogICAgIGlmICghZ0xheW91dFRlc3RDb250cm9sbGVyLT5kdW1wVGl0bGVDaGFuZ2VzKCkpCmRp
ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUu
aCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oCmluZGV4
IDE4ZDVjYWIuLjIwYzMxOWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9E
dW1wUmVuZGVyVHJlZUNocm9tZS5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1w
UmVuZGVyVHJlZUNocm9tZS5oCkBAIC04Niw2ICs4Niw4IEBAIHByaXZhdGU6CiAKICAgICBzdGF0
aWMgdm9pZCBvbkZyYW1lQ3JlYXRlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7CiAKKyAg
ICBzdGF0aWMgdm9pZCBvbkZyYW1lSWNvbkNoYW5nZWQodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9p
ZCopOworCiAgICAgc3RhdGljIHZvaWQgb25GcmFtZVByb3Zpc2lvbmFsTG9hZCh2b2lkKiwgRXZh
c19PYmplY3QqLCB2b2lkKik7CiAKICAgICBzdGF0aWMgdm9pZCBvbkZyYW1lTG9hZENvbW1pdHRl
ZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>138291</attachid>
            <date>2012-04-22 22:33:39 -0700</date>
            <delta_ts>2012-04-26 02:09:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>84435_dumpIconChanges.patch</filename>
            <type>text/plain</type>
            <size>7995</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA4MTY3ZTRiLi44OWNjNWU2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDQt
MjMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRlc3RDb250
cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFVuc2tpcCB0aGUgdGVzdCBjaGVja2luZyBmb3IgRHVtcFJlbmRlclRy
ZWUncyBzdXBwb3J0IGZvcgorICAgICAgICBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29u
Q2hhbmdlcygpIGluIEVGTCBwb3J0LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1NraXBwZWQ6
CisKIDIwMTItMDQtMjIgIFBhYmxvIEZsb3VyZXQgIDxwYWJsb2ZAbW90b3JvbGEuY29tPgogCiAg
ICAgICAgIFJlc2V0IGV2ZW50IHByb3BhZ2F0aW9uIGFuZCBjYW5jZWxlZCBmbGFncyBpbiBFdmVu
dC5pbml0RXZlbnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVk
IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKaW5kZXggMDM5Yzg2OS4uOGQ5NDhl
OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKKysrIGIvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKQEAgLTIsMTAgKzIsNiBAQAogIyBUZXN0cyB3
aGljaCBkZXBlbmQgb24gZmVhdHVyZXMgd2hpY2ggaGF2ZSBub3QgYmVlbiBpbXBsZW1lbnRlZCB5
ZXQKICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0KIAotIyBOZWVkcyBBUEkgdG8gcmVjZWl2ZSBub3RpZmljYXRpb25z
IGFib3V0IGNoYW5nZWQgaWNvbnMKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTMzODEyCi1mYXN0L2RvbS9pY29uLXVybC1wcm9wZXJ0eS5odG1sCi0KICMgRUZMJ3Mg
RXZlbnRTZW5kZXIgZG9lcyBub3QgaW1wbGVtZW50IGR1bXBGaWxlbmFtZUJlaW5nRHJhZ2dlZAog
ZmFzdC9ldmVudHMvZHJhZy1pbWFnZS1maWxlbmFtZS5odG1sCiAKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRl
eCA2MmIyNjVmLi44YTMyNmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM
b2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIw
MTItMDQtMjMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4K
KworICAgICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRl
c3RDb250cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIEVtaXQgYSAiaWNvbixjaGFuZ2VkIiBzaWduYWwgd2hlbiB0
aGUgbWFpbiBmcmFtZSdzIGljb24gaGFzIGNoYW5nZWQuCisKKyAgICAgICAgKiBXZWJDb3JlU3Vw
cG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv
YWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDaGFuZ2VJY29ucyk6CisgICAgICAgICogZXdrL2V3
a19wcml2YXRlLmg6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9Fd2tf
Vmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9pY29uX2No
YW5nZWQpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOgorCiAyMDEyLTA0LTIwICBUaGlhZ28g
TWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgogCiAgICAgICAgIFtF
RkxdIEFkZCBTZWN1cml0eSBPcmlnaW4gQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm
bC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0
L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAKaW5kZXggOGVhYmMw
My4uYmVkMjcyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQv
RnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVT
dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmNwcApAQCAtNTk5LDcgKzU5OSwxMSBAQCB2b2lk
IEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJp
bmdXaXRoRGlyZWN0aW9uJiB0aQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRj
aERpZENoYW5nZUljb25zKFdlYkNvcmU6Okljb25UeXBlKQogewotICAgIG5vdEltcGxlbWVudGVk
KCk7CisgICAgLy8gcmVwb3J0IHJlY2VpdmVkIGZhdmljb24gb25seSBmb3IgbWFpbiBmcmFtZS4K
KyAgICBpZiAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KSAhPSBtX2ZyYW1lKQorICAg
ICAgICByZXR1cm47CisKKyAgICBld2tfdmlld19mcmFtZV9tYWluX2ljb25fY2hhbmdlZChtX3Zp
ZXcpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENvbW1pdExv
YWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmggYi9T
b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAppbmRleCBmNGI5OWFjZS4uNWQ2NzY0
YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKKysrIGIv
U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKQEAgLTExNCw2ICsxMTQsNyBAQCB2
b2lkIGV3a192aWV3X2xvYWRfc3RhcnRlZChFdmFzX09iamVjdCogZXdrVmlldywgRXZhc19PYmpl
Y3QqIGV3a0ZyYW1lKTsKIHZvaWQgZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25hbChFdmFzX09iamVj
dCogZXdrVmlldyk7CiB2b2lkIGV3a192aWV3X2ZyYW1lX21haW5fbG9hZF9zdGFydGVkKEV2YXNf
T2JqZWN0KiBld2tWaWV3KTsKIHZvaWQgZXdrX3ZpZXdfZnJhbWVfbWFpbl9jbGVhcmVkKEV2YXNf
T2JqZWN0KiBld2tWaWV3KTsKK3ZvaWQgZXdrX3ZpZXdfZnJhbWVfbWFpbl9pY29uX2NoYW5nZWQo
RXZhc19PYmplY3QqIGV3a1ZpZXcpOwogdm9pZCBld2tfdmlld19mcmFtZV9tYWluX2ljb25fcmVj
ZWl2ZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpOwogdm9pZCBld2tfdmlld19sb2FkX2ZpbmlzaGVk
KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBFd2tfRnJhbWVfTG9hZF9FcnJvciogZXJyb3Ip
Owogdm9pZCBld2tfdmlld19sb2FkX2Vycm9yKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBF
d2tfRnJhbWVfTG9hZF9FcnJvciogZXJyb3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l
ZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAK
aW5kZXggZjdmOTNkOS4uMTE5YzRkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdr
L2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBA
IC0yOTAxLDYgKzI5MDEsMjEgQEAgdm9pZCBld2tfdmlld19mcmFtZV9tYWluX2NsZWFyZWQoRXZh
c19PYmplY3QqIGV3a1ZpZXcpCiAKIC8qKgogICogQGludGVybmFsCisgKiBSZXBvcnRzIHRoZSBt
YWluIGZyYW1lIGljb24gY2hhbmdlZC4KKyAqCisgKiBAcGFyYW0gZXdrVmlldyBWaWV3LgorICoK
KyAqIEVtaXRzIHNpZ25hbDogImljb24sY2hhbmdlZCIgd2l0aCBubyBwYXJhbWV0ZXJzLgorICov
Cit2b2lkIGV3a192aWV3X2ZyYW1lX21haW5faWNvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tW
aWV3KQoreworICAgIERCRygiZXdrVmlldz0lcCIsIGV3a1ZpZXcpOworICAgIEV2YXNfT2JqZWN0
KiBmcmFtZSA9IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KGV3a1ZpZXcpOworICAgIGV2YXNfb2Jq
ZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZnJhbWUsICJpY29uLGNoYW5nZWQiLCAwKTsKK30KKwor
LyoqCisgKiBAaW50ZXJuYWwKICAqIFJlcG9ydHMgdGhlIG1haW4gZnJhbWUgcmVjZWl2ZWQgYW4g
aWNvbi4KICAqCiAgKiBAcGFyYW0gZXdrVmlldyBWaWV3LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu
aAppbmRleCBmMmYwYmUxLi4xYzUzOTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9l
d2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAt
NDMsNiArNDMsNyBAQAogICogIC0gImVkaXRvcmNsaWVudCxjb250ZW50cyxjaGFuZ2VkIiwgdm9p
ZDogcmVwb3J0cyB0byB0aGUgdmlldyB0aGF0IGVkaXRvcgogICogICAgY2xpZW50J3MgY29udGVu
dHMgd2VyZSBjaGFuZ2VkCiAgKiAgLSAiZnJhbWUsY3JlYXRlZCIsIEV2YXNfT2JqZWN0KjogYSBu
ZXcgZnJhbWUgaXMgY3JlYXRlZC4KKyAqICAtICJpY29uLGNoYW5nZWQiLCB2b2lkOiBtYWluIGZy
YW1lIGljb24gY2hhbmdlZC4KICAqICAtICJpY29uLHJlY2VpdmVkIiwgdm9pZDogbWFpbiBmcmFt
ZSByZWNlaXZlZCBhbiBpY29uLgogICogIC0gImlucHV0bWV0aG9kLGNoYW5nZWQiLCBFaW5hX0Jv
b2w6IHJlcG9ydHMgdGhhdCBpbnB1dCBtZXRob2Qgd2FzIGNoYW5nZWQgYW5kCiAgKiAgICBpdCBn
aXZlcyBhIGJvb2xlYW4gdmFsdWUgd2hldGhlciBpdCdzIGVuYWJsZWQgb3Igbm90IGFzIGFuIGFy
Z3VtZW50LgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu
ZGV4IDAxODdlNjMuLjRmODhhNDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U
b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0wNC0yMyAgQ2hyaXN0b3BoZSBE
dW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW0RSVF0g
RUZMJ3MgRFJUIG5lZWRzIHRvIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEljb25D
aGFuZ2VzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg0NDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
Q2F0Y2ggdGhlICJpY29uLGNoYW5nZWQiIHNpZ25hbCBvbiB0aGUgbWFpbiBmcmFtZSBpbiBFRkwn
cyBEUlQgdG8KKyAgICAgICAgc3VwcG9ydCBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29u
Q2hhbmdlcygpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVl
Q2hyb21lLmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21lOjpjcmVhdGVWaWV3KToK
KyAgICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21lOjpvbkZyYW1lSWNvbkNoYW5nZWQpOgorICAg
ICAgICAqIER1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oOgorICAgICAg
ICAoRHVtcFJlbmRlclRyZWVDaHJvbWUpOgorCiAyMDEyLTA0LTIyICBaYW4gRG9iZXJzZWsgIDx6
YW5kb2JlcnNla0BnbWFpbC5jb20+CiAKICAgICAgICAgW1Rlc3RSZXN1bHRzU2VydmVyXSBJbXBv
c3NpYmxlIHRvIGluc3BlY3QgYnVpbGRzIG9uIG5vbi1DaHJvbWl1bSBidWlsZGVycwpkaWZmIC0t
Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcCBi
L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKaW5kZXgg
MTk3MDIxMS4uZTZiM2RiMSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1
bXBSZW5kZXJUcmVlQ2hyb21lLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVt
cFJlbmRlclRyZWVDaHJvbWUuY3BwCkBAIC0xMDEsNiArMTAxLDcgQEAgRXZhc19PYmplY3QqIER1
bXBSZW5kZXJUcmVlQ2hyb21lOjpjcmVhdGVWaWV3KCkgY29uc3QKICAgICBldmFzX29iamVjdF9z
bWFydF9jYWxsYmFja19hZGQodmlldywgImZyYW1lLGNyZWF0ZWQiLCBvbkZyYW1lQ3JlYXRlZCwg
MCk7CiAKICAgICBFdmFzX09iamVjdCogbWFpbkZyYW1lID0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9n
ZXQodmlldyk7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1haW5GcmFtZSwg
Imljb24sY2hhbmdlZCIsIG9uRnJhbWVJY29uQ2hhbmdlZCwgMCk7CiAgICAgZXZhc19vYmplY3Rf
c21hcnRfY2FsbGJhY2tfYWRkKG1haW5GcmFtZSwgImxvYWQscHJvdmlzaW9uYWwiLCBvbkZyYW1l
UHJvdmlzaW9uYWxMb2FkLCAwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQo
bWFpbkZyYW1lLCAibG9hZCxjb21taXR0ZWQiLCBvbkZyYW1lTG9hZENvbW1pdHRlZCwgMCk7CiAg
ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1haW5GcmFtZSwgImxvYWQsZmluaXNo
ZWQiLCBvbkZyYW1lTG9hZEZpbmlzaGVkLCAwKTsKQEAgLTI4NSw2ICsyODYsMTQgQEAgdm9pZCBE
dW1wUmVuZGVyVHJlZUNocm9tZTo6b25TdGF0dXNiYXJUZXh0U2V0KHZvaWQqLCBFdmFzX09iamVj
dCosIHZvaWQqIGV2ZW50SW4KICAgICBwcmludGYoIlVJIERFTEVHQVRFIFNUQVRVUyBDQUxMQkFD
Szogc2V0U3RhdHVzVGV4dDolc1xuIiwgc3RhdHVzYmFyVGV4dCk7CiB9CiAKK3ZvaWQgRHVtcFJl
bmRlclRyZWVDaHJvbWU6Om9uRnJhbWVJY29uQ2hhbmdlZCh2b2lkKiwgRXZhc19PYmplY3QqIGZy
YW1lLCB2b2lkKikKK3sKKyAgICBpZiAoIWRvbmUgJiYgZ0xheW91dFRlc3RDb250cm9sbGVyLT5k
dW1wSWNvbkNoYW5nZXMoKSkgeworICAgICAgICBjb25zdCBTdHJpbmcgZnJhbWVOYW1lKER1bXBS
ZW5kZXJUcmVlU3VwcG9ydEVmbDo6c3VpdGFibGVEUlRGcmFtZU5hbWUoZnJhbWUpKTsKKyAgICAg
ICAgcHJpbnRmKCIlcyAtIGRpZENoYW5nZUljb25zXG4iLCBmcmFtZU5hbWUudXRmOCgpLmRhdGEo
KSk7CisgICAgfQorfQorCiB2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpvblRpdGxlQ2hhbmdl
ZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKiBldmVudEluZm8pCiB7CiAgICAgaWYgKCFnTGF5
b3V0VGVzdENvbnRyb2xsZXItPmR1bXBUaXRsZUNoYW5nZXMoKSkKZGlmZiAtLWdpdCBhL1Rvb2xz
L0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oIGIvVG9vbHMvRHVtcFJl
bmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmgKaW5kZXggMThkNWNhYi4uMjBjMzE5
ZiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hy
b21lLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21l
LmgKQEAgLTg2LDYgKzg2LDggQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyB2b2lkIG9uRnJhbWVD
cmVhdGVkKHZvaWQqLCBFdmFzX09iamVjdCosIHZvaWQqKTsKIAorICAgIHN0YXRpYyB2b2lkIG9u
RnJhbWVJY29uQ2hhbmdlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7CisKICAgICBzdGF0
aWMgdm9pZCBvbkZyYW1lUHJvdmlzaW9uYWxMb2FkKHZvaWQqLCBFdmFzX09iamVjdCosIHZvaWQq
KTsKIAogICAgIHN0YXRpYyB2b2lkIG9uRnJhbWVMb2FkQ29tbWl0dGVkKHZvaWQqLCBFdmFzX09i
amVjdCosIHZvaWQqKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>138495</attachid>
            <date>2012-04-23 22:38:06 -0700</date>
            <delta_ts>2012-04-26 03:37:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>84435_dumpIconChanges.patch</filename>
            <type>text/plain</type>
            <size>8998</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCBhNGQ3Y2QyLi44OTNiMDMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDQt
MjQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRlc3RDb250
cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFVuc2tpcCB0aGUgdGVzdCBjaGVja2luZyBmb3IgRHVtcFJlbmRlclRy
ZWUncyBzdXBwb3J0IGZvcgorICAgICAgICBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29u
Q2hhbmdlcygpIGluIEVGTCBwb3J0LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1NraXBwZWQ6
CisKIDIwMTItMDQtMjMgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAg
ICAgICAgTGF5b3V0IFRlc3QgcGxhdGZvcm0vY2hyb21pdW0vY29tcG9zaXRpbmcvZmlsdGVycy9i
YWNrZ3JvdW5kLWZpbHRlci1ibHVyLW91dHNldHMuaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3Jt
L2VmbC9Ta2lwcGVkCmluZGV4IDZmYTg4ODIuLjk4YTJmMmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9T
a2lwcGVkCkBAIC0yLDEwICsyLDYgQEAKICMgVGVzdHMgd2hpY2ggZGVwZW5kIG9uIGZlYXR1cmVz
IHdoaWNoIGhhdmUgbm90IGJlZW4gaW1wbGVtZW50ZWQgeWV0CiAjIC0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLSMg
TmVlZHMgQVBJIHRvIHJlY2VpdmUgbm90aWZpY2F0aW9ucyBhYm91dCBjaGFuZ2VkIGljb25zCi0j
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzgxMgotZmFzdC9kb20v
aWNvbi11cmwtcHJvcGVydHkuaHRtbAotCiAjIEVGTCdzIEV2ZW50U2VuZGVyIGRvZXMgbm90IGlt
cGxlbWVudCBkdW1wRmlsZW5hbWVCZWluZ0RyYWdnZWQKIGZhc3QvZXZlbnRzL2RyYWctaW1hZ2Ut
ZmlsZW5hbWUuaHRtbAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cg
Yi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggNzQ0M2ZmNS4uYjRmODQ2MSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv
ZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA0LTI0ICBDaHJpc3RvcGhlIER1
bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBF
RkwncyBEUlQgbmVlZHMgdG8gc3VwcG9ydCBMYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wSWNvbkNo
YW5nZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
ODQ0MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBF
bWl0IGEgImljb24sY2hhbmdlZCIgc2lnbmFsIHdoZW4gdGhlIG1haW4gZnJhbWUncyBpY29uIGhh
cyBjaGFuZ2VkLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRF
ZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNo
RGlkQ2hhbmdlSWNvbnMpOgorICAgICAgICAqIGV3ay9ld2tfZnJhbWUuaDoKKyAgICAgICAgKiBl
d2svZXdrX3ByaXZhdGUuaDoKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAo
X0V3a19WaWV3X1ByaXZhdGVfRGF0YSk6CisgICAgICAgIChld2tfdmlld19mcmFtZV9tYWluX2lj
b25fY2hhbmdlZCk6CisgICAgICAgICogZXdrL2V3a192aWV3Lmg6CisKIDIwMTItMDQtMjMgIENo
cmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBb
RUZMXSBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBpbXBsZW1lbnQgZWxlbWVu
dERvZXNBdXRvQ29tcGxldGVGb3JFbGVtZW50V2l0aElkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAKaW5kZXgg
OGVhYmMwMy4uYWRjNzcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1
cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dl
YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmNwcApAQCAtNTk3LDkgKzU5NywxMyBA
QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25z
dCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0aQogICAgIGV3a192aWV3X3RpdGxlX3NldChtX3ZpZXcs
IGNzLmRhdGEoKSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlk
Q2hhbmdlSWNvbnMoV2ViQ29yZTo6SWNvblR5cGUpCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZs
OjpkaXNwYXRjaERpZENoYW5nZUljb25zKFdlYkNvcmU6Okljb25UeXBlIGljb25UeXBlKQogewot
ICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgLy8gcmVwb3J0IHJlY2VpdmVkIGZhdmljb24gb25s
eSBmb3IgbWFpbiBmcmFtZS4KKyAgICBpZiAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3
KSAhPSBtX2ZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBld2tfdmlld19mcmFtZV9tYWlu
X2ljb25fY2hhbmdlZChtX3ZpZXcsIGljb25UeXBlKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlckNs
aWVudEVmbDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvZWZsL2V3ay9ld2tfZnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUu
aAppbmRleCA0MDlhMDExLi41MmQwZTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9l
d2svZXdrX2ZyYW1lLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCkBA
IC0xMzAsNiArMTMwLDE0IEBAIHN0cnVjdCBfRXdrX0ZyYW1lX1hzc19Ob3RpZmljYXRpb24gewog
ICAgIEVpbmFfQm9vbCBpc19lbnRpcmVfcGFnZV9ibG9ja2VkOyAvKiogPCBpbmRpY2F0ZXMgaWYg
dGhlIGVudGlyZSBwYWdlIHdhcyBibG9ja2VkIGJ5IFhTU0F1ZGl0b3IgKi8KIH07CiAKKy8vLyBF
bnVtIGNvbnRhaW5pbmcgaWNvbiB0eXBlcwordHlwZWRlZiBlbnVtICB7CisgICAgRVdLX0lDT05f
SU5WQUxJRCA9IDAsCisgICAgRVdLX0lDT05fRkFWID0gMSwKKyAgICBFV0tfSUNPTl9UT1VDSCA9
IDEgPDwgMSwKKyAgICBFV0tfSUNPTl9UT1VDSF9QUkVDT01QT1NFRCA9IDEgPDwgMgorfSBFd2tf
SWNvbl9UeXBlOworCiAvLy8gRW51bSBjb250YWluaW5nIGhpdCB0ZXN0IGRhdGEgdHlwZXMKIHR5
cGVkZWYgZW51bSB7CiAgICAgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0RPQ1VNRU5UID0g
MSA8PCAxLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgg
Yi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAppbmRleCBmNGI5OWFjZS4uOGM3
NzJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKKysr
IGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKQEAgLTExNCw2ICsxMTQsNyBA
QCB2b2lkIGV3a192aWV3X2xvYWRfc3RhcnRlZChFdmFzX09iamVjdCogZXdrVmlldywgRXZhc19P
YmplY3QqIGV3a0ZyYW1lKTsKIHZvaWQgZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25hbChFdmFzX09i
amVjdCogZXdrVmlldyk7CiB2b2lkIGV3a192aWV3X2ZyYW1lX21haW5fbG9hZF9zdGFydGVkKEV2
YXNfT2JqZWN0KiBld2tWaWV3KTsKIHZvaWQgZXdrX3ZpZXdfZnJhbWVfbWFpbl9jbGVhcmVkKEV2
YXNfT2JqZWN0KiBld2tWaWV3KTsKK3ZvaWQgZXdrX3ZpZXdfZnJhbWVfbWFpbl9pY29uX2NoYW5n
ZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIFdlYkNvcmU6Okljb25UeXBlIGljb25UeXBlKTsKIHZv
aWQgZXdrX3ZpZXdfZnJhbWVfbWFpbl9pY29uX3JlY2VpdmVkKEV2YXNfT2JqZWN0KiBld2tWaWV3
KTsKIHZvaWQgZXdrX3ZpZXdfbG9hZF9maW5pc2hlZChFdmFzX09iamVjdCogZXdrVmlldywgY29u
c3QgRXdrX0ZyYW1lX0xvYWRfRXJyb3IqIGVycm9yKTsKIHZvaWQgZXdrX3ZpZXdfbG9hZF9lcnJv
cihFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgRXdrX0ZyYW1lX0xvYWRfRXJyb3IqIGVycm9y
KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9Tb3Vy
Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCmluZGV4IGY3ZjkzZDkuLmFmMDJlY2QgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvU291cmNl
L1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcApAQCAtMjkwMSw2ICsyOTAxLDIxIEBAIHZvaWQg
ZXdrX3ZpZXdfZnJhbWVfbWFpbl9jbGVhcmVkKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogCiAvKioK
ICAqIEBpbnRlcm5hbAorICogUmVwb3J0cyB0aGUgbWFpbiBmcmFtZSBpY29uIGNoYW5nZWQuCisg
KgorICogQHBhcmFtIGV3a1ZpZXcgVmlldy4KKyAqCisgKiBFbWl0cyBzaWduYWw6ICJpY29uLGNo
YW5nZWQiIHdpdGggcG9pbnRlciB0byBhIEV3a19JY29uX1R5cGUuCisgKi8KK3ZvaWQgZXdrX3Zp
ZXdfZnJhbWVfbWFpbl9pY29uX2NoYW5nZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcsICBXZWJDb3Jl
OjpJY29uVHlwZSBpY29uVHlwZSkKK3sKKyAgICBEQkcoImV3a1ZpZXc9JXAsIGljb25UeXBlPSVk
IiwgZXdrVmlldywgaWNvblR5cGUpOworICAgIEV2YXNfT2JqZWN0KiBmcmFtZSA9IGV3a192aWV3
X2ZyYW1lX21haW5fZ2V0KGV3a1ZpZXcpOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr
X2NhbGwoZnJhbWUsICJpY29uLGNoYW5nZWQiLCAmaWNvblR5cGUpOworfQorCisvKioKKyAqIEBp
bnRlcm5hbAogICogUmVwb3J0cyB0aGUgbWFpbiBmcmFtZSByZWNlaXZlZCBhbiBpY29uLgogICoK
ICAqIEBwYXJhbSBld2tWaWV3IFZpZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9l
d2svZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmluZGV4IGYy
ZjBiZTEuLmI3ZjZiYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmll
dy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCkBAIC00Myw2ICs0Myw3
IEBACiAgKiAgLSAiZWRpdG9yY2xpZW50LGNvbnRlbnRzLGNoYW5nZWQiLCB2b2lkOiByZXBvcnRz
IHRvIHRoZSB2aWV3IHRoYXQgZWRpdG9yCiAgKiAgICBjbGllbnQncyBjb250ZW50cyB3ZXJlIGNo
YW5nZWQKICAqICAtICJmcmFtZSxjcmVhdGVkIiwgRXZhc19PYmplY3QqOiBhIG5ldyBmcmFtZSBp
cyBjcmVhdGVkLgorICogIC0gImljb24sY2hhbmdlZCIsIEV3a19JY29uX1R5cGUqOiBhIG1haW4g
ZnJhbWUgaWNvbiBjaGFuZ2VkLgogICogIC0gImljb24scmVjZWl2ZWQiLCB2b2lkOiBtYWluIGZy
YW1lIHJlY2VpdmVkIGFuIGljb24uCiAgKiAgLSAiaW5wdXRtZXRob2QsY2hhbmdlZCIsIEVpbmFf
Qm9vbDogcmVwb3J0cyB0aGF0IGlucHV0IG1ldGhvZCB3YXMgY2hhbmdlZCBhbmQKICAqICAgIGl0
IGdpdmVzIGEgYm9vbGVhbiB2YWx1ZSB3aGV0aGVyIGl0J3MgZW5hYmxlZCBvciBub3QgYXMgYW4g
YXJndW1lbnQuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK
aW5kZXggNzk5MzVjNS4uYjIyM2ZmYSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi
L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA0LTI0ICBDaHJpc3RvcGhl
IER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJU
XSBFRkwncyBEUlQgbmVlZHMgdG8gc3VwcG9ydCBMYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wSWNv
bkNoYW5nZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9ODQ0MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBDYXRjaCB0aGUgImljb24sY2hhbmdlZCIgc2lnbmFsIG9uIHRoZSBtYWluIGZyYW1lIGluIEVG
TCdzIERSVCB0bworICAgICAgICBzdXBwb3J0IExheW91dFRlc3RDb250cm9sbGVyJ3MgZHVtcElj
b25DaGFuZ2VzKCkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRy
ZWVDaHJvbWUuY3BwOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVDaHJvbWU6OmNyZWF0ZVZpZXcp
OgorICAgICAgICAoRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9uRnJhbWVJY29uQ2hhbmdlZCk6Cisg
ICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmg6CisgICAg
ICAgIChEdW1wUmVuZGVyVHJlZUNocm9tZSk6CisKIDIwMTItMDQtMjMgIEVyaXEgQXVndXN0aW5l
ICA8ZWF1Z3VzdGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldHVybiB2YWx1ZSBmcm9tIGV4
ZWN1dGVkIHNjcmlwdCBpbiBDaHJvbWl1bS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJU
cmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9l
ZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCmluZGV4IDE5NzAyMTEuLmU2YjNkYjEgMTAwNjQ0
Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAK
KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApA
QCAtMTAxLDYgKzEwMSw3IEBAIEV2YXNfT2JqZWN0KiBEdW1wUmVuZGVyVHJlZUNocm9tZTo6Y3Jl
YXRlVmlldygpIGNvbnN0CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHZpZXcs
ICJmcmFtZSxjcmVhdGVkIiwgb25GcmFtZUNyZWF0ZWQsIDApOwogCiAgICAgRXZhc19PYmplY3Qq
IG1haW5GcmFtZSA9IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KHZpZXcpOworICAgIGV2YXNfb2Jq
ZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChtYWluRnJhbWUsICJpY29uLGNoYW5nZWQiLCBvbkZyYW1l
SWNvbkNoYW5nZWQsIDApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChtYWlu
RnJhbWUsICJsb2FkLHByb3Zpc2lvbmFsIiwgb25GcmFtZVByb3Zpc2lvbmFsTG9hZCwgMCk7CiAg
ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1haW5GcmFtZSwgImxvYWQsY29tbWl0
dGVkIiwgb25GcmFtZUxvYWRDb21taXR0ZWQsIDApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2Nh
bGxiYWNrX2FkZChtYWluRnJhbWUsICJsb2FkLGZpbmlzaGVkIiwgb25GcmFtZUxvYWRGaW5pc2hl
ZCwgMCk7CkBAIC0yODUsNiArMjg2LDE0IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9u
U3RhdHVzYmFyVGV4dFNldCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKiBldmVudEluCiAgICAg
cHJpbnRmKCJVSSBERUxFR0FURSBTVEFUVVMgQ0FMTEJBQ0s6IHNldFN0YXR1c1RleHQ6JXNcbiIs
IHN0YXR1c2JhclRleHQpOwogfQogCit2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpvbkZyYW1l
SWNvbkNoYW5nZWQodm9pZCosIEV2YXNfT2JqZWN0KiBmcmFtZSwgdm9pZCopCit7CisgICAgaWYg
KCFkb25lICYmIGdMYXlvdXRUZXN0Q29udHJvbGxlci0+ZHVtcEljb25DaGFuZ2VzKCkpIHsKKyAg
ICAgICAgY29uc3QgU3RyaW5nIGZyYW1lTmFtZShEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnN1
aXRhYmxlRFJURnJhbWVOYW1lKGZyYW1lKSk7CisgICAgICAgIHByaW50ZigiJXMgLSBkaWRDaGFu
Z2VJY29uc1xuIiwgZnJhbWVOYW1lLnV0ZjgoKS5kYXRhKCkpOworICAgIH0KK30KKwogdm9pZCBE
dW1wUmVuZGVyVHJlZUNocm9tZTo6b25UaXRsZUNoYW5nZWQodm9pZCosIEV2YXNfT2JqZWN0Kiwg
dm9pZCogZXZlbnRJbmZvKQogewogICAgIGlmICghZ0xheW91dFRlc3RDb250cm9sbGVyLT5kdW1w
VGl0bGVDaGFuZ2VzKCkpCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVt
cFJlbmRlclRyZWVDaHJvbWUuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVy
VHJlZUNocm9tZS5oCmluZGV4IDE4ZDVjYWIuLjIwYzMxOWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1
bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oCisrKyBiL1Rvb2xzL0R1bXBS
ZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oCkBAIC04Niw2ICs4Niw4IEBAIHBy
aXZhdGU6CiAKICAgICBzdGF0aWMgdm9pZCBvbkZyYW1lQ3JlYXRlZCh2b2lkKiwgRXZhc19PYmpl
Y3QqLCB2b2lkKik7CiAKKyAgICBzdGF0aWMgdm9pZCBvbkZyYW1lSWNvbkNoYW5nZWQodm9pZCos
IEV2YXNfT2JqZWN0Kiwgdm9pZCopOworCiAgICAgc3RhdGljIHZvaWQgb25GcmFtZVByb3Zpc2lv
bmFsTG9hZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7CiAKICAgICBzdGF0aWMgdm9pZCBv
bkZyYW1lTG9hZENvbW1pdHRlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>138965</attachid>
            <date>2012-04-26 03:37:08 -0700</date>
            <delta_ts>2012-05-07 00:51:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>84435_dumpIconChanges.patch</filename>
            <type>text/plain</type>
            <size>10354</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA5NjY4OWIxLi40NTMyOWRlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDQt
MjYgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRlc3RDb250
cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFVuc2tpcCB0aGUgdGVzdCBjaGVja2luZyBmb3IgRHVtcFJlbmRlclRy
ZWUncyBzdXBwb3J0IGZvcgorICAgICAgICBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29u
Q2hhbmdlcygpIGluIEVGTCBwb3J0LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1NraXBwZWQ6
CisKIDIwMTItMDQtMjYgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CiAKICAg
ICAgICAgQ3Jhc2ggd2hlbiBjb2xsZWN0aW5nIHN2ZyBzeW1ib2wgZWxlbWVudCBpbiBuYW1lZCBm
bG93LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQgYi9MYXlv
dXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRleCAxMGQzY2UxLi42ZjYwNDc2IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtMiwxMCArMiw2IEBACiAjIFRlc3RzIHdoaWNoIGRl
cGVuZCBvbiBmZWF0dXJlcyB3aGljaCBoYXZlIG5vdCBiZWVuIGltcGxlbWVudGVkIHlldAogIyAt
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLQogCi0jIE5lZWRzIEFQSSB0byByZWNlaXZlIG5vdGlmaWNhdGlvbnMgYWJvdXQg
Y2hhbmdlZCBpY29ucwotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MzM4MTIKLWZhc3QvZG9tL2ljb24tdXJsLXByb3BlcnR5Lmh0bWwKLQogIyBFRkwncyBFdmVudFNl
bmRlciBkb2VzIG5vdCBpbXBsZW1lbnQgZHVtcEZpbGVuYW1lQmVpbmdEcmFnZ2VkCiBmYXN0L2V2
ZW50cy9kcmFnLWltYWdlLWZpbGVuYW1lLmh0bWwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9lZmwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IDE0OWI3
OTYuLmZlYjQ3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAxMi0wNC0y
NiAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCisgICAg
ICAgIFtFRkxdW0RSVF0gRUZMJ3MgRFJUIG5lZWRzIHRvIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRy
b2xsZXIuZHVtcEljb25DaGFuZ2VzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTg0NDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgRW1pdCBhICJpY29uLGNoYW5nZWQiIHNpZ25hbCB3aGVuIHRoZSBtYWlu
IGZyYW1lJ3MgaWNvbiBoYXMgY2hhbmdlZC4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Fz
c2VydE1hdGNoaW5nRW51bXMuY3BwOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h
ZGVyQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZs
OjpkaXNwYXRjaERpZENoYW5nZUljb25zKToKKyAgICAgICAgKiBld2svZXdrX2ZyYW1lLmg6Cisg
ICAgICAgICogZXdrL2V3a19wcml2YXRlLmg6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoK
KyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoZXdrX3ZpZXdfZnJh
bWVfbWFpbl9pY29uX2NoYW5nZWQpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOgorCisyMDEy
LTA0LTI2ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisK
ICAgICAgICAgW0VGTF1bRFJUXSAicmVzb3VyY2UscmVxdWVzdCx3aWxsc2VuZCIgc2lnbmFsIG5l
ZWRzIHRvIHByb3ZpZGUgbW9yZSBpbmZvcm1hdGlvbgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ2NzAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9lZmwvV2ViQ29yZVN1cHBvcnQvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAgYi9Tb3VyY2UvV2Vi
S2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAppbmRleCA0YTQ5
ZjVmLi4yN2YxMGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9y
dC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl
U3VwcG9ydC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcApAQCAtMjQsNiArMjQsNyBAQAogI2luY2x1
ZGUgImNvbmZpZy5oIgogCiAjaW5jbHVkZSAiQ29udGV4dE1lbnVJdGVtLmgiCisjaW5jbHVkZSAi
SWNvblVSTC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJWaXNpYmxlU2VsZWN0aW9u
LmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRtZW51LmgiCkBAIC02Niw2ICs2NywxMSBAQCBDT01Q
SUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19WSUVXX01PREVfRlVMTFNDUkVFTiwgUGFnZTo6
Vmlld01vZGVGdWxsc2NyZWVuKQogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfVklF
V19NT0RFX01BWElNSVpFRCwgUGFnZTo6Vmlld01vZGVNYXhpbWl6ZWQpOwogQ09NUElMRV9BU1NF
UlRfTUFUQ0hJTkdfRU5VTShFV0tfVklFV19NT0RFX01JTklNSVpFRCwgUGFnZTo6Vmlld01vZGVN
aW5pbWl6ZWQpOwogCitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19JQ09OX0lOVkFM
SUQsIEludmFsaWRJY29uKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0lDT05f
RkFWLCBGYXZpY29uKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0lDT05fVE9V
Q0gsIFRvdWNoSWNvbik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19JQ09OX1RP
VUNIX1BSRUNPTVBPU0VELCBUb3VjaFByZWNvbXBvc2VkSWNvbik7CisKICNpZiBFTkFCTEUoQ09O
VEVYVF9NRU5VUykKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPTlRFWFRfTUVO
VV9JVEVNX1RBR19OT19BQ1RJT04sIENvbnRleHRNZW51SXRlbVRhZ05vQWN0aW9uKTsKIENPTVBJ
TEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PUEVOX0xJ
TktfSU5fTkVXX1dJTkRPVywgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJbk5ld1dpbmRvdyk7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl
ckNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv
YWRlckNsaWVudEVmbC5jcHAKaW5kZXggMjAxYjFiNC4uM2NlMjg3MSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCisr
KyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZs
LmNwcApAQCAtNjE1LDkgKzYxNSwxMyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNw
YXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0aQogICAgIGV3
a192aWV3X3RpdGxlX3NldChtX3ZpZXcsIGNzLmRhdGEoKSk7CiB9CiAKLXZvaWQgRnJhbWVMb2Fk
ZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkQ2hhbmdlSWNvbnMoV2ViQ29yZTo6SWNvblR5cGUpCit2
b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENoYW5nZUljb25zKFdlYkNvcmU6
Okljb25UeXBlIGljb25UeXBlKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgLy8gcmVw
b3J0IHJlY2VpdmVkIGZhdmljb24gb25seSBmb3IgbWFpbiBmcmFtZS4KKyAgICBpZiAoZXdrX3Zp
ZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KSAhPSBtX2ZyYW1lKQorICAgICAgICByZXR1cm47CisK
KyAgICBld2tfdmlld19mcmFtZV9tYWluX2ljb25fY2hhbmdlZChtX3ZpZXcsIGljb25UeXBlKTsK
IH0KIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaCBiL1NvdXJjZS9X
ZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaAppbmRleCBiMTY4N2FiLi5jZTQ1Y2NhIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKKysrIGIvU291cmNlL1dlYktp
dC9lZmwvZXdrL2V3a19mcmFtZS5oCkBAIC0xNTMsNiArMTUzLDE0IEBAIHN0cnVjdCBfRXdrX0Zy
YW1lX1hzc19Ob3RpZmljYXRpb24gewogICAgIEVpbmFfQm9vbCBpc19lbnRpcmVfcGFnZV9ibG9j
a2VkOyAvKiogPCBpbmRpY2F0ZXMgaWYgdGhlIGVudGlyZSBwYWdlIHdhcyBibG9ja2VkIGJ5IFhT
U0F1ZGl0b3IgKi8KIH07CiAKKy8vLyBFbnVtIGNvbnRhaW5pbmcgaWNvbiB0eXBlcwordHlwZWRl
ZiBlbnVtICB7CisgICAgRVdLX0lDT05fSU5WQUxJRCA9IDAsCisgICAgRVdLX0lDT05fRkFWID0g
MSwKKyAgICBFV0tfSUNPTl9UT1VDSCA9IDEgPDwgMSwKKyAgICBFV0tfSUNPTl9UT1VDSF9QUkVD
T01QT1NFRCA9IDEgPDwgMgorfSBFd2tfSWNvbl9UeXBlOworCiAvLy8gRW51bSBjb250YWluaW5n
IGhpdCB0ZXN0IGRhdGEgdHlwZXMKIHR5cGVkZWYgZW51bSB7CiAgICAgRVdLX0hJVF9URVNUX1JF
U1VMVF9DT05URVhUX0RPQ1VNRU5UID0gMSA8PCAxLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9lZmwvZXdrL2V3a19wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZh
dGUuaAppbmRleCA0ODA4Njg0Li44NDUzN2Q1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Vm
bC9ld2svZXdrX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZh
dGUuaApAQCAtMTE0LDYgKzExNCw3IEBAIHZvaWQgZXdrX3ZpZXdfbG9hZF9zdGFydGVkKEV2YXNf
T2JqZWN0KiBld2tWaWV3LCBFdmFzX09iamVjdCogZXdrRnJhbWUpOwogdm9pZCBld2tfdmlld19s
b2FkX3Byb3Zpc2lvbmFsKEV2YXNfT2JqZWN0KiBld2tWaWV3KTsKIHZvaWQgZXdrX3ZpZXdfZnJh
bWVfbWFpbl9sb2FkX3N0YXJ0ZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpOwogdm9pZCBld2tfdmll
d19mcmFtZV9tYWluX2NsZWFyZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpOwordm9pZCBld2tfdmll
d19mcmFtZV9tYWluX2ljb25fY2hhbmdlZChFdmFzX09iamVjdCogZXdrVmlldywgV2ViQ29yZTo6
SWNvblR5cGUgaWNvblR5cGUpOwogdm9pZCBld2tfdmlld19mcmFtZV9tYWluX2ljb25fcmVjZWl2
ZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpOwogdm9pZCBld2tfdmlld19sb2FkX2ZpbmlzaGVkKEV2
YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBFd2tfRnJhbWVfTG9hZF9FcnJvciogZXJyb3IpOwog
dm9pZCBld2tfdmlld19sb2FkX2Vycm9yKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBFd2tf
RnJhbWVfTG9hZF9FcnJvciogZXJyb3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwv
ZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5k
ZXggZjdmOTNkOS4uYmVkMDcxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3
a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0y
OTAxLDYgKzI5MDEsMjIgQEAgdm9pZCBld2tfdmlld19mcmFtZV9tYWluX2NsZWFyZWQoRXZhc19P
YmplY3QqIGV3a1ZpZXcpCiAKIC8qKgogICogQGludGVybmFsCisgKiBSZXBvcnRzIHRoZSBtYWlu
IGZyYW1lIGljb24gY2hhbmdlZC4KKyAqCisgKiBAcGFyYW0gZXdrVmlldyBWaWV3LgorICoKKyAq
IEVtaXRzIHNpZ25hbDogImljb24sY2hhbmdlZCIgd2l0aCBwb2ludGVyIHRvIGEgRXdrX0ljb25f
VHlwZS4KKyAqLwordm9pZCBld2tfdmlld19mcmFtZV9tYWluX2ljb25fY2hhbmdlZChFdmFzX09i
amVjdCogZXdrVmlldywgIFdlYkNvcmU6Okljb25UeXBlIGljb25UeXBlKQoreworICAgIERCRygi
ZXdrVmlldz0lcCwgaWNvblR5cGU9JWQiLCBld2tWaWV3LCBpY29uVHlwZSk7CisgICAgRXZhc19P
YmplY3QqIGZyYW1lID0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQoZXdrVmlldyk7CisgICAgRXdr
X0ljb25fVHlwZSBld2tJY29uVHlwZSA9IHN0YXRpY19jYXN0PEV3a19JY29uX1R5cGU+KGljb25U
eXBlKTsKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGZyYW1lLCAiaWNvbixj
aGFuZ2VkIiwgJmV3a0ljb25UeXBlKTsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKICAqIFJlcG9y
dHMgdGhlIG1haW4gZnJhbWUgcmVjZWl2ZWQgYW4gaWNvbi4KICAqCiAgKiBAcGFyYW0gZXdrVmll
dyBWaWV3LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9T
b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCA0MmM0ZDI4Li4wMzhjYzU1IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2Uv
V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtNDMsNiArNDMsNyBAQAogICogIC0gImVkaXRv
cmNsaWVudCxjb250ZW50cyxjaGFuZ2VkIiwgdm9pZDogcmVwb3J0cyB0byB0aGUgdmlldyB0aGF0
IGVkaXRvcgogICogICAgY2xpZW50J3MgY29udGVudHMgd2VyZSBjaGFuZ2VkCiAgKiAgLSAiZnJh
bWUsY3JlYXRlZCIsIEV2YXNfT2JqZWN0KjogYSBuZXcgZnJhbWUgaXMgY3JlYXRlZC4KKyAqICAt
ICJpY29uLGNoYW5nZWQiLCBFd2tfSWNvbl9UeXBlKjogYSBtYWluIGZyYW1lIGljb24gY2hhbmdl
ZC4KICAqICAtICJpY29uLHJlY2VpdmVkIiwgdm9pZDogbWFpbiBmcmFtZSByZWNlaXZlZCBhbiBp
Y29uLgogICogIC0gImlucHV0bWV0aG9kLGNoYW5nZWQiLCBFaW5hX0Jvb2w6IHJlcG9ydHMgdGhh
dCBpbnB1dCBtZXRob2Qgd2FzIGNoYW5nZWQgYW5kCiAgKiAgICBpdCBnaXZlcyBhIGJvb2xlYW4g
dmFsdWUgd2hldGhlciBpdCdzIGVuYWJsZWQgb3Igbm90IGFzIGFuIGFyZ3VtZW50LgpkaWZmIC0t
Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGU5Y2Y4ODIuLjlj
MWRkNzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxOSBAQAorMjAxMi0wNC0yNiAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9w
aGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW0RSVF0gRUZMJ3MgRFJUIG5lZWRz
IHRvIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEljb25DaGFuZ2VzKCkKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDM1CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2F0Y2ggdGhlICJpY29u
LGNoYW5nZWQiIHNpZ25hbCBvbiB0aGUgbWFpbiBmcmFtZSBpbiBFRkwncyBEUlQgdG8KKyAgICAg
ICAgc3VwcG9ydCBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29uQ2hhbmdlcygpLgorCisg
ICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcDoKKyAg
ICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21lOjpjcmVhdGVWaWV3KToKKyAgICAgICAgKER1bXBS
ZW5kZXJUcmVlQ2hyb21lOjpvbkZyYW1lSWNvbkNoYW5nZWQpOgorICAgICAgICAqIER1bXBSZW5k
ZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oOgorICAgICAgICAoRHVtcFJlbmRlclRy
ZWVDaHJvbWUpOgorCiAyMDEyLTA0LTI2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA
aWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBTa2lwIHVuaXQgdGVzdCBmYWlsaW5n
IGluIGRlYnVnIGJvdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1w
UmVuZGVyVHJlZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRl
clRyZWVDaHJvbWUuY3BwCmluZGV4IDk2NDNjYTcuLjVkNGI5ODAgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKKysrIGIvVG9vbHMv
RHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApAQCAtMTAxLDYgKzEw
MSw3IEBAIEV2YXNfT2JqZWN0KiBEdW1wUmVuZGVyVHJlZUNocm9tZTo6Y3JlYXRlVmlldygpIGNv
bnN0CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHZpZXcsICJmcmFtZSxjcmVh
dGVkIiwgb25GcmFtZUNyZWF0ZWQsIDApOwogCiAgICAgRXZhc19PYmplY3QqIG1haW5GcmFtZSA9
IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KHZpZXcpOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2Nh
bGxiYWNrX2FkZChtYWluRnJhbWUsICJpY29uLGNoYW5nZWQiLCBvbkZyYW1lSWNvbkNoYW5nZWQs
IDApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChtYWluRnJhbWUsICJsb2Fk
LHByb3Zpc2lvbmFsIiwgb25GcmFtZVByb3Zpc2lvbmFsTG9hZCwgMCk7CiAgICAgZXZhc19vYmpl
Y3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1haW5GcmFtZSwgImxvYWQsY29tbWl0dGVkIiwgb25GcmFt
ZUxvYWRDb21taXR0ZWQsIDApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZCht
YWluRnJhbWUsICJsb2FkLGZpbmlzaGVkIiwgb25GcmFtZUxvYWRGaW5pc2hlZCwgMCk7CkBAIC0z
NzUsNiArMzc2LDE0IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9uU3RhdHVzYmFyVGV4
dFNldCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKiBldmVudEluCiAgICAgcHJpbnRmKCJVSSBE
RUxFR0FURSBTVEFUVVMgQ0FMTEJBQ0s6IHNldFN0YXR1c1RleHQ6JXNcbiIsIHN0YXR1c2JhclRl
eHQpOwogfQogCit2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpvbkZyYW1lSWNvbkNoYW5nZWQo
dm9pZCosIEV2YXNfT2JqZWN0KiBmcmFtZSwgdm9pZCopCit7CisgICAgaWYgKCFkb25lICYmIGdM
YXlvdXRUZXN0Q29udHJvbGxlci0+ZHVtcEljb25DaGFuZ2VzKCkpIHsKKyAgICAgICAgY29uc3Qg
U3RyaW5nIGZyYW1lTmFtZShEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnN1aXRhYmxlRFJURnJh
bWVOYW1lKGZyYW1lKSk7CisgICAgICAgIHByaW50ZigiJXMgLSBkaWRDaGFuZ2VJY29uc1xuIiwg
ZnJhbWVOYW1lLnV0ZjgoKS5kYXRhKCkpOworICAgIH0KK30KKwogdm9pZCBEdW1wUmVuZGVyVHJl
ZUNocm9tZTo6b25UaXRsZUNoYW5nZWQodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCogZXZlbnRJ
bmZvKQogewogICAgIGlmICghZ0xheW91dFRlc3RDb250cm9sbGVyLT5kdW1wVGl0bGVDaGFuZ2Vz
KCkpCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVD
aHJvbWUuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5o
CmluZGV4IDE4ZDVjYWIuLjIwYzMxOWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl
L2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Vm
bC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oCkBAIC04Niw2ICs4Niw4IEBAIHByaXZhdGU6CiAKICAg
ICBzdGF0aWMgdm9pZCBvbkZyYW1lQ3JlYXRlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7
CiAKKyAgICBzdGF0aWMgdm9pZCBvbkZyYW1lSWNvbkNoYW5nZWQodm9pZCosIEV2YXNfT2JqZWN0
Kiwgdm9pZCopOworCiAgICAgc3RhdGljIHZvaWQgb25GcmFtZVByb3Zpc2lvbmFsTG9hZCh2b2lk
KiwgRXZhc19PYmplY3QqLCB2b2lkKik7CiAKICAgICBzdGF0aWMgdm9pZCBvbkZyYW1lTG9hZENv
bW1pdHRlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>140487</attachid>
            <date>2012-05-07 00:51:04 -0700</date>
            <delta_ts>2012-05-07 22:41:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>84435_dumpIconChanges.patch</filename>
            <type>text/plain</type>
            <size>11210</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA0MDBiODRlLi5mNWI5ZGZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDUt
MDcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRlc3RDb250
cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFVuc2tpcCB0aGUgdGVzdCBjaGVja2luZyBmb3IgRHVtcFJlbmRlclRy
ZWUncyBzdXBwb3J0IGZvcgorICAgICAgICBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29u
Q2hhbmdlcygpIGluIEVGTCBwb3J0LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1NraXBwZWQ6
CisKIDIwMTItMDUtMDYgIEtyaXN0w7NmIEtvc3p0ecOzICA8a2tyaXN0b2ZAaW5mLnUtc3plZ2Vk
Lmh1PgogCiAgICAgICAgIFtRdF0gTmV3IHRlc3QgaW50cm9kdWNlZCBpbiByMTE2MjU1IGlzIGZh
aWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVkIGIvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKaW5kZXggYmI1Mzc4Ny4uMDYyMjAzZiAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKKysrIGIvTGF5b3V0VGVz
dHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKQEAgLTIsMTAgKzIsNiBAQAogIyBUZXN0cyB3aGljaCBk
ZXBlbmQgb24gZmVhdHVyZXMgd2hpY2ggaGF2ZSBub3QgYmVlbiBpbXBsZW1lbnRlZCB5ZXQKICMg
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0KIAotIyBOZWVkcyBBUEkgdG8gcmVjZWl2ZSBub3RpZmljYXRpb25zIGFib3V0
IGNoYW5nZWQgaWNvbnMKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTMzODEyCi1mYXN0L2RvbS9pY29uLXVybC1wcm9wZXJ0eS5odG1sCi0KICMgRUZMJ3MgRXZlbnRT
ZW5kZXIgZG9lcyBub3QgaW1wbGVtZW50IGR1bXBGaWxlbmFtZUJlaW5nRHJhZ2dlZAogZmFzdC9l
dmVudHMvZHJhZy1pbWFnZS1maWxlbmFtZS5odG1sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCA0ZGVh
YmU5Li5kYzA2NTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysr
IGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTItMDUt
MDcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRlc3RDb250
cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEVtaXQgYSAiaWNvbixjaGFuZ2VkIiBzaWduYWwgd2hlbiB0aGUgZnJh
bWUgd2hlbiBvbmUgb2YgaXRzIGljb25zIGhhcworICAgICAgICBjaGFuZ2VkLiBDbGFyaWZ5IHRo
YXQgdGhlICJpY29uLGxvYWRlZCIgc2lnbmFsIGlzIG9ubHkgZW1pdHRlZCBmb3IgdGhlCisgICAg
ICAgIG1haW4gZnJhbWUuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGlu
Z0VudW1zLmNwcDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVm
bC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hE
aWRSZWNlaXZlSWNvbik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6
ZGlzcGF0Y2hEaWRDaGFuZ2VJY29ucyk6CisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6Cisg
ICAgICAgIChld2tfZnJhbWVfaWNvbl9jaGFuZ2VkKToKKyAgICAgICAgKiBld2svZXdrX2ZyYW1l
Lmg6CisgICAgICAgICogZXdrL2V3a19wcml2YXRlLmg6CisKIDIwMTItMDUtMDYgIE1pa2hhaWwg
UG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CiAKICAgICAgICAgW0VG
TF0gRUZMJ3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgc2V0SmF2YVNjcmlwdENhbkFjY2Vzc0NsaXBi
b2FyZCBpbXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29y
ZVN1cHBvcnQvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJD
b3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAppbmRleCA0YTQ5ZjVmLi4yN2YxMGY3
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9Bc3NlcnRNYXRj
aGluZ0VudW1zLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9Bc3Nl
cnRNYXRjaGluZ0VudW1zLmNwcApAQCAtMjQsNiArMjQsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5o
IgogCiAjaW5jbHVkZSAiQ29udGV4dE1lbnVJdGVtLmgiCisjaW5jbHVkZSAiSWNvblVSTC5oIgog
I2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJWaXNpYmxlU2VsZWN0aW9uLmgiCiAjaW5jbHVk
ZSAiZXdrX2NvbnRleHRtZW51LmgiCkBAIC02Niw2ICs2NywxMSBAQCBDT01QSUxFX0FTU0VSVF9N
QVRDSElOR19FTlVNKEVXS19WSUVXX01PREVfRlVMTFNDUkVFTiwgUGFnZTo6Vmlld01vZGVGdWxs
c2NyZWVuKQogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfVklFV19NT0RFX01BWElN
SVpFRCwgUGFnZTo6Vmlld01vZGVNYXhpbWl6ZWQpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdf
RU5VTShFV0tfVklFV19NT0RFX01JTklNSVpFRCwgUGFnZTo6Vmlld01vZGVNaW5pbWl6ZWQpOwog
CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19JQ09OX0lOVkFMSUQsIEludmFsaWRJ
Y29uKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0lDT05fRkFWLCBGYXZpY29u
KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0lDT05fVE9VQ0gsIFRvdWNoSWNv
bik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19JQ09OX1RPVUNIX1BSRUNPTVBP
U0VELCBUb3VjaFByZWNvbXBvc2VkSWNvbik7CisKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykK
IENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19O
T19BQ1RJT04sIENvbnRleHRNZW51SXRlbVRhZ05vQWN0aW9uKTsKIENPTVBJTEVfQVNTRVJUX01B
VENISU5HX0VOVU0oRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PUEVOX0xJTktfSU5fTkVXX1dJ
TkRPVywgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJbk5ld1dpbmRvdyk7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5j
cHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVm
bC5jcHAKaW5kZXggZWE5MzAyMi4uOGViNzQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9l
ZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9X
ZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmNwcApAQCAtNTk2
LDkgKzU5Niw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoV2lsbENsb3Nl
KCkKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbigp
CiB7Ci0gICAgLyogcmVwb3J0IHJlY2VpdmVkIGZhdmljb24gb25seSBmb3IgbWFpbiBmcmFtZS4g
Ki8KLSAgICBpZiAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KSAhPSBtX2ZyYW1lKQot
ICAgICAgICByZXR1cm47CisgICAgLy8gSWNvbkNvbnRyb2xsZXIgbG9hZHMgaWNvbnMgb25seSBm
b3IgdGhlIG1haW4gZnJhbWUuCisgICAgQVNTRVJUKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1f
dmlldykgPT0gbV9mcmFtZSk7CiAKICAgICBld2tfdmlld19mcmFtZV9tYWluX2ljb25fcmVjZWl2
ZWQobV92aWV3KTsKIH0KQEAgLTYyMSw5ICs2MjAsOSBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50
RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0
aQogICAgIGV3a192aWV3X3RpdGxlX3NldChtX3ZpZXcsIGNzLmRhdGEoKSk7CiB9CiAKLXZvaWQg
RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkQ2hhbmdlSWNvbnMoV2ViQ29yZTo6SWNv
blR5cGUpCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENoYW5nZUljb25z
KFdlYkNvcmU6Okljb25UeXBlIGljb25UeXBlKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Cisg
ICAgZXdrX2ZyYW1lX2ljb25fY2hhbmdlZChtX2ZyYW1lLCBpY29uVHlwZSk7CiB9CiAKIHZvaWQg
RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZs
L2V3ay9ld2tfZnJhbWUuY3BwCmluZGV4IDI0YTEyZWEuLmExYzAzYTkgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZs
L2V3ay9ld2tfZnJhbWUuY3BwCkBAIC0xNzI0LDYgKzE3MjQsMjIgQEAgRXdrX0NlcnRpZmljYXRl
X1N0YXR1cyBld2tfZnJhbWVfY2VydGlmaWNhdGVfc3RhdHVzX2dldChFdmFzX09iamVjdCogZXdr
RnJhbWUpCiAKIC8qKgogICogQGludGVybmFsCisgKiBSZXBvcnRzIGEgZnJhbWUgaWNvbiBjaGFu
Z2VkLgorICoKKyAqIEBwYXJhbSBld2tGcmFtZSBGcmFtZS4KKyAqIEBwYXJhbSBpY29uVHlwZSBU
eXBlIG9mIHRoZSBpY29uIHRoYXQgY2hhbmdlZC4KKyAqCisgKiBFbWl0cyBzaWduYWw6ICJpY29u
LGNoYW5nZWQiIHdpdGggcG9pbnRlciB0byBhIEV3a19JY29uX1R5cGUuCisgKi8KK3ZvaWQgZXdr
X2ZyYW1lX2ljb25fY2hhbmdlZChFdmFzX09iamVjdCogZXdrRnJhbWUsICBXZWJDb3JlOjpJY29u
VHlwZSBpY29uVHlwZSkKK3sKKyAgICBEQkcoImV3a0ZyYW1lPSVwLCBpY29uVHlwZT0lZCIsIGV3
a0ZyYW1lLCBpY29uVHlwZSk7CisgICAgRXdrX0ljb25fVHlwZSBld2tJY29uVHlwZSA9IHN0YXRp
Y19jYXN0PEV3a19JY29uX1R5cGU+KGljb25UeXBlKTsKKyAgICBldmFzX29iamVjdF9zbWFydF9j
YWxsYmFja19jYWxsKGV3a0ZyYW1lLCAiaWNvbixjaGFuZ2VkIiwgJmV3a0ljb25UeXBlKTsKK30K
KworLyoqCisgKiBAaW50ZXJuYWwKICAqIFJlcG9ydHMgdXJpIGNoYW5nZWQgYW5kIHN3YXAgaW50
ZXJuYWwgc3RyaW5nIHJlZmVyZW5jZS4KICAqCiAgKiBFbWl0cyBzaWduYWw6ICJ1cmksY2hhbmdl
ZCIgd2l0aCBuZXcgdXJpIGFzIHBhcmFtZXRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
ZWZsL2V3ay9ld2tfZnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaApp
bmRleCAwOGI0YmMwLi5jODNhNjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv
ZXdrX2ZyYW1lLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCkBAIC0z
OSw2ICszOSw3IEBACiAgKiAgICAgd2VyZSBjaGFuZ2VkIGR1ZSBuZXcgbGF5b3V0LCBzY3JpcHQg
YWN0aW9ucyBvciBhbnkgb3RoZXIgZXZlbnRzLgogICogIC0gImVkaXRvcmNsaWVudCxjb250ZW50
cyxjaGFuZ2VkIiwgdm9pZDogcmVwb3J0cyB0aGF0IGVkaXRvciBjbGllbnQncwogICogICAgY29u
dGVudHMgd2VyZSBjaGFuZ2VkCisgKiAgLSAiaWNvbixjaGFuZ2VkIiwgRXdrX0ljb25fVHlwZSo6
IGEgZnJhbWUgaWNvbiBjaGFuZ2VkLgogICogIC0gImxvYWQsY29tbWl0dGVkIiwgdm9pZDogcmVw
b3J0cyBsb2FkIGNvbW1pdHRlZC4KICAqICAtICJsb2FkLGRvY3VtZW50LGZpbmlzaGVkIiwgdm9p
ZDogZnJhbWUgZmluaXNoZWQgbG9hZGluZyB0aGUgZG9jdW1lbnQuCiAgKiAgLSAibG9hZCxlcnJv
ciIsIGNvbnN0IEV3a19GcmFtZV9Mb2FkX0Vycm9yKjogcmVwb3J0cyBsb2FkIGZhaWxlZApAQCAt
MTY0LDYgKzE2NSwxNCBAQCBzdHJ1Y3QgX0V3a19GcmFtZV9Yc3NfTm90aWZpY2F0aW9uIHsKICAg
ICBFaW5hX0Jvb2wgaXNfZW50aXJlX3BhZ2VfYmxvY2tlZDsgLyoqIDwgaW5kaWNhdGVzIGlmIHRo
ZSBlbnRpcmUgcGFnZSB3YXMgYmxvY2tlZCBieSBYU1NBdWRpdG9yICovCiB9OwogCisvLy8gRW51
bSBjb250YWluaW5nIGljb24gdHlwZXMKK3R5cGVkZWYgZW51bSAgeworICAgIEVXS19JQ09OX0lO
VkFMSUQgPSAwLAorICAgIEVXS19JQ09OX0ZBViA9IDEsCisgICAgRVdLX0lDT05fVE9VQ0ggPSAx
IDw8IDEsCisgICAgRVdLX0lDT05fVE9VQ0hfUFJFQ09NUE9TRUQgPSAxIDw8IDIKK30gRXdrX0lj
b25fVHlwZTsKKwogLy8vIEVudW0gY29udGFpbmluZyBoaXQgdGVzdCBkYXRhIHR5cGVzCiB0eXBl
ZGVmIGVudW0gewogICAgIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9ET0NVTUVOVCA9IDEg
PDwgMSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfcHJpdmF0ZS5oIGIv
U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKaW5kZXggMjZkNDQ4ZC4uMjFjY2Q4
YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKKysrIGIv
U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKQEAgLTI0MSw2ICsyNDEsNyBAQCB2
b2lkIGV3a19mcmFtZV90aXRsZV9zZXQoRXZhc19PYmplY3QqIGV3a0ZyYW1lLCBjb25zdCBjaGFy
KiB0aXRsZSk7CiB2b2lkIGV3a19mcmFtZV92aWV3X2NyZWF0ZV9mb3JfdmlldyhFdmFzX09iamVj
dCogZXdrRnJhbWUsIEV2YXNfT2JqZWN0KiB2aWV3KTsKIGJvb2wgZXdrX2ZyYW1lX3VyaV9jaGFu
Z2VkKEV2YXNfT2JqZWN0KiBld2tGcmFtZSk7CiB2b2lkIGV3a19mcmFtZV9mb3JjZV9sYXlvdXQo
RXZhc19PYmplY3QqIGV3a0ZyYW1lKTsKK3ZvaWQgZXdrX2ZyYW1lX2ljb25fY2hhbmdlZChFdmFz
X09iamVjdCogZXdrRnJhbWUsIFdlYkNvcmU6Okljb25UeXBlIGljb25UeXBlKTsKIAogV1RGOjpQ
YXNzUmVmUHRyPFdlYkNvcmU6OldpZGdldD4gZXdrX2ZyYW1lX3BsdWdpbl9jcmVhdGUoRXZhc19P
YmplY3QqIGV3a0ZyYW1lLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBwbHVnaW5TaXplLCBXZWJD
b3JlOjpIVE1MUGx1Z0luRWxlbWVudCogZWxlbWVudCwgY29uc3QgV2ViQ29yZTo6S1VSTCYgdXJs
LCBjb25zdCBXVEY6OlZlY3RvcjxXVEY6OlN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFdURjo6
VmVjdG9yPFdURjo6U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFdURjo6U3RyaW5nJiBtaW1l
VHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpOwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTA1YmMzOC4uYzFlMjY0NyAxMDA2NDQKLS0tIGEvVG9v
bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEy
LTA1LTA3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisK
KyAgICAgICAgW0VGTF1bRFJUXSBFRkwncyBEUlQgbmVlZHMgdG8gc3VwcG9ydCBMYXlvdXRUZXN0
Q29udHJvbGxlci5kdW1wSWNvbkNoYW5nZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ0MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBDYXRjaCB0aGUgImljb24sY2hhbmdlZCIgc2lnbmFsIG9uIHRo
ZSBmcmFtZXMgaW4gRUZMJ3MgRHVtcFJlbmRlclRyZWUKKyAgICAgICAgdG8gc3VwcG9ydCBMYXlv
dXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29uQ2hhbmdlcygpLgorCisgICAgICAgICogRHVtcFJl
bmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcDoKKyAgICAgICAgKER1bXBSZW5k
ZXJUcmVlQ2hyb21lOjpjcmVhdGVWaWV3KToKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21l
OjpvbkZyYW1lSWNvbkNoYW5nZWQpOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9u
RnJhbWVDcmVhdGVkKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRy
ZWVDaHJvbWUuaDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21lKToKKwogMjAxMi0wNS0w
NiAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW3ByZXBhcmUt
Q2hhbmdlTG9nXSBFeGNsdWRlcyBhIHJlZmVyZW5jZSBmaWxlIHVzZWQgYnkgcmVmdGVzdHMgZnJv
bSB0ZXN0IGZpbGVzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBS
ZW5kZXJUcmVlQ2hyb21lLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVy
VHJlZUNocm9tZS5jcHAKaW5kZXggN2ZlMWMxOS4uZTNlOGIwYyAxMDA2NDQKLS0tIGEvVG9vbHMv
RHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcAorKysgYi9Ub29scy9E
dW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCkBAIC0xMDcsNiArMTA3
LDcgQEAgRXZhc19PYmplY3QqIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpjcmVhdGVWaWV3KCkgY29u
c3QKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQodmlldywgImZyYW1lLGNyZWF0
ZWQiLCBvbkZyYW1lQ3JlYXRlZCwgMCk7CiAKICAgICBFdmFzX09iamVjdCogbWFpbkZyYW1lID0g
ZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQodmlldyk7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2Fs
bGJhY2tfYWRkKG1haW5GcmFtZSwgImljb24sY2hhbmdlZCIsIG9uRnJhbWVJY29uQ2hhbmdlZCwg
MCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1haW5GcmFtZSwgImxvYWQs
cHJvdmlzaW9uYWwiLCBvbkZyYW1lUHJvdmlzaW9uYWxMb2FkLCAwKTsKICAgICBldmFzX29iamVj
dF9zbWFydF9jYWxsYmFja19hZGQobWFpbkZyYW1lLCAibG9hZCxjb21taXR0ZWQiLCBvbkZyYW1l
TG9hZENvbW1pdHRlZCwgMCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1h
aW5GcmFtZSwgImxvYWQsZmluaXNoZWQiLCBvbkZyYW1lTG9hZEZpbmlzaGVkLCAwKTsKQEAgLTQw
Niw2ICs0MDcsMTQgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZUNocm9tZTo6b25TdGF0dXNiYXJUZXh0
U2V0KHZvaWQqLCBFdmFzX09iamVjdCosIHZvaWQqIGV2ZW50SW4KICAgICBwcmludGYoIlVJIERF
TEVHQVRFIFNUQVRVUyBDQUxMQkFDSzogc2V0U3RhdHVzVGV4dDolc1xuIiwgc3RhdHVzYmFyVGV4
dCk7CiB9CiAKK3ZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9uRnJhbWVJY29uQ2hhbmdlZCh2
b2lkKiwgRXZhc19PYmplY3QqIGZyYW1lLCB2b2lkKikKK3sKKyAgICBpZiAoIWRvbmUgJiYgZ0xh
eW91dFRlc3RDb250cm9sbGVyLT5kdW1wSWNvbkNoYW5nZXMoKSkgeworICAgICAgICBjb25zdCBT
dHJpbmcgZnJhbWVOYW1lKER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6c3VpdGFibGVEUlRGcmFt
ZU5hbWUoZnJhbWUpKTsKKyAgICAgICAgcHJpbnRmKCIlcyAtIGRpZENoYW5nZUljb25zXG4iLCBm
cmFtZU5hbWUudXRmOCgpLmRhdGEoKSk7CisgICAgfQorfQorCiB2b2lkIER1bXBSZW5kZXJUcmVl
Q2hyb21lOjpvblRpdGxlQ2hhbmdlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKiBldmVudElu
Zm8pCiB7CiAgICAgaWYgKCFnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBUaXRsZUNoYW5nZXMo
KSkKQEAgLTQ5NCw2ICs1MDMsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpvbkZyYW1l
Q3JlYXRlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKiBldmVudEluZm8pCiB7CiAgICAgRXZh
c19PYmplY3QqIGZyYW1lID0gc3RhdGljX2Nhc3Q8RXZhc19PYmplY3QqPihldmVudEluZm8pOwog
CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGZyYW1lLCAiaWNvbixjaGFuZ2Vk
Iiwgb25GcmFtZUljb25DaGFuZ2VkLCAwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFj
a19hZGQoZnJhbWUsICJsb2FkLHByb3Zpc2lvbmFsIiwgb25GcmFtZVByb3Zpc2lvbmFsTG9hZCwg
MCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGZyYW1lLCAibG9hZCxjb21t
aXR0ZWQiLCBvbkZyYW1lTG9hZENvbW1pdHRlZCwgMCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRf
Y2FsbGJhY2tfYWRkKGZyYW1lLCAibG9hZCxmaW5pc2hlZCIsIG9uRnJhbWVMb2FkRmluaXNoZWQs
IDApOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVl
Q2hyb21lLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUu
aAppbmRleCBjYmEzZGJkLi4wMzc5OTNiIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJl
ZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9l
ZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuaApAQCAtODksNiArODksOCBAQCBwcml2YXRlOgogCiAg
ICAgc3RhdGljIHZvaWQgb25GcmFtZUNyZWF0ZWQodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCop
OwogCisgICAgc3RhdGljIHZvaWQgb25GcmFtZUljb25DaGFuZ2VkKHZvaWQqLCBFdmFzX09iamVj
dCosIHZvaWQqKTsKKwogICAgIHN0YXRpYyB2b2lkIG9uRnJhbWVQcm92aXNpb25hbExvYWQodm9p
ZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCopOwogCiAgICAgc3RhdGljIHZvaWQgb25GcmFtZUxvYWRD
b21taXR0ZWQodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCopOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>140676</attachid>
            <date>2012-05-07 22:41:34 -0700</date>
            <delta_ts>2012-05-09 11:39:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>84435_dumpIconChanges.patch</filename>
            <type>text/plain</type>
            <size>9292</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA4ZGFjZDEzLi5kZjRhMzA1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDUt
MDggIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRlc3RDb250
cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFVuc2tpcCB0aGUgdGVzdCBjaGVja2luZyBmb3IgRHVtcFJlbmRlclRy
ZWUncyBzdXBwb3J0IGZvcgorICAgICAgICBMYXlvdXRUZXN0Q29udHJvbGxlcidzIGR1bXBJY29u
Q2hhbmdlcygpIGluIEVGTCBwb3J0LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1NraXBwZWQ6
CisKIDIwMTItMDUtMDcgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAg
ICAgIFtDaHJvbWl1bV0gQWRkIGV4cGVjdGF0aW9ucyBmb3IgZmlyc3QtbGluZS10ZXh0LWRlY29y
YXRpb24uaHRtbC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVk
IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKaW5kZXggNmZmYmJlYS4uZTU4ZGI0
ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKKysrIGIvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKQEAgLTIsMTAgKzIsNiBAQAogIyBUZXN0cyB3
aGljaCBkZXBlbmQgb24gZmVhdHVyZXMgd2hpY2ggaGF2ZSBub3QgYmVlbiBpbXBsZW1lbnRlZCB5
ZXQKICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0KIAotIyBOZWVkcyBBUEkgdG8gcmVjZWl2ZSBub3RpZmljYXRpb25z
IGFib3V0IGNoYW5nZWQgaWNvbnMKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTMzODEyCi1mYXN0L2RvbS9pY29uLXVybC1wcm9wZXJ0eS5odG1sCi0KICMgRUZMJ3Mg
RXZlbnRTZW5kZXIgZG9lcyBub3QgaW1wbGVtZW50IGR1bXBGaWxlbmFtZUJlaW5nRHJhZ2dlZAog
ZmFzdC9ldmVudHMvZHJhZy1pbWFnZS1maWxlbmFtZS5odG1sCiAKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRl
eCA0OWZhOTZiLi5mZWUwZTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM
b2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIw
MTItMDUtMDggIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4K
KworICAgICAgICBbRUZMXVtEUlRdIEVGTCdzIERSVCBuZWVkcyB0byBzdXBwb3J0IExheW91dFRl
c3RDb250cm9sbGVyLmR1bXBJY29uQ2hhbmdlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIEVtaXQgYSAiaWNvbixjaGFuZ2VkIiBzaWduYWwgb24gdGhl
IGZyYW1lIHdoZW4gaXRzIGZhdmlvbiBjaGFuZ2VkLgorICAgICAgICBDbGFyaWZ5IHRoYXQgdGhl
ICJpY29uLGxvYWRlZCIgc2lnbmFsIGlzIG9ubHkgZW1pdHRlZCBmb3IgdGhlIG1haW4KKyAgICAg
ICAgZnJhbWUuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVm
bC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hE
aWRSZWNlaXZlSWNvbik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6
ZGlzcGF0Y2hEaWRDaGFuZ2VJY29ucyk6CisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6Cisg
ICAgICAgIChld2tfZnJhbWVfaWNvbl9jaGFuZ2VkKToKKyAgICAgICAgKiBld2svZXdrX2ZyYW1l
Lmg6CisgICAgICAgICogZXdrL2V3a19wcml2YXRlLmg6CisKIDIwMTItMDUtMDcgIE1pa2hhaWwg
UG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CiAKICAgICAgICAgW0VG
TF0gUGFnZSBjYWNoaW5nIHBlcm1pc3Npb24gZnJvbSBFRkwncyBGcmFtZUxvYWRlckNsaWVudApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD
bGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk
ZXJDbGllbnRFZmwuY3BwCmluZGV4IDBlNjc0OTcuLjUxODVkMWUgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmNwcAorKysg
Yi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5j
cHAKQEAgLTU5Niw5ICs1OTYsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRj
aFdpbGxDbG9zZSgpCiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkUmVj
ZWl2ZUljb24oKQogewotICAgIC8qIHJlcG9ydCByZWNlaXZlZCBmYXZpY29uIG9ubHkgZm9yIG1h
aW4gZnJhbWUuICovCi0gICAgaWYgKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgIT0g
bV9mcmFtZSkKLSAgICAgICAgcmV0dXJuOworICAgIC8vIEljb25Db250cm9sbGVyIGxvYWRzIGlj
b25zIG9ubHkgZm9yIHRoZSBtYWluIGZyYW1lLgorICAgIEFTU0VSVChld2tfdmlld19mcmFtZV9t
YWluX2dldChtX3ZpZXcpID09IG1fZnJhbWUpOwogCiAgICAgZXdrX3ZpZXdfZnJhbWVfbWFpbl9p
Y29uX3JlY2VpdmVkKG1fdmlldyk7CiB9CkBAIC02MjEsOSArNjIwLDExIEBAIHZvaWQgRnJhbWVM
b2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhE
aXJlY3Rpb24mIHRpCiAgICAgZXdrX3ZpZXdfdGl0bGVfc2V0KG1fdmlldywgY3MuZGF0YSgpKTsK
IH0KIAotdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDaGFuZ2VJY29ucyhX
ZWJDb3JlOjpJY29uVHlwZSkKK3ZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlk
Q2hhbmdlSWNvbnMoV2ViQ29yZTo6SWNvblR5cGUgaWNvblR5cGUpCiB7Ci0gICAgbm90SW1wbGVt
ZW50ZWQoKTsKKyAgICAvLyBPdGhlciB0b3VjaCB0eXBlcyBhcmUgYXBwbGUtc3BlY2lmaWMKKyAg
ICBBU1NFUlQoaWNvblR5cGUgPT0gV2ViQ29yZTo6RmF2aWNvbik7CisgICAgZXdrX2ZyYW1lX2lj
b25fY2hhbmdlZChtX2ZyYW1lKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlz
cGF0Y2hEaWRDb21taXRMb2FkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l
d2tfZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXgg
MjRhMTJlYS4uOTY0YjY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19m
cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTE3
MjQsNiArMTcyNCwyMCBAQCBFd2tfQ2VydGlmaWNhdGVfU3RhdHVzIGV3a19mcmFtZV9jZXJ0aWZp
Y2F0ZV9zdGF0dXNfZ2V0KEV2YXNfT2JqZWN0KiBld2tGcmFtZSkKIAogLyoqCiAgKiBAaW50ZXJu
YWwKKyAqIFJlcG9ydHMgZnJhbWUgZmF2aWNvbiBjaGFuZ2VkLgorICoKKyAqIEBwYXJhbSBld2tG
cmFtZSBGcmFtZS4KKyAqCisgKiBFbWl0cyBzaWduYWw6ICJpY29uLGNoYW5nZWQiIHdpdGggbm8g
cGFyYW1ldGVycy4KKyAqLwordm9pZCBld2tfZnJhbWVfaWNvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0
KiBld2tGcmFtZSkKK3sKKyAgICBEQkcoImV3a0ZyYW1lPSVwIiwgZXdrRnJhbWUpOworICAgIGV2
YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrRnJhbWUsICJpY29uLGNoYW5nZWQiLCAw
KTsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKICAqIFJlcG9ydHMgdXJpIGNoYW5nZWQgYW5kIHN3
YXAgaW50ZXJuYWwgc3RyaW5nIHJlZmVyZW5jZS4KICAqCiAgKiBFbWl0cyBzaWduYWw6ICJ1cmks
Y2hhbmdlZCIgd2l0aCBuZXcgdXJpIGFzIHBhcmFtZXRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJh
bWUuaAppbmRleCAwOGI0YmMwLi44ZTZkNTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Vm
bC9ld2svZXdrX2ZyYW1lLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5o
CkBAIC0zOSw2ICszOSw3IEBACiAgKiAgICAgd2VyZSBjaGFuZ2VkIGR1ZSBuZXcgbGF5b3V0LCBz
Y3JpcHQgYWN0aW9ucyBvciBhbnkgb3RoZXIgZXZlbnRzLgogICogIC0gImVkaXRvcmNsaWVudCxj
b250ZW50cyxjaGFuZ2VkIiwgdm9pZDogcmVwb3J0cyB0aGF0IGVkaXRvciBjbGllbnQncwogICog
ICAgY29udGVudHMgd2VyZSBjaGFuZ2VkCisgKiAgLSAiaWNvbixjaGFuZ2VkIiwgdm9pZDogZnJh
bWUgZmF2aWNvbiBjaGFuZ2VkLgogICogIC0gImxvYWQsY29tbWl0dGVkIiwgdm9pZDogcmVwb3J0
cyBsb2FkIGNvbW1pdHRlZC4KICAqICAtICJsb2FkLGRvY3VtZW50LGZpbmlzaGVkIiwgdm9pZDog
ZnJhbWUgZmluaXNoZWQgbG9hZGluZyB0aGUgZG9jdW1lbnQuCiAgKiAgLSAibG9hZCxlcnJvciIs
IGNvbnN0IEV3a19GcmFtZV9Mb2FkX0Vycm9yKjogcmVwb3J0cyBsb2FkIGZhaWxlZApkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0
L2VmbC9ld2svZXdrX3ByaXZhdGUuaAppbmRleCAyNmQ0NDhkLi5mYTI4NGYzIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0
L2VmbC9ld2svZXdrX3ByaXZhdGUuaApAQCAtMjQxLDYgKzI0MSw3IEBAIHZvaWQgZXdrX2ZyYW1l
X3RpdGxlX3NldChFdmFzX09iamVjdCogZXdrRnJhbWUsIGNvbnN0IGNoYXIqIHRpdGxlKTsKIHZv
aWQgZXdrX2ZyYW1lX3ZpZXdfY3JlYXRlX2Zvcl92aWV3KEV2YXNfT2JqZWN0KiBld2tGcmFtZSwg
RXZhc19PYmplY3QqIHZpZXcpOwogYm9vbCBld2tfZnJhbWVfdXJpX2NoYW5nZWQoRXZhc19PYmpl
Y3QqIGV3a0ZyYW1lKTsKIHZvaWQgZXdrX2ZyYW1lX2ZvcmNlX2xheW91dChFdmFzX09iamVjdCog
ZXdrRnJhbWUpOwordm9pZCBld2tfZnJhbWVfaWNvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tG
cmFtZSk7CiAKIFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpXaWRnZXQ+IGV3a19mcmFtZV9wbHVn
aW5fY3JlYXRlKEV2YXNfT2JqZWN0KiBld2tGcmFtZSwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYg
cGx1Z2luU2l6ZSwgV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFdl
YkNvcmU6OktVUkwmIHVybCwgY29uc3QgV1RGOjpWZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbU5h
bWVzLCBjb25zdCBXVEY6OlZlY3RvcjxXVEY6OlN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBX
VEY6OlN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsKIApkaWZmIC0tZ2l0IGEv
VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDM4MmQ2YWUuLjE4N2NkMDcg
MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyMCBAQAorMjAxMi0wNS0wOCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVt
ZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW0RSVF0gRUZMJ3MgRFJUIG5lZWRzIHRvIHN1
cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEljb25DaGFuZ2VzKCkKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDM1CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2F0Y2ggdGhlICJpY29uLGNoYW5n
ZWQiIHNpZ25hbCBvbiB0aGUgZnJhbWVzIGluIEVGTCdzIER1bXBSZW5kZXJUcmVlCisgICAgICAg
IHRvIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xsZXIncyBkdW1wSWNvbkNoYW5nZXMoKS4KKwor
ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHA6Cisg
ICAgICAgIChEdW1wUmVuZGVyVHJlZUNocm9tZTo6Y3JlYXRlVmlldyk6CisgICAgICAgIChEdW1w
UmVuZGVyVHJlZUNocm9tZTo6b25GcmFtZUljb25DaGFuZ2VkKToKKyAgICAgICAgKER1bXBSZW5k
ZXJUcmVlQ2hyb21lOjpvbkZyYW1lQ3JlYXRlZCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUv
ZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmg6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZUNocm9t
ZSk6CisKIDIwMTItMDUtMDcgIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJha3Vjb0B3ZWJraXQu
b3JnPgogCiAgICAgICAgIFt3ZWJraXRweV0gUmVtb3ZlIFB5dGhvbiAyLjUtc3BlY2lmaWMgd29y
a2Fyb3VuZCBmcm9tIGh0dHBfc2VydmVyX2Jhc2UucHkuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1w
UmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRl
clRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcAppbmRleCAxMGY1ZjhkLi4yMWZjN2Q4
IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJv
bWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9t
ZS5jcHAKQEAgLTEwNyw2ICsxMDcsNyBAQCBFdmFzX09iamVjdCogRHVtcFJlbmRlclRyZWVDaHJv
bWU6OmNyZWF0ZVZpZXcoKSBjb25zdAogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2Fk
ZCh2aWV3LCAiZnJhbWUsY3JlYXRlZCIsIG9uRnJhbWVDcmVhdGVkLCAwKTsKIAogICAgIEV2YXNf
T2JqZWN0KiBtYWluRnJhbWUgPSBld2tfdmlld19mcmFtZV9tYWluX2dldCh2aWV3KTsKKyAgICBl
dmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQobWFpbkZyYW1lLCAiaWNvbixjaGFuZ2VkIiwg
b25GcmFtZUljb25DaGFuZ2VkLCAwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19h
ZGQobWFpbkZyYW1lLCAibG9hZCxwcm92aXNpb25hbCIsIG9uRnJhbWVQcm92aXNpb25hbExvYWQs
IDApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChtYWluRnJhbWUsICJsb2Fk
LGNvbW1pdHRlZCIsIG9uRnJhbWVMb2FkQ29tbWl0dGVkLCAwKTsKICAgICBldmFzX29iamVjdF9z
bWFydF9jYWxsYmFja19hZGQobWFpbkZyYW1lLCAibG9hZCxmaW5pc2hlZCIsIG9uRnJhbWVMb2Fk
RmluaXNoZWQsIDApOwpAQCAtNDA4LDYgKzQwOSwxNCBAQCB2b2lkIER1bXBSZW5kZXJUcmVlQ2hy
b21lOjpvblN0YXR1c2JhclRleHRTZXQodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCogZXZlbnRJ
bgogICAgIHByaW50ZigiVUkgREVMRUdBVEUgU1RBVFVTIENBTExCQUNLOiBzZXRTdGF0dXNUZXh0
OiVzXG4iLCBzdGF0dXNiYXJUZXh0KTsKIH0KIAordm9pZCBEdW1wUmVuZGVyVHJlZUNocm9tZTo6
b25GcmFtZUljb25DaGFuZ2VkKHZvaWQqLCBFdmFzX09iamVjdCogZnJhbWUsIHZvaWQqKQorewor
ICAgIGlmICghZG9uZSAmJiBnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBJY29uQ2hhbmdlcygp
KSB7CisgICAgICAgIGNvbnN0IFN0cmluZyBmcmFtZU5hbWUoRHVtcFJlbmRlclRyZWVTdXBwb3J0
RWZsOjpzdWl0YWJsZURSVEZyYW1lTmFtZShmcmFtZSkpOworICAgICAgICBwcmludGYoIiVzIC0g
ZGlkQ2hhbmdlSWNvbnNcbiIsIGZyYW1lTmFtZS51dGY4KCkuZGF0YSgpKTsKKyAgICB9Cit9CisK
IHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9uVGl0bGVDaGFuZ2VkKHZvaWQqLCBFdmFzX09i
amVjdCosIHZvaWQqIGV2ZW50SW5mbykKIHsKICAgICBpZiAoIWdMYXlvdXRUZXN0Q29udHJvbGxl
ci0+ZHVtcFRpdGxlQ2hhbmdlcygpKQpAQCAtNDk2LDYgKzUwNSw3IEBAIHZvaWQgRHVtcFJlbmRl
clRyZWVDaHJvbWU6Om9uRnJhbWVDcmVhdGVkKHZvaWQqLCBFdmFzX09iamVjdCosIHZvaWQqIGV2
ZW50SW5mbykKIHsKICAgICBFdmFzX09iamVjdCogZnJhbWUgPSBzdGF0aWNfY2FzdDxFdmFzX09i
amVjdCo+KGV2ZW50SW5mbyk7CiAKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQo
ZnJhbWUsICJpY29uLGNoYW5nZWQiLCBvbkZyYW1lSWNvbkNoYW5nZWQsIDApOwogICAgIGV2YXNf
b2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChmcmFtZSwgImxvYWQscHJvdmlzaW9uYWwiLCBvbkZy
YW1lUHJvdmlzaW9uYWxMb2FkLCAwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19h
ZGQoZnJhbWUsICJsb2FkLGNvbW1pdHRlZCIsIG9uRnJhbWVMb2FkQ29tbWl0dGVkLCAwKTsKICAg
ICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoZnJhbWUsICJsb2FkLGZpbmlzaGVkIiwg
b25GcmFtZUxvYWRGaW5pc2hlZCwgMCk7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJl
ZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9E
dW1wUmVuZGVyVHJlZUNocm9tZS5oCmluZGV4IGNiYTNkYmQuLjAzNzk5M2IgMTAwNjQ0Ci0tLSBh
L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oCisrKyBiL1Rv
b2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5oCkBAIC04OSw2ICs4
OSw4IEBAIHByaXZhdGU6CiAKICAgICBzdGF0aWMgdm9pZCBvbkZyYW1lQ3JlYXRlZCh2b2lkKiwg
RXZhc19PYmplY3QqLCB2b2lkKik7CiAKKyAgICBzdGF0aWMgdm9pZCBvbkZyYW1lSWNvbkNoYW5n
ZWQodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCopOworCiAgICAgc3RhdGljIHZvaWQgb25GcmFt
ZVByb3Zpc2lvbmFsTG9hZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7CiAKICAgICBzdGF0
aWMgdm9pZCBvbkZyYW1lTG9hZENvbW1pdHRlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7
Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>