<?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>85171</bug_id>
          
          <creation_ts>2012-04-30 00:29:37 -0700</creation_ts>
          <short_desc>[EFL] LayoutTestController does not support overriding WebKitLoadSiteIconsKey</short_desc>
          <delta_ts>2012-05-06 22:55:16 -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>0</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <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>612509</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-30 00:29:37 -0700</bug_when>
    <thetext>The following test depends on overriding the &quot;WebKitLoadSiteIconsKey&quot; setting via LayoutTestController:
http/tests/misc/favicon-loads-with-icon-loading-override.html 

This functionality needs to be implemented in order to unskip this test case in EFL port.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>612510</commentid>
    <comment_count>1</comment_count>
      <attachid>139422</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-04-30 00:38:40 -0700</bug_when>
    <thetext>Created attachment 139422
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>613150</commentid>
    <comment_count>2</comment_count>
    <who name="Raphael Kubo da Costa (:rakuco)">rakuco</who>
    <bug_when>2012-04-30 18:33:14 -0700</bug_when>
    <thetext>This patch seems to overlap with the one in bug 83007.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>613282</commentid>
    <comment_count>3</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-01 00:25:30 -0700</bug_when>
    <thetext>(In reply to comment #2)
&gt; This patch seems to overlap with the one in bug 83007.

The patch at Bug 83007 does not support overriding &quot;WebKitLoadSiteIconsKey&quot; setting. If anything, the patches are complementary, not really overlapping. I don&apos;t see any issue with it, do you?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>613369</commentid>
    <comment_count>4</comment_count>
    <who name="Raphael Kubo da Costa (:rakuco)">rakuco</who>
    <bug_when>2012-05-01 06:50:24 -0700</bug_when>
    <thetext>(In reply to comment #3)
&gt; (In reply to comment #2)
&gt; &gt; This patch seems to overlap with the one in bug 83007.
&gt; 
&gt; The patch at Bug 83007 does not support overriding &quot;WebKitLoadSiteIconsKey&quot; setting. If anything, the patches are complementary, not really overlapping. I don&apos;t see any issue with it, do you?

They both implement overridePreference and toBool() slightly differently; wouldn&apos;t it make sense to land this one after 83007?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>613429</commentid>
    <comment_count>5</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-01 08:49:58 -0700</bug_when>
    <thetext>Ok, adding dependency on Bug 83007.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>613862</commentid>
    <comment_count>6</comment_count>
      <attachid>139422</attachid>
    <who name="Gyuyoung Kim">gyuyoung.kim</who>
    <bug_when>2012-05-01 18:46:03 -0700</bug_when>
    <thetext>Comment on attachment 139422
Patch

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

&gt; Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp:395
&gt; +

Unneeded line.

&gt; Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp:666
&gt; +static gboolean booleanFromValue(JSStringRef value)

Do not use unneeded glib type for efl port.

&gt; Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp:677
&gt; +    else

If there is no logic when keyString is not &quot;WebKitLoadSiteIconKey&quot;, is it better to do nothing until we support other keyStrings ? 

I don&apos;t see below code in webkit yet.
else
   notImplemented();</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>613995</commentid>
    <comment_count>7</comment_count>
      <attachid>139749</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-01 22:51:06 -0700</bug_when>
    <thetext>Created attachment 139749
Patch

Take feedback into consideration and make sure the patch is consistent with the one for Bug 83007.

Now, I don&apos;t think it matters which patch (Bug 83007 or this one) lands first.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>614134</commentid>
    <comment_count>8</comment_count>
      <attachid>139777</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-02 02:55:13 -0700</bug_when>
    <thetext>Created attachment 139777
Patch

Make toBool() method inline and make sure the &quot;WebKitLoadSiteIconsKey&quot; setting is reset in DumpRenderTreeChrome::resetDefaultsToConsistentValues().</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>614534</commentid>
    <comment_count>9</comment_count>
      <attachid>139777</attachid>
    <who name="Raphael Kubo da Costa (:rakuco)">rakuco</who>
    <bug_when>2012-05-02 12:35:35 -0700</bug_when>
    <thetext>Comment on attachment 139777
Patch

This patch looks fine now. Bug 83007 has landed, so you&apos;ll need to rebase.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>615000</commentid>
    <comment_count>10</comment_count>
      <attachid>139953</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-02 22:26:01 -0700</bug_when>
    <thetext>Created attachment 139953
Patch

Rebase on master.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>616162</commentid>
    <comment_count>11</comment_count>
      <attachid>139953</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-05-04 06:51:06 -0700</bug_when>
    <thetext>Comment on attachment 139953
Patch

Rejecting attachment 139953 from commit-queue.

Failed to run &quot;[&apos;/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch&apos;, &apos;--status-host=queues.webkit.org&apos;, &apos;-...&quot; exit_code: 2

Last 500 characters of output:
 Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
patching file Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
patching file Tools/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
patching file Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp

Failed to run &quot;[u&apos;/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply&apos;, u&apos;--force&apos;, u&apos;--reviewer&apos;, u&apos;Andreas Kl...&quot; exit_code: 1 cwd: /mnt/git/webkit-commit-queue/

Full output: http://queues.webkit.org/results/12531147</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>616176</commentid>
    <comment_count>12</comment_count>
      <attachid>140218</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2012-05-04 07:10:22 -0700</bug_when>
    <thetext>Created attachment 140218
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>616189</commentid>
    <comment_count>13</comment_count>
      <attachid>140218</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-05-04 07:31:57 -0700</bug_when>
    <thetext>Comment on attachment 140218
Patch for landing

Clearing flags on attachment: 140218

Committed r116097: &lt;http://trac.webkit.org/changeset/116097&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>616190</commentid>
    <comment_count>14</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-05-04 07:32:03 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>139422</attachid>
            <date>2012-04-30 00:38:40 -0700</date>
            <delta_ts>2012-05-01 22:51:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>85171_WebKitLoadSiteIconsKey.patch</filename>
            <type>text/plain</type>
            <size>6067</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA3MGE4MGVlLi40MWFiNjcxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDQt
MzAgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXSBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92ZXJyaWRp
bmcgV2ViS2l0TG9hZFNpdGVJY29uc0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9ODUxNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBVbnNraXAgaHR0cC90ZXN0cy9taXNjL2Zhdmljb24tbG9hZHMtd2l0
aC1pY29uLWxvYWRpbmctb3ZlcnJpZGUuaHRtbAorICAgICAgICBub3cgdGhhdCBFRkwncyBMYXlv
dXRUZXN0Q29udHJvbGxlciBzdXBwb3J0IG92ZXJyaWRpbmcKKyAgICAgICAgV2ViS2l0TG9hZFNp
dGVJY29uc0tleS4KKworICAgICAgICAqIHBsYXRmb3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA0
LTI5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIHN1cHBvcnQg
Zm9yIHRoZSBCbG9iIGNvbnN0cnVjdG9yIChQYXJ0IDIpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVk
CmluZGV4IDM0ZjRjZDIuLmY4MDQzMGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3Jt
L2VmbC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVkCkBAIC02
MzQsNyArNjM0LDYgQEAgaHR0cC90ZXN0cy9sb2FkaW5nL3JlZGlyZWN0LW1ldGhvZHMuaHRtbAog
CiAjIFJlcXVpcmVzIHdpbGxTZW5kUmVxdWVzdFJldHVybnNOdWxsT25SZWRpcmVjdCArIHdpbGxT
ZW5kUmVxdWVzdCArIGRpZEZpbmlzaExvYWRpbmcKIGh0dHAvdGVzdHMvbWlzYy93aWxsLXNlbmQt
cmVxdWVzdC1yZXR1cm5zLW51bGwtb24tcmVkaXJlY3QuaHRtbAotaHR0cC90ZXN0cy9taXNjL2Zh
dmljb24tbG9hZHMtd2l0aC1pY29uLWxvYWRpbmctb3ZlcnJpZGUuaHRtbAogCiAjIEJVRzogTm8g
YXV0aGVudGljYXRpb24gY2hhbGxlbmdlIGhhbmRsaW5nCiBodHRwL3Rlc3RzL2xvYWRpbmcvYmFz
aWMtY3JlZGVudGlhbHMtc2VudC1hdXRvbWF0aWNhbGx5Lmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRl
eCA0MDVmMmNlLi42ZWMxODI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM
b2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIw
MTItMDQtMzAgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4K
KworICAgICAgICBbRUZMXSBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92
ZXJyaWRpbmcgV2ViS2l0TG9hZFNpdGVJY29uc0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUxNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBoZWxwZXIgZnVuY3Rpb24gdG8gRHVtcFJlbmRl
clRyZWVTdXBwb3J0RWZsIHRvIG92ZXJyaWRlIHRoZQorICAgICAgICAiV2ViS2l0TG9hZFNpdGVJ
Y29uc0tleSIgc2V0dGluZyBvbiB0aGUgdmlldyBwYWdlLgorCisgICAgICAgICogV2ViQ29yZVN1
cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJU
cmVlU3VwcG9ydEVmbDo6c2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRp
bmcpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5o
OgorCiAyMDEyLTA0LTI3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRl
bC5jb20+CiAKICAgICAgICAgW0VGTF0gUmVzb3VyY2VFcnJvciBkb21haW4gbmVlZHMgdG8gYmUg
cHJvcGVybHkgc2V0IGluIEZyYW1lTG9hZGVyQ2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuY3BwIGIvU291
cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNw
cAppbmRleCBjNDdiOWNjLi5iMjc5MTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9X
ZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuY3BwCisrKyBiL1NvdXJjZS9X
ZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5jcHAKQEAg
LTM4OSw2ICszODksMTYgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldERlZmVy
c0xvYWRpbmcoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgZGVmZXIKICAgICBwYWdlLT5zZXRE
ZWZlcnNMb2FkaW5nKGRlZmVycyk7CiB9CiAKK3ZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZs
OjpzZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGluZyhFdmFzX09iamVj
dCogZXdrVmlldywgYm9vbCBsb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVy
ZW5jZXMpCit7CisgICAgV2ViQ29yZTo6UGFnZSogcGFnZSA9IEVXS1ByaXZhdGU6OmNvcmVQYWdl
KGV3a1ZpZXcpOworCisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICBwYWdl
LT5zZXR0aW5ncygpLT5zZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGlu
Zyhsb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVyZW5jZXMpOworfQorCiB2
b2lkIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6YWRkVXNlclN0eWxlU2hlZXQoY29uc3QgRXZh
c19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHNvdXJjZUNvZGUsIGJvb2wgYWxsRnJhbWVz
KQogewogICAgIFdlYkNvcmU6OlBhZ2UqIHBhZ2UgPSBFV0tQcml2YXRlOjpjb3JlUGFnZShld2tW
aWV3KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBS
ZW5kZXJUcmVlU3VwcG9ydEVmbC5oIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQv
RHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmgKaW5kZXggM2U5MmQyYS4uOTY2MWY3MyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBw
b3J0RWZsLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRl
clRyZWVTdXBwb3J0RWZsLmgKQEAgLTcwLDYgKzcwLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2
b2lkIHNldFZhbHVlRm9yVXNlcihKU0NvbnRleHRSZWYsIEpTVmFsdWVSZWYgbm9kZU9iamVjdCwg
SlNTdHJpbmdSZWYgdmFsdWUpOwogICAgIHN0YXRpYyB2b2lkIHNldEF1dG9maWxsZWQoSlNDb250
ZXh0UmVmLCBKU1ZhbHVlUmVmIG5vZGVPYmplY3QsIGJvb2wgYXV0b2ZpbGxlZCk7CiAgICAgc3Rh
dGljIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCBkZWZl
cnMpOworICAgIHN0YXRpYyB2b2lkIHNldExvYWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRp
bmdTZXR0aW5nKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBib29sIGxvYWRzU2l0ZUljb25zSWdub3Jp
bmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlcyk7CiAKICAgICBzdGF0aWMgdm9pZCBhZGRVc2VyU3R5
bGVTaGVldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgY2hhciogc291cmNlQ29k
ZSwgYm9vbCBhbGxGcmFtZXMpOwogICAgIHN0YXRpYyBib29sIGZpbmRTdHJpbmcoY29uc3QgRXZh
c19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRleHQsIFdlYkNvcmU6OkZpbmRPcHRpb25z
KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAy
ZTY5OTQ4Li44ZGMxNDQzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDQtMzAgIENocmlzdG9waGUgRHVtZXog
IDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBMYXlvdXRUZXN0
Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92ZXJyaWRpbmcgV2ViS2l0TG9hZFNpdGVJY29u
c0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUx
NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBs
ZW1lbnQgc3VwcG9ydCBmb3Igb3ZlcnJpZGluZyAiV2ViS2l0TG9hZFNpdGVJY29uc0tleSIgc2V0
dGluZyBpbgorICAgICAgICBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxlci4KKworICAgICAgICAq
IER1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHA6CisgICAgICAg
IChib29sZWFuRnJvbVZhbHVlKToKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpvdmVy
cmlkZVByZWZlcmVuY2UpOgorCiAyMDEyLTA0LTI5ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0Bh
cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogT24gTGlvbiwgcnVuLXdlYmtpdC10ZXN0
cyBjaGFuZ2VzIHRoZSBkaXNwbGF5IGNvbG9yIHByb2ZpbGUgZXZlbiB3aGVuIG5vdCBydW5uaW5n
IHBpeGVsIHRlc3RzCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0
VGVzdENvbnRyb2xsZXJFZmwuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0xheW91dFRl
c3RDb250cm9sbGVyRWZsLmNwcAppbmRleCA2YzFkZDczLi5hOWNkOTdhIDEwMDY0NAotLS0gYS9U
b29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwCisrKyBi
L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAKQEAg
LTY2Myw5ICs2NjMsMTkgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cmVzdW1lQW5pbWF0
aW9ucygpIGNvbnN0CiAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpyZXN1bWVBbmltYXRp
b25zKGJyb3dzZXItPm1haW5GcmFtZSgpKTsKIH0KIAotdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxl
cjo6b3ZlcnJpZGVQcmVmZXJlbmNlKEpTU3RyaW5nUmVmLCBKU1N0cmluZ1JlZikKK3N0YXRpYyBn
Ym9vbGVhbiBib29sZWFuRnJvbVZhbHVlKEpTU3RyaW5nUmVmIHZhbHVlKQogewotICAgIG5vdElt
cGxlbWVudGVkKCk7CisgICAgV1RGOjpDU3RyaW5nIHZhbFN0cmluZyA9IHZhbHVlLT51c3RyaW5n
KCkuYXNjaWkoKTsKKyAgICByZXR1cm4gIXN0cmNhc2VjbXAodmFsU3RyaW5nLmRhdGEoKSwgInRy
dWUiKSB8fCAhc3RyY2FzZWNtcCh2YWxTdHJpbmcuZGF0YSgpLCAiMSIpOworfQorCit2b2lkIExh
eW91dFRlc3RDb250cm9sbGVyOjpvdmVycmlkZVByZWZlcmVuY2UoSlNTdHJpbmdSZWYga2V5LCBK
U1N0cmluZ1JlZiB2YWx1ZSkKK3sKKyAgICBXVEY6OlN0cmluZyBrZXlTdHJpbmcoa2V5LT5jaGFy
YWN0ZXJzKCksIGtleS0+bGVuZ3RoKCkpOworICAgIGlmIChrZXlTdHJpbmcgPT0gIldlYktpdExv
YWRTaXRlSWNvbnNLZXkiKQorICAgICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldExv
YWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKGJyb3dzZXItPm1haW5WaWV3
KCksIGJvb2xlYW5Gcm9tVmFsdWUodmFsdWUpKTsKKyAgICBlbHNlCisgICAgICAgIG5vdEltcGxl
bWVudGVkKCk7CiB9CiAKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmFkZFVzZXJTY3JpcHQo
SlNTdHJpbmdSZWYsIGJvb2wsIGJvb2wpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>139749</attachid>
            <date>2012-05-01 22:51:06 -0700</date>
            <delta_ts>2012-05-02 02:55:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>85171_WebKitLoadSiteIconsKey.patch</filename>
            <type>text/plain</type>
            <size>6012</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCAyYjZiZjNhLi4xNmYwYWE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUt
MDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXSBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92ZXJyaWRp
bmcgV2ViS2l0TG9hZFNpdGVJY29uc0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9ODUxNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBVbnNraXAgaHR0cC90ZXN0cy9taXNjL2Zhdmljb24tbG9hZHMtd2l0
aC1pY29uLWxvYWRpbmctb3ZlcnJpZGUuaHRtbAorICAgICAgICBub3cgdGhhdCBFRkwncyBMYXlv
dXRUZXN0Q29udHJvbGxlciBzdXBwb3J0IG92ZXJyaWRpbmcKKyAgICAgICAgV2ViS2l0TG9hZFNp
dGVJY29uc0tleS4KKworICAgICAgICAqIHBsYXRmb3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA1
LTAxICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21p
dW1dIE1vdmUgZGF0ZS1pbnB1dC12aXNpYmxlLXN0cmluZ3MtZXhwZWN0ZWQudHh0IHRvIHRoZSBj
b3JyZWN0IHBsYWNlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBw
ZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRleCA5NDkyZmYyLi44MzYw
NzdjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9M
YXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtNjMwLDcgKzYzMCw2IEBAIGh0dHAv
dGVzdHMvbG9hZGluZy9yZWRpcmVjdC1tZXRob2RzLmh0bWwKIAogIyBSZXF1aXJlcyB3aWxsU2Vu
ZFJlcXVlc3RSZXR1cm5zTnVsbE9uUmVkaXJlY3QgKyB3aWxsU2VuZFJlcXVlc3QgKyBkaWRGaW5p
c2hMb2FkaW5nCiBodHRwL3Rlc3RzL21pc2Mvd2lsbC1zZW5kLXJlcXVlc3QtcmV0dXJucy1udWxs
LW9uLXJlZGlyZWN0Lmh0bWwKLWh0dHAvdGVzdHMvbWlzYy9mYXZpY29uLWxvYWRzLXdpdGgtaWNv
bi1sb2FkaW5nLW92ZXJyaWRlLmh0bWwKIAogIyBCVUc6IE5vIGF1dGhlbnRpY2F0aW9uIGNoYWxs
ZW5nZSBoYW5kbGluZwogaHR0cC90ZXN0cy9sb2FkaW5nL2Jhc2ljLWNyZWRlbnRpYWxzLXNlbnQt
YXV0b21hdGljYWxseS5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM
b2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggNDA1ZjJjZS4uYTM3YWI0OCAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL
aXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAyICBDaHJpc3RvcGhl
IER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF0gTGF5
b3V0VGVzdENvbnRyb2xsZXIgZG9lcyBub3Qgc3VwcG9ydCBvdmVycmlkaW5nIFdlYktpdExvYWRT
aXRlSWNvbnNLZXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTg1MTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQWRkIGEgaGVscGVyIGZ1bmN0aW9uIHRvIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbCB0byBv
dmVycmlkZSB0aGUKKyAgICAgICAgIldlYktpdExvYWRTaXRlSWNvbnNLZXkiIHNldHRpbmcgb24g
dGhlIHZpZXcgcGFnZS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVl
U3VwcG9ydEVmbC5jcHA6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldExv
YWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKToKKyAgICAgICAgKiBXZWJD
b3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuaDoKKwogMjAxMi0wNC0yNyAgQ2hy
aXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtF
RkxdIFJlc291cmNlRXJyb3IgZG9tYWluIG5lZWRzIHRvIGJlIHByb3Blcmx5IHNldCBpbiBGcmFt
ZUxvYWRlckNsaWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBv
cnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNv
cmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5jcHAKaW5kZXggYzQ3YjljYy4uZWY0
NjY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJl
bmRlclRyZWVTdXBwb3J0RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3Vw
cG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuY3BwCkBAIC0zODksNiArMzg5LDE1IEBAIHZv
aWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpzZXREZWZlcnNMb2FkaW5nKEV2YXNfT2JqZWN0
KiBld2tWaWV3LCBib29sIGRlZmVyCiAgICAgcGFnZS0+c2V0RGVmZXJzTG9hZGluZyhkZWZlcnMp
OwogfQogCit2b2lkIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6c2V0TG9hZHNTaXRlSWNvbnNJ
Z25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgbG9h
ZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVuY2VzKQoreworICAgIFdlYkNv
cmU6OlBhZ2UqIHBhZ2UgPSBFV0tQcml2YXRlOjpjb3JlUGFnZShld2tWaWV3KTsKKyAgICBpZiAo
IXBhZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIHBhZ2UtPnNldHRpbmdzKCktPnNldExvYWRz
U2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKGxvYWRzU2l0ZUljb25zSWdub3Jp
bmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlcyk7Cit9CisKIHZvaWQgRHVtcFJlbmRlclRyZWVTdXBw
b3J0RWZsOjphZGRVc2VyU3R5bGVTaGVldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgY29u
c3QgY2hhciogc291cmNlQ29kZSwgYm9vbCBhbGxGcmFtZXMpCiB7CiAgICAgV2ViQ29yZTo6UGFn
ZSogcGFnZSA9IEVXS1ByaXZhdGU6OmNvcmVQYWdlKGV3a1ZpZXcpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmgg
Yi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRF
ZmwuaAppbmRleCAzZTkyZDJhLi45NjYxZjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Vm
bC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuaAorKysgYi9Tb3VyY2Uv
V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuaApAQCAt
NzAsNiArNzAsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0VmFsdWVGb3JVc2VyKEpT
Q29udGV4dFJlZiwgSlNWYWx1ZVJlZiBub2RlT2JqZWN0LCBKU1N0cmluZ1JlZiB2YWx1ZSk7CiAg
ICAgc3RhdGljIHZvaWQgc2V0QXV0b2ZpbGxlZChKU0NvbnRleHRSZWYsIEpTVmFsdWVSZWYgbm9k
ZU9iamVjdCwgYm9vbCBhdXRvZmlsbGVkKTsKICAgICBzdGF0aWMgdm9pZCBzZXREZWZlcnNMb2Fk
aW5nKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBib29sIGRlZmVycyk7CisgICAgc3RhdGljIHZvaWQg
c2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoRXZhc19PYmplY3Qq
IGV3a1ZpZXcsIGJvb2wgbG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVu
Y2VzKTsKIAogICAgIHN0YXRpYyB2b2lkIGFkZFVzZXJTdHlsZVNoZWV0KGNvbnN0IEV2YXNfT2Jq
ZWN0KiBld2tWaWV3LCBjb25zdCBjaGFyKiBzb3VyY2VDb2RlLCBib29sIGFsbEZyYW1lcyk7CiAg
ICAgc3RhdGljIGJvb2wgZmluZFN0cmluZyhjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgY29u
c3QgY2hhciogdGV4dCwgV2ViQ29yZTo6RmluZE9wdGlvbnMpOwpkaWZmIC0tZ2l0IGEvVG9vbHMv
Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDc0YWUzNzEuLjIyYTk2ODQgMTAwNjQ0
Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAxMi0wNS0wMiAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50
ZWwuY29tPgorCisgICAgICAgIFtFRkxdIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IHN1
cHBvcnQgb3ZlcnJpZGluZyBXZWJLaXRMb2FkU2l0ZUljb25zS2V5CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTE3MQorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBzdXBwb3J0IGZvciBvdmVy
cmlkaW5nICJXZWJLaXRMb2FkU2l0ZUljb25zS2V5IiBzZXR0aW5nIGluCisgICAgICAgIEVGTCdz
IExheW91dFRlc3RDb250cm9sbGVyLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0xh
eW91dFRlc3RDb250cm9sbGVyRWZsLmNwcDoKKyAgICAgICAgKGJvb2xlYW5Gcm9tVmFsdWUpOgor
ICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZSk6CisKIDIw
MTItMDUtMDEgIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJha3Vjb0B3ZWJraXQub3JnPgogCiAg
ICAgICAgIHdlYmtpdHB5OiBSZW1vdmUgdW51c2VkIHBsYXRmb3JtIGltcG9ydHMuCmRpZmYgLS1n
aXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3Bw
IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcApp
bmRleCA2YzFkZDczLi4xMTU4NzQ4IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9l
ZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl
L2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAKQEAgLTY2Myw5ICs2NjMsMTcgQEAgdm9p
ZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cmVzdW1lQW5pbWF0aW9ucygpIGNvbnN0CiAgICAgRHVt
cFJlbmRlclRyZWVTdXBwb3J0RWZsOjpyZXN1bWVBbmltYXRpb25zKGJyb3dzZXItPm1haW5GcmFt
ZSgpKTsKIH0KIAotdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNl
KEpTU3RyaW5nUmVmLCBKU1N0cmluZ1JlZikKK3N0YXRpYyBib29sIGJvb2xlYW5Gcm9tVmFsdWUo
SlNTdHJpbmdSZWYgdmFsdWUpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICByZXR1cm4g
ZXF1YWxzKHZhbHVlLCAidHJ1ZSIpIHx8IGVxdWFscyh2YWx1ZSwgIjEiKTsKK30KKwordm9pZCBM
YXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKEpTU3RyaW5nUmVmIGtleSwg
SlNTdHJpbmdSZWYgdmFsdWUpCit7CisgICAgaWYgKGVxdWFscyhrZXksICJXZWJLaXRMb2FkU2l0
ZUljb25zS2V5IikpCisgICAgICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6c2V0TG9hZHNT
aXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoYnJvd3Nlci0+bWFpblZpZXcoKSwg
Ym9vbGVhbkZyb21WYWx1ZSh2YWx1ZSkpOworICAgIGVsc2UKKyAgICAgICAgZnByaW50ZihzdGRl
cnIsICJMYXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlIHRyaWVkIHRvIG92
ZXJyaWRlIHVua25vd24gcHJlZmVyZW5jZSAnJXMnLlxuIiwgdmFsdWUtPnVzdHJpbmcoKS51dGY4
KCkuZGF0YSgpKTsKIH0KIAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6YWRkVXNlclNjcmlw
dChKU1N0cmluZ1JlZiwgYm9vbCwgYm9vbCkK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>139777</attachid>
            <date>2012-05-02 02:55:13 -0700</date>
            <delta_ts>2012-05-02 22:26:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>85171_WebKitLoadSiteIconsKey.patch</filename>
            <type>text/plain</type>
            <size>6853</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCAyYjZiZjNhLi4xNmYwYWE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUt
MDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXSBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92ZXJyaWRp
bmcgV2ViS2l0TG9hZFNpdGVJY29uc0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9ODUxNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBVbnNraXAgaHR0cC90ZXN0cy9taXNjL2Zhdmljb24tbG9hZHMtd2l0
aC1pY29uLWxvYWRpbmctb3ZlcnJpZGUuaHRtbAorICAgICAgICBub3cgdGhhdCBFRkwncyBMYXlv
dXRUZXN0Q29udHJvbGxlciBzdXBwb3J0IG92ZXJyaWRpbmcKKyAgICAgICAgV2ViS2l0TG9hZFNp
dGVJY29uc0tleS4KKworICAgICAgICAqIHBsYXRmb3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA1
LTAxICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21p
dW1dIE1vdmUgZGF0ZS1pbnB1dC12aXNpYmxlLXN0cmluZ3MtZXhwZWN0ZWQudHh0IHRvIHRoZSBj
b3JyZWN0IHBsYWNlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBw
ZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRleCA5NDkyZmYyLi44MzYw
NzdjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9M
YXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtNjMwLDcgKzYzMCw2IEBAIGh0dHAv
dGVzdHMvbG9hZGluZy9yZWRpcmVjdC1tZXRob2RzLmh0bWwKIAogIyBSZXF1aXJlcyB3aWxsU2Vu
ZFJlcXVlc3RSZXR1cm5zTnVsbE9uUmVkaXJlY3QgKyB3aWxsU2VuZFJlcXVlc3QgKyBkaWRGaW5p
c2hMb2FkaW5nCiBodHRwL3Rlc3RzL21pc2Mvd2lsbC1zZW5kLXJlcXVlc3QtcmV0dXJucy1udWxs
LW9uLXJlZGlyZWN0Lmh0bWwKLWh0dHAvdGVzdHMvbWlzYy9mYXZpY29uLWxvYWRzLXdpdGgtaWNv
bi1sb2FkaW5nLW92ZXJyaWRlLmh0bWwKIAogIyBCVUc6IE5vIGF1dGhlbnRpY2F0aW9uIGNoYWxs
ZW5nZSBoYW5kbGluZwogaHR0cC90ZXN0cy9sb2FkaW5nL2Jhc2ljLWNyZWRlbnRpYWxzLXNlbnQt
YXV0b21hdGljYWxseS5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM
b2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggNDA1ZjJjZS4uYTM3YWI0OCAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL
aXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAyICBDaHJpc3RvcGhl
IER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF0gTGF5
b3V0VGVzdENvbnRyb2xsZXIgZG9lcyBub3Qgc3VwcG9ydCBvdmVycmlkaW5nIFdlYktpdExvYWRT
aXRlSWNvbnNLZXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTg1MTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQWRkIGEgaGVscGVyIGZ1bmN0aW9uIHRvIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbCB0byBv
dmVycmlkZSB0aGUKKyAgICAgICAgIldlYktpdExvYWRTaXRlSWNvbnNLZXkiIHNldHRpbmcgb24g
dGhlIHZpZXcgcGFnZS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVl
U3VwcG9ydEVmbC5jcHA6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldExv
YWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKToKKyAgICAgICAgKiBXZWJD
b3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuaDoKKwogMjAxMi0wNC0yNyAgQ2hy
aXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtF
RkxdIFJlc291cmNlRXJyb3IgZG9tYWluIG5lZWRzIHRvIGJlIHByb3Blcmx5IHNldCBpbiBGcmFt
ZUxvYWRlckNsaWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBv
cnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNv
cmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5jcHAKaW5kZXggYzQ3YjljYy4uZWY0
NjY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJl
bmRlclRyZWVTdXBwb3J0RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3Vw
cG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuY3BwCkBAIC0zODksNiArMzg5LDE1IEBAIHZv
aWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpzZXREZWZlcnNMb2FkaW5nKEV2YXNfT2JqZWN0
KiBld2tWaWV3LCBib29sIGRlZmVyCiAgICAgcGFnZS0+c2V0RGVmZXJzTG9hZGluZyhkZWZlcnMp
OwogfQogCit2b2lkIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6c2V0TG9hZHNTaXRlSWNvbnNJ
Z25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgbG9h
ZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVuY2VzKQoreworICAgIFdlYkNv
cmU6OlBhZ2UqIHBhZ2UgPSBFV0tQcml2YXRlOjpjb3JlUGFnZShld2tWaWV3KTsKKyAgICBpZiAo
IXBhZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIHBhZ2UtPnNldHRpbmdzKCktPnNldExvYWRz
U2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKGxvYWRzU2l0ZUljb25zSWdub3Jp
bmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlcyk7Cit9CisKIHZvaWQgRHVtcFJlbmRlclRyZWVTdXBw
b3J0RWZsOjphZGRVc2VyU3R5bGVTaGVldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgY29u
c3QgY2hhciogc291cmNlQ29kZSwgYm9vbCBhbGxGcmFtZXMpCiB7CiAgICAgV2ViQ29yZTo6UGFn
ZSogcGFnZSA9IEVXS1ByaXZhdGU6OmNvcmVQYWdlKGV3a1ZpZXcpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmgg
Yi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRF
ZmwuaAppbmRleCAzZTkyZDJhLi45NjYxZjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Vm
bC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuaAorKysgYi9Tb3VyY2Uv
V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuaApAQCAt
NzAsNiArNzAsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0VmFsdWVGb3JVc2VyKEpT
Q29udGV4dFJlZiwgSlNWYWx1ZVJlZiBub2RlT2JqZWN0LCBKU1N0cmluZ1JlZiB2YWx1ZSk7CiAg
ICAgc3RhdGljIHZvaWQgc2V0QXV0b2ZpbGxlZChKU0NvbnRleHRSZWYsIEpTVmFsdWVSZWYgbm9k
ZU9iamVjdCwgYm9vbCBhdXRvZmlsbGVkKTsKICAgICBzdGF0aWMgdm9pZCBzZXREZWZlcnNMb2Fk
aW5nKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBib29sIGRlZmVycyk7CisgICAgc3RhdGljIHZvaWQg
c2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoRXZhc19PYmplY3Qq
IGV3a1ZpZXcsIGJvb2wgbG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVu
Y2VzKTsKIAogICAgIHN0YXRpYyB2b2lkIGFkZFVzZXJTdHlsZVNoZWV0KGNvbnN0IEV2YXNfT2Jq
ZWN0KiBld2tWaWV3LCBjb25zdCBjaGFyKiBzb3VyY2VDb2RlLCBib29sIGFsbEZyYW1lcyk7CiAg
ICAgc3RhdGljIGJvb2wgZmluZFN0cmluZyhjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgY29u
c3QgY2hhciogdGV4dCwgV2ViQ29yZTo6RmluZE9wdGlvbnMpOwpkaWZmIC0tZ2l0IGEvVG9vbHMv
Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDc0YWUzNzEuLjZmY2FhMzYgMTAwNjQ0
Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
OSBAQAorMjAxMi0wNS0wMiAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50
ZWwuY29tPgorCisgICAgICAgIFtFRkxdIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IHN1
cHBvcnQgb3ZlcnJpZGluZyBXZWJLaXRMb2FkU2l0ZUljb25zS2V5CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTE3MQorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBzdXBwb3J0IGZvciBvdmVy
cmlkaW5nICJXZWJLaXRMb2FkU2l0ZUljb25zS2V5IiBzZXR0aW5nIGluCisgICAgICAgIEVGTCdz
IExheW91dFRlc3RDb250cm9sbGVyLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0R1
bXBSZW5kZXJUcmVlQ2hyb21lLmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21lOjpy
ZXNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJl
ZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwOgorICAgICAgICAodG9Cb29sKToKKyAg
ICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpvdmVycmlkZVByZWZlcmVuY2UpOgorCiAyMDEy
LTA1LTAxICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9yZz4KIAogICAg
ICAgICB3ZWJraXRweTogUmVtb3ZlIHVudXNlZCBwbGF0Zm9ybSBpbXBvcnRzLgpkaWZmIC0tZ2l0
IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcCBiL1Rv
b2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKaW5kZXggNjMw
MDQxMC4uYTA3YzI5ZSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBS
ZW5kZXJUcmVlQ2hyb21lLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJl
bmRlclRyZWVDaHJvbWUuY3BwCkBAIC0yNDgsNiArMjQ4LDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJl
ZUNocm9tZTo6cmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlcygpCiAgICAgRHVtcFJlbmRl
clRyZWVTdXBwb3J0RWZsOjpzZXREZWZlcnNMb2FkaW5nKG1haW5WaWV3KCksIGZhbHNlKTsKICAg
ICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldEVkaXRpbmdCZWhhdmlvcihtYWluVmlldygp
LCBkZWZhdWx0RWRpdGluZ0JlaGF2aW9yKCkpOwogICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVm
bDo6c2V0SmF2YVNjcmlwdFByb2ZpbGluZ0VuYWJsZWQobWFpblZpZXcoKSwgZmFsc2UpOworICAg
IER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6c2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdl
TG9hZGluZ1NldHRpbmcobWFpblZpZXcoKSwgZmFsc2UpOwogfQogCiBzdGF0aWMgQ1N0cmluZyBw
YXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IGNoYXIqIHVyaVN0cmluZykKZGlmZiAtLWdp
dCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAg
Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwCmlu
ZGV4IDZjMWRkNzMuLmNlZTczZDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Vm
bC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv
ZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcApAQCAtNjYzLDkgKzY2MywxNyBAQCB2b2lk
IExheW91dFRlc3RDb250cm9sbGVyOjpyZXN1bWVBbmltYXRpb25zKCkgY29uc3QKICAgICBEdW1w
UmVuZGVyVHJlZVN1cHBvcnRFZmw6OnJlc3VtZUFuaW1hdGlvbnMoYnJvd3Nlci0+bWFpbkZyYW1l
KCkpOwogfQogCi12b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpvdmVycmlkZVByZWZlcmVuY2Uo
SlNTdHJpbmdSZWYsIEpTU3RyaW5nUmVmKQorc3RhdGljIGlubGluZSBib29sIHRvQm9vbChKU1N0
cmluZ1JlZiB2YWx1ZSkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIHJldHVybiBlcXVh
bHModmFsdWUsICJ0cnVlIikgfHwgZXF1YWxzKHZhbHVlLCAiMSIpOworfQorCit2b2lkIExheW91
dFRlc3RDb250cm9sbGVyOjpvdmVycmlkZVByZWZlcmVuY2UoSlNTdHJpbmdSZWYga2V5LCBKU1N0
cmluZ1JlZiB2YWx1ZSkKK3sKKyAgICBpZiAoZXF1YWxzKGtleSwgIldlYktpdExvYWRTaXRlSWNv
bnNLZXkiKSkKKyAgICAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpzZXRMb2Fkc1NpdGVJ
Y29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGluZyhicm93c2VyLT5tYWluVmlldygpLCB0b0Jv
b2wodmFsdWUpKTsKKyAgICBlbHNlCisgICAgICAgIGZwcmludGYoc3RkZXJyLCAiTGF5b3V0VGVz
dENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZSB0cmllZCB0byBvdmVycmlkZSB1bmtub3du
IHByZWZlcmVuY2UgJyVzJy5cbiIsIHZhbHVlLT51c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiB9
CiAKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmFkZFVzZXJTY3JpcHQoSlNTdHJpbmdSZWYs
IGJvb2wsIGJvb2wpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>139953</attachid>
            <date>2012-05-02 22:26:01 -0700</date>
            <delta_ts>2012-05-04 07:10:22 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>85171_WebKitLoadSiteIconsKey.patch</filename>
            <type>text/plain</type>
            <size>6643</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCBlNWEyYTgwLi4zYjIxZmE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUt
MDMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXSBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92ZXJyaWRp
bmcgV2ViS2l0TG9hZFNpdGVJY29uc0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9ODUxNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBVbnNraXAgaHR0cC90ZXN0cy9taXNjL2Zhdmljb24tbG9hZHMtd2l0
aC1pY29uLWxvYWRpbmctb3ZlcnJpZGUuaHRtbAorICAgICAgICBub3cgdGhhdCBFRkwncyBMYXlv
dXRUZXN0Q29udHJvbGxlciBzdXBwb3J0IG92ZXJyaWRpbmcKKyAgICAgICAgV2ViS2l0TG9hZFNp
dGVJY29uc0tleS4KKworICAgICAgICAqIHBsYXRmb3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA1
LTAyICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5y
ZXZpZXdlZCBnYXJkZW5pbmcuIEFkanVzdGVkIGV4cGVjdGF0aW9ucyBmb3Igc2xvdyB0ZXN0cy4K
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVkIGIvTGF5b3V0VGVz
dHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKaW5kZXggZjk5NTczZS4uMzg1MDAzMiAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxh
dGZvcm0vZWZsL1NraXBwZWQKQEAgLTU4OSw3ICs1ODksNiBAQCBodHRwL3Rlc3RzL2xvYWRpbmcv
cmVkaXJlY3QtbWV0aG9kcy5odG1sCiAKICMgUmVxdWlyZXMgd2lsbFNlbmRSZXF1ZXN0UmV0dXJu
c051bGxPblJlZGlyZWN0ICsgd2lsbFNlbmRSZXF1ZXN0ICsgZGlkRmluaXNoTG9hZGluZwogaHR0
cC90ZXN0cy9taXNjL3dpbGwtc2VuZC1yZXF1ZXN0LXJldHVybnMtbnVsbC1vbi1yZWRpcmVjdC5o
dG1sCi1odHRwL3Rlc3RzL21pc2MvZmF2aWNvbi1sb2Fkcy13aXRoLWljb24tbG9hZGluZy1vdmVy
cmlkZS5odG1sCiAKICMgQlVHOiBObyBhdXRoZW50aWNhdGlvbiBjaGFsbGVuZ2UgaGFuZGxpbmcK
IGh0dHAvdGVzdHMvbG9hZGluZy9iYXNpYy1jcmVkZW50aWFscy1zZW50LWF1dG9tYXRpY2FsbHku
aHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvU291cmNlL1dl
YktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IDBiODE5YTMuLmQ0ZjM4MTIgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM
b2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNS0wMyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlz
dG9waGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdIExheW91dFRlc3RDb250cm9s
bGVyIGRvZXMgbm90IHN1cHBvcnQgb3ZlcnJpZGluZyBXZWJLaXRMb2FkU2l0ZUljb25zS2V5Cisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTE3MQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGhlbHBl
ciBmdW5jdGlvbiB0byBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwgdG8gb3ZlcnJpZGUgdGhlCisg
ICAgICAgICJXZWJLaXRMb2FkU2l0ZUljb25zS2V5IiBzZXR0aW5nIG9uIHRoZSB2aWV3IHBhZ2Uu
CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuY3Bw
OgorICAgICAgICAoRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpzZXRMb2Fkc1NpdGVJY29uc0ln
bm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGluZyk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVt
cFJlbmRlclRyZWVTdXBwb3J0RWZsLmg6CisKIDIwMTItMDQtMTggIEpvbiBIb25leWN1dHQgIDxq
aG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0
Y2hXaWxsU2VuZFN1Ym1pdEV2ZW50KCkgc2hvdWxkIGJlIGdpdmVuIG1vcmUKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVm
bC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1
cHBvcnRFZmwuY3BwCmluZGV4IGM0N2I5Y2MuLmVmNDY2ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5jcHAKKysr
IGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0
RWZsLmNwcApAQCAtMzg5LDYgKzM4OSwxNSBAQCB2b2lkIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVm
bDo6c2V0RGVmZXJzTG9hZGluZyhFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCBkZWZlcgogICAg
IHBhZ2UtPnNldERlZmVyc0xvYWRpbmcoZGVmZXJzKTsKIH0KIAordm9pZCBEdW1wUmVuZGVyVHJl
ZVN1cHBvcnRFZmw6OnNldExvYWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5n
KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBib29sIGxvYWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxv
YWRpbmdQcmVmZXJlbmNlcykKK3sKKyAgICBXZWJDb3JlOjpQYWdlKiBwYWdlID0gRVdLUHJpdmF0
ZTo6Y29yZVBhZ2UoZXdrVmlldyk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisK
KyAgICBwYWdlLT5zZXR0aW5ncygpLT5zZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2Fk
aW5nU2V0dGluZyhsb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVyZW5jZXMp
OworfQorCiB2b2lkIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6YWRkVXNlclN0eWxlU2hlZXQo
Y29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHNvdXJjZUNvZGUsIGJvb2wg
YWxsRnJhbWVzKQogewogICAgIFdlYkNvcmU6OlBhZ2UqIHBhZ2UgPSBFV0tQcml2YXRlOjpjb3Jl
UGFnZShld2tWaWV3KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBw
b3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5oIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29y
ZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmgKaW5kZXggM2U5MmQyYS4uOTY2MWY3
MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRl
clRyZWVTdXBwb3J0RWZsLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQv
RHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmgKQEAgLTcwLDYgKzcwLDcgQEAgcHVibGljOgogICAg
IHN0YXRpYyB2b2lkIHNldFZhbHVlRm9yVXNlcihKU0NvbnRleHRSZWYsIEpTVmFsdWVSZWYgbm9k
ZU9iamVjdCwgSlNTdHJpbmdSZWYgdmFsdWUpOwogICAgIHN0YXRpYyB2b2lkIHNldEF1dG9maWxs
ZWQoSlNDb250ZXh0UmVmLCBKU1ZhbHVlUmVmIG5vZGVPYmplY3QsIGJvb2wgYXV0b2ZpbGxlZCk7
CiAgICAgc3RhdGljIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhFdmFzX09iamVjdCogZXdrVmlldywg
Ym9vbCBkZWZlcnMpOworICAgIHN0YXRpYyB2b2lkIHNldExvYWRzU2l0ZUljb25zSWdub3JpbmdJ
bWFnZUxvYWRpbmdTZXR0aW5nKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBib29sIGxvYWRzU2l0ZUlj
b25zSWdub3JpbmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlcyk7CiAKICAgICBzdGF0aWMgdm9pZCBh
ZGRVc2VyU3R5bGVTaGVldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgY2hhciog
c291cmNlQ29kZSwgYm9vbCBhbGxGcmFtZXMpOwogICAgIHN0YXRpYyBib29sIGZpbmRTdHJpbmco
Y29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRleHQsIFdlYkNvcmU6OkZp
bmRPcHRpb25zKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv
ZwppbmRleCBlMjUxZjY3Li42ZWQ0YThiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr
IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDUtMDMgIENocmlzdG9w
aGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBM
YXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92ZXJyaWRpbmcgV2ViS2l0TG9h
ZFNpdGVJY29uc0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9ODUxNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBJbXBsZW1lbnQgc3VwcG9ydCBmb3Igb3ZlcnJpZGluZyAiV2ViS2l0TG9hZFNpdGVJY29u
c0tleSIgc2V0dGluZyBpbgorICAgICAgICBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxlci4KKwor
ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHA6Cisg
ICAgICAgIChEdW1wUmVuZGVyVHJlZUNocm9tZTo6cmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZh
bHVlcyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVy
RWZsLmNwcDoKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpvdmVycmlkZVByZWZlcmVu
Y2UpOgorCiAyMDEyLTA1LTAyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWls
LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTE1OTE4LgpkaWZmIC0t
Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcCBi
L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKaW5kZXgg
YzE3NzAzOS4uOTg5YTAyMCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1
bXBSZW5kZXJUcmVlQ2hyb21lLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVt
cFJlbmRlclRyZWVDaHJvbWUuY3BwCkBAIC0yNTEsNiArMjUxLDcgQEAgdm9pZCBEdW1wUmVuZGVy
VHJlZUNocm9tZTo6cmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlcygpCiAgICAgRHVtcFJl
bmRlclRyZWVTdXBwb3J0RWZsOjpzZXREZWZlcnNMb2FkaW5nKG1haW5WaWV3KCksIGZhbHNlKTsK
ICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldEVkaXRpbmdCZWhhdmlvcihtYWluVmll
dygpLCBkZWZhdWx0RWRpdGluZ0JlaGF2aW9yKCkpOwogICAgIER1bXBSZW5kZXJUcmVlU3VwcG9y
dEVmbDo6c2V0SmF2YVNjcmlwdFByb2ZpbGluZ0VuYWJsZWQobWFpblZpZXcoKSwgZmFsc2UpOwor
ICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6c2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0lt
YWdlTG9hZGluZ1NldHRpbmcobWFpblZpZXcoKSwgZmFsc2UpOwogfQogCiBzdGF0aWMgQ1N0cmlu
ZyBwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IGNoYXIqIHVyaVN0cmluZykKZGlmZiAt
LWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5j
cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3Bw
CmluZGV4IDA0YWNlODkuLjVlNmQwZDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl
L2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy
ZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcApAQCAtNjkzLDYgKzY5Myw4IEBAIHZv
aWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZShKU1N0cmluZ1JlZiBr
ZXksIEpTU3RyaW5nUmVmIHZhbHVlCiAgICAgICAgIGV3a192aWV3X3NldHRpbmdfZW5hYmxlX2h5
cGVybGlua19hdWRpdGluZ19zZXQoYnJvd3Nlci0+bWFpblZpZXcoKSwgdG9Cb29sKHZhbHVlKSk7
CiAgICAgZWxzZSBpZiAoZXF1YWxzKGtleSwgIldlYktpdFRhYlRvTGlua3NQcmVmZXJlbmNlS2V5
IikpCiAgICAgICAgIGV3a192aWV3X3NldHRpbmdfaW5jbHVkZV9saW5rc19pbl9mb2N1c19jaGFp
bl9zZXQoYnJvd3Nlci0+bWFpblZpZXcoKSwgdG9Cb29sKHZhbHVlKSk7CisgICAgZWxzZSBpZiAo
ZXF1YWxzKGtleSwgIldlYktpdExvYWRTaXRlSWNvbnNLZXkiKSkKKyAgICAgICAgRHVtcFJlbmRl
clRyZWVTdXBwb3J0RWZsOjpzZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nU2V0
dGluZyhicm93c2VyLT5tYWluVmlldygpLCB0b0Jvb2wodmFsdWUpKTsKICAgICBlbHNlCiAgICAg
ICAgIGZwcmludGYoc3RkZXJyLCAiTGF5b3V0VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVy
ZW5jZSB0cmllZCB0byBvdmVycmlkZSB1bmtub3duIHByZWZlcmVuY2UgJyVzJy5cbiIsIHZhbHVl
LT51c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiB9Cg==
</data>
<flag name="review"
          id="145692"
          type_id="1"
          status="+"
          setter="kling"
    />
    <flag name="commit-queue"
          id="145693"
          type_id="3"
          status="-"
          setter="webkit.review.bot"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>140218</attachid>
            <date>2012-05-04 07:10:22 -0700</date>
            <delta_ts>2012-05-04 07:31:57 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>85171_WebKitLoadSiteIconsKey.patch</filename>
            <type>text/plain</type>
            <size>6854</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCAwYjY4YjM2Li4yYWI2MDI5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUt
MDQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg
ICAgICBbRUZMXSBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBzdXBwb3J0IG92ZXJyaWRp
bmcgV2ViS2l0TG9hZFNpdGVJY29uc0tleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9ODUxNzEKKworICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEts
aW5nLgorCisgICAgICAgIFVuc2tpcCBodHRwL3Rlc3RzL21pc2MvZmF2aWNvbi1sb2Fkcy13aXRo
LWljb24tbG9hZGluZy1vdmVycmlkZS5odG1sCisgICAgICAgIG5vdyB0aGF0IEVGTCdzIExheW91
dFRlc3RDb250cm9sbGVyIHN1cHBvcnQgb3ZlcnJpZGluZworICAgICAgICBXZWJLaXRMb2FkU2l0
ZUljb25zS2V5LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1NraXBwZWQ6CisKIDIwMTItMDUt
MDQgIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJha3Vjb0B3ZWJraXQub3JnPgogCiAgICAgICAg
IFtFRkxdIFVucmV2aWV3ZWQsIGZpeCByMTE2MDY3IGFuZCByMTE2MDY4LgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9l
ZmwvU2tpcHBlZAppbmRleCA1MWExMmQ2Li4wMGY5NzgxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tp
cHBlZApAQCAtMzg1LDkgKzM4NSw2IEBAIGZhc3QvcGFyc2VyL3ByZS1odG1sNS1wYXJzZXItcXVp
cmtzLmh0bWwKICMgRUZMJ3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgb3ZlcnJpZGVQcmVmZXJlbmNl
IGRvZXMgbm90IGltcGxlbWVudCBXZWJLaXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJs
ZWQgcHJlZmVyZW5jZQogaHR0cC90ZXN0cy9hcHBjYWNoZS9kaXNhYmxlZC5odG1sCiAKLSMgRUZM
J3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgb3ZlcnJpZGVQcmVmZXJlbmNlIGRvZXMgbm90IGltcGxl
bWVudCBXZWJLaXRMb2FkU2l0ZUljb25zS2V5IHByZWZlcmVuY2UKLWh0dHAvdGVzdHMvbWlzYy9m
YXZpY29uLWxvYWRzLXdpdGgtaWNvbi1sb2FkaW5nLW92ZXJyaWRlLmh0bWwKLQogIyBFRkwncyBM
YXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBpbXBsZW1lbnQgYWRkVXNlclNjcmlwdAogdXNl
cnNjcmlwdHMvZG9jdW1lbnQtZWxlbWVudC1hdmFpbGFibGUtYXQtc3RhcnQuaHRtbAogdXNlcnNj
cmlwdHMvc2NyaXB0LW5vdC1ydW4tZm9yLWZyYWdtZW50cy5odG1sCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5k
ZXggNWE2MWQwYi4uYTUxZmYxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy
MDEyLTA1LTA0ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+
CisKKyAgICAgICAgW0VGTF0gTGF5b3V0VGVzdENvbnRyb2xsZXIgZG9lcyBub3Qgc3VwcG9ydCBv
dmVycmlkaW5nIFdlYktpdExvYWRTaXRlSWNvbnNLZXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5k
cmVhcyBLbGluZy4KKworICAgICAgICBBZGQgYSBoZWxwZXIgZnVuY3Rpb24gdG8gRHVtcFJlbmRl
clRyZWVTdXBwb3J0RWZsIHRvIG92ZXJyaWRlIHRoZQorICAgICAgICAiV2ViS2l0TG9hZFNpdGVJ
Y29uc0tleSIgc2V0dGluZyBvbiB0aGUgdmlldyBwYWdlLgorCisgICAgICAgICogV2ViQ29yZVN1
cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJU
cmVlU3VwcG9ydEVmbDo6c2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRp
bmcpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5o
OgorCiAyMDEyLTA1LTAzICBGYWR5IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgogCiAg
ICAgICAgIFJlbW92aW5nIGxpbmUgaW4gY29tcHV0ZVZpZXdwb3J0QXR0cmlidXRlcyB0aGF0IGVu
Zm9yY2VzIGEgbWluaW11bSBzY2FsZSBmYWN0b3IgdG8gbmV2ZXIgYWxsb3cgem9vbWluZyBvdXQg
bW9yZSB0aGFuIHZpZXdwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl
U3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwv
V2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNwcAppbmRleCA5MzM3OTRi
Li5iZWY1YzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9E
dW1wUmVuZGVyVHJlZVN1cHBvcnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNv
cmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5jcHAKQEAgLTM4OSw2ICszODksMTUg
QEAgdm9pZCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldERlZmVyc0xvYWRpbmcoRXZhc19P
YmplY3QqIGV3a1ZpZXcsIGJvb2wgZGVmZXIKICAgICBwYWdlLT5zZXREZWZlcnNMb2FkaW5nKGRl
ZmVycyk7CiB9CiAKK3ZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpzZXRMb2Fkc1NpdGVJ
Y29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGluZyhFdmFzX09iamVjdCogZXdrVmlldywgYm9v
bCBsb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVyZW5jZXMpCit7CisgICAg
V2ViQ29yZTo6UGFnZSogcGFnZSA9IEVXS1ByaXZhdGU6OmNvcmVQYWdlKGV3a1ZpZXcpOworICAg
IGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgcGFnZS0+c2V0dGluZ3MoKS0+c2V0
TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcobG9hZHNTaXRlSWNvbnNJ
Z25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVuY2VzKTsKK30KKwogdm9pZCBEdW1wUmVuZGVyVHJl
ZVN1cHBvcnRFZmw6OmFkZFVzZXJTdHlsZVNoZWV0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3
LCBjb25zdCBjaGFyKiBzb3VyY2VDb2RlLCBib29sIGFsbEZyYW1lcykKIHsKICAgICBXZWJDb3Jl
OjpQYWdlKiBwYWdlID0gRVdLUHJpdmF0ZTo6Y29yZVBhZ2UoZXdrVmlldyk7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRF
ZmwuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw
cG9ydEVmbC5oCmluZGV4IDNlOTJkMmEuLjk2NjFmNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5oCisrKyBiL1Nv
dXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5o
CkBAIC03MCw2ICs3MCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBzZXRWYWx1ZUZvclVz
ZXIoSlNDb250ZXh0UmVmLCBKU1ZhbHVlUmVmIG5vZGVPYmplY3QsIEpTU3RyaW5nUmVmIHZhbHVl
KTsKICAgICBzdGF0aWMgdm9pZCBzZXRBdXRvZmlsbGVkKEpTQ29udGV4dFJlZiwgSlNWYWx1ZVJl
ZiBub2RlT2JqZWN0LCBib29sIGF1dG9maWxsZWQpOwogICAgIHN0YXRpYyB2b2lkIHNldERlZmVy
c0xvYWRpbmcoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgZGVmZXJzKTsKKyAgICBzdGF0aWMg
dm9pZCBzZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGluZyhFdmFzX09i
amVjdCogZXdrVmlldywgYm9vbCBsb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJl
ZmVyZW5jZXMpOwogCiAgICAgc3RhdGljIHZvaWQgYWRkVXNlclN0eWxlU2hlZXQoY29uc3QgRXZh
c19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHNvdXJjZUNvZGUsIGJvb2wgYWxsRnJhbWVz
KTsKICAgICBzdGF0aWMgYm9vbCBmaW5kU3RyaW5nKGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3
LCBjb25zdCBjaGFyKiB0ZXh0LCBXZWJDb3JlOjpGaW5kT3B0aW9ucyk7CmRpZmYgLS1naXQgYS9U
b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTJlNTI4Yy4uZTcyYmI3NmUg
MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxOCBAQAorMjAxMi0wNS0wNCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVt
ZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMg
bm90IHN1cHBvcnQgb3ZlcnJpZGluZyBXZWJLaXRMb2FkU2l0ZUljb25zS2V5CisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTE3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCisKKyAgICAgICAgSW1wbGVtZW50IHN1cHBvcnQgZm9y
IG92ZXJyaWRpbmcgIldlYktpdExvYWRTaXRlSWNvbnNLZXkiIHNldHRpbmcgaW4KKyAgICAgICAg
RUZMJ3MgTGF5b3V0VGVzdENvbnRyb2xsZXIuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9l
ZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVDaHJv
bWU6OnJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMpOgorICAgICAgICAqIER1bXBSZW5k
ZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHA6CisgICAgICAgIChMYXlvdXRU
ZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKToKKwogMjAxMi0wNS0wMyAgQWxleGlz
IE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbUXRdIEVu
YWJsZSBmdWxsc2NyZWVuIEFQSSBmb3IgV2ViS2l0Mi4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS
ZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVy
VHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCmluZGV4IDEzZTY3YmYuLjZjOGNhNTUg
MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9t
ZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21l
LmNwcApAQCAtMjUxLDYgKzI1MSw3IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6OnJlc2V0
RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVm
bDo6c2V0RGVmZXJzTG9hZGluZyhtYWluVmlldygpLCBmYWxzZSk7CiAgICAgRHVtcFJlbmRlclRy
ZWVTdXBwb3J0RWZsOjpzZXRFZGl0aW5nQmVoYXZpb3IobWFpblZpZXcoKSwgZGVmYXVsdEVkaXRp
bmdCZWhhdmlvcigpKTsKICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldEphdmFTY3Jp
cHRQcm9maWxpbmdFbmFibGVkKG1haW5WaWV3KCksIGZhbHNlKTsKKyAgICBEdW1wUmVuZGVyVHJl
ZVN1cHBvcnRFZmw6OnNldExvYWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5n
KG1haW5WaWV3KCksIGZhbHNlKTsKIH0KIAogc3RhdGljIENTdHJpbmcgcGF0aFN1aXRhYmxlRm9y
VGVzdFJlc3VsdChjb25zdCBjaGFyKiB1cmlTdHJpbmcpCmRpZmYgLS1naXQgYS9Ub29scy9EdW1w
UmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwIGIvVG9vbHMvRHVtcFJl
bmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcAppbmRleCA4NmYyMzhkLi4x
ZGU3ZGRiIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENv
bnRyb2xsZXJFZmwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0
Q29udHJvbGxlckVmbC5jcHAKQEAgLTY5Myw2ICs2OTMsOCBAQCB2b2lkIExheW91dFRlc3RDb250
cm9sbGVyOjpvdmVycmlkZVByZWZlcmVuY2UoSlNTdHJpbmdSZWYga2V5LCBKU1N0cmluZ1JlZiB2
YWx1ZQogICAgICAgICBld2tfdmlld19zZXR0aW5nX2VuYWJsZV9oeXBlcmxpbmtfYXVkaXRpbmdf
c2V0KGJyb3dzZXItPm1haW5WaWV3KCksIHRvQm9vbCh2YWx1ZSkpOwogICAgIGVsc2UgaWYgKGVx
dWFscyhrZXksICJXZWJLaXRUYWJUb0xpbmtzUHJlZmVyZW5jZUtleSIpKQogICAgICAgICBld2tf
dmlld19zZXR0aW5nX2luY2x1ZGVfbGlua3NfaW5fZm9jdXNfY2hhaW5fc2V0KGJyb3dzZXItPm1h
aW5WaWV3KCksIHRvQm9vbCh2YWx1ZSkpOworICAgIGVsc2UgaWYgKGVxdWFscyhrZXksICJXZWJL
aXRMb2FkU2l0ZUljb25zS2V5IikpCisgICAgICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6
c2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoYnJvd3Nlci0+bWFp
blZpZXcoKSwgdG9Cb29sKHZhbHVlKSk7CiAgICAgZWxzZQogICAgICAgICBmcHJpbnRmKHN0ZGVy
ciwgIkxheW91dFRlc3RDb250cm9sbGVyOjpvdmVycmlkZVByZWZlcmVuY2UgdHJpZWQgdG8gb3Zl
cnJpZGUgdW5rbm93biBwcmVmZXJlbmNlICclcycuXG4iLCB2YWx1ZS0+dXN0cmluZygpLnV0Zjgo
KS5kYXRhKCkpOwogfQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>