<?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>131115</bug_id>
          
          <creation_ts>2014-04-02 12:07:37 -0700</creation_ts>
          <short_desc>prepare-Changelog and svn-create-patch should optionally run check-webkit-style.</short_desc>
          <delta_ts>2014-04-28 13:33:38 -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>Tools / Tests</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>InRadar</keywords>
          <priority>P4</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>132209</blocked>
    
    <blocked>132300</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="James Craig">jcraig</reporter>
          <assigned_to name="James Craig">jcraig</assigned_to>
          <cc>ap</cc>
    
    <cc>commit-queue</cc>
    
    <cc>darin</cc>
    
    <cc>dbates</cc>
    
    <cc>glenn</cc>
    
    <cc>jcraig</cc>
    
    <cc>joepeck</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zoltan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>996772</commentid>
    <comment_count>0</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-02 12:07:37 -0700</bug_when>
    <thetext>prepare-changelog and svn-create-patch should automatically run check-webkit-style. I forget to do this probably half the time.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>996891</commentid>
    <comment_count>1</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-02 16:11:42 -0700</bug_when>
    <thetext>Adding -s|--style param to both those scripts.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>996895</commentid>
    <comment_count>2</comment_count>
      <attachid>228439</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-02 16:16:22 -0700</bug_when>
    <thetext>Created attachment 228439
patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>996898</commentid>
    <comment_count>3</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2014-04-02 16:17:50 -0700</bug_when>
    <thetext>&lt;rdar://problem/16506103&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997207</commentid>
    <comment_count>4</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2014-04-03 09:54:02 -0700</bug_when>
    <thetext>Personally, I&apos;d be willing to experiment with making it a default behavior. A change to default behavior would need to be discussed on webkit-dev, of course.

I&apos;m not sure how many people use these scripts vs. webkit-patch. I use these and never use webkit-patch, but I believe that a lot of people do the opposite.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997239</commentid>
    <comment_count>5</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-03 11:08:20 -0700</bug_when>
    <thetext>Okay. I&apos;ll make that the default and create a new patch with a nullable flag. E.g. --nostyle if you want to disable the style checks.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997382</commentid>
    <comment_count>6</comment_count>
      <attachid>228562</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-03 17:09:22 -0700</bug_when>
    <thetext>Created attachment 228562
patch

Added as default to prepare-Changelog, but couldn&apos;t figure out a good way to set as default in svn-create-patch without causing a loop. Lots of scripts call svn-create-patch, including check-webkit-style indirectly which causes a loop. Most of the time these are system calls instead of submodules (probably b/c the scripts are a mix of Python and Perl), so I could not use the &quot;unless (caller)&quot; conditional reliably. Seems fine to me to make it a flag. I just set up a bash alias for svn-create-patch to use the --style flag. I added --no-style in a few of the callers, too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997383</commentid>
    <comment_count>7</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2014-04-03 17:11:19 -0700</bug_when>
    <thetext>Thank you! Please do start a discussion on webkit-dev.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997584</commentid>
    <comment_count>8</comment_count>
      <attachid>228562</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-04 09:18:29 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

&gt; Tools/Scripts/prepare-ChangeLog:603
&gt; +    system dirname(File::Spec-&gt;rel2abs(__FILE__)) . &quot;/check-webkit-style&quot;;

Perl veterans… Is this the recommended way to run a Python script from the same directory as the currently executing Perl script?

&gt; Tools/Scripts/svn-create-patch:148
&gt; +    system dirname(File::Spec-&gt;rel2abs(__FILE__)) . &quot;/check-webkit-style&quot;;

Ditto.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997654</commentid>
    <comment_count>9</comment_count>
      <attachid>228562</attachid>
    <who name="Zoltan Horvath">zoltan</who>
    <bug_when>2014-04-04 11:56:46 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

&gt;&gt; Tools/Scripts/prepare-ChangeLog:603
&gt;&gt; +    system dirname(File::Spec-&gt;rel2abs(__FILE__)) . &quot;/check-webkit-style&quot;;
&gt; 
&gt; Perl veterans… Is this the recommended way to run a Python script from the same directory as the currently executing Perl script?

What about

system(&quot;check-webkit-style&quot;) == 0 or die &quot;Failed to check-webkit-style.&quot;;

like we have it in the svn-apply/svn-unapply scripts.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997657</commentid>
    <comment_count>10</comment_count>
      <attachid>228562</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-04 12:06:08 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

&gt;&gt;&gt; Tools/Scripts/prepare-ChangeLog:603
&gt;&gt;&gt; +    system dirname(File::Spec-&gt;rel2abs(__FILE__)) . &quot;/check-webkit-style&quot;;
&gt;&gt; 
&gt;&gt; Perl veterans… Is this the recommended way to run a Python script from the same directory as the currently executing Perl script?
&gt; 
&gt; What about
&gt; 
&gt; system(&quot;check-webkit-style&quot;) == 0 or die &quot;Failed to check-webkit-style.&quot;;
&gt; 
&gt; like we have it in the svn-apply/svn-unapply scripts.

It&apos;d have to be the script in the current directory to work for me. Sometimes I have multiple SVN checkouts, and the system path you&apos;ve suggested above would be a global, potentially masking some failure in the current directory if it was not the one used in $PATH.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997749</commentid>
    <comment_count>11</comment_count>
      <attachid>228562</attachid>
    <who name="Zoltan Horvath">zoltan</who>
    <bug_when>2014-04-04 16:36:52 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

&gt;&gt;&gt;&gt; Tools/Scripts/prepare-ChangeLog:603
&gt;&gt;&gt;&gt; +    system dirname(File::Spec-&gt;rel2abs(__FILE__)) . &quot;/check-webkit-style&quot;;
&gt;&gt;&gt; 
&gt;&gt;&gt; Perl veterans… Is this the recommended way to run a Python script from the same directory as the currently executing Perl script?
&gt;&gt; 
&gt;&gt; What about
&gt;&gt; 
&gt;&gt; system(&quot;check-webkit-style&quot;) == 0 or die &quot;Failed to check-webkit-style.&quot;;
&gt;&gt; 
&gt;&gt; like we have it in the svn-apply/svn-unapply scripts.
&gt; 
&gt; It&apos;d have to be the script in the current directory to work for me. Sometimes I have multiple SVN checkouts, and the system path you&apos;ve suggested above would be a global, potentially masking some failure in the current directory if it was not the one used in $PATH.

Fair enough. The way you did it, seems fine!

&gt; Tools/Scripts/svn-create-patch:81
&gt; +my $checkWebKitStyle = 0;

I support make it default.

The change looks good to me in general.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997757</commentid>
    <comment_count>12</comment_count>
      <attachid>228562</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-04 17:08:39 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

&gt;&gt; Tools/Scripts/svn-create-patch:81
&gt;&gt; +my $checkWebKitStyle = 0;
&gt; 
&gt; I support make it default.
&gt; 
&gt; The change looks good to me in general.

See comment #6. I&apos;d like to leave this a flag for now and change the default if and when the infinite recursion edge cases can be worked out.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>998157</commentid>
    <comment_count>13</comment_count>
      <attachid>228562</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2014-04-07 09:25:36 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

&gt; Tools/ChangeLog:9
&gt; +        Added as default for prepare-Changelog, but not in svn-create-patch, to avoid loops in recursive calls.

I take it that it isn&apos;t straightforward to audit all callers of svn-create-patch so as to eliminate recursive/duplicate calls? That is, modify callers to pass --no-style (as applicable) such that we don&apos;t recursively call check-webkit-style or call it more than once.

&gt; Tools/Scripts/prepare-ChangeLog:75
&gt; +sub checkWebKitStyle();

Please add this prototype declaration in sorted order according to the UNIX sort command.

&gt; Tools/Scripts/prepare-ChangeLog:232
&gt; +    # Run check-webkit-style.

This comment is unnecessary as it states exactly what the code is doing below. Please remove this comment.

&gt;&gt;&gt;&gt;&gt; Tools/Scripts/prepare-ChangeLog:603
&gt;&gt;&gt;&gt;&gt; +    system dirname(File::Spec-&gt;rel2abs(__FILE__)) . &quot;/check-webkit-style&quot;;
&gt;&gt;&gt;&gt; 
&gt;&gt;&gt;&gt; Perl veterans… Is this the recommended way to run a Python script from the same directory as the currently executing Perl script?
&gt;&gt;&gt; 
&gt;&gt;&gt; What about
&gt;&gt;&gt; 
&gt;&gt;&gt; system(&quot;check-webkit-style&quot;) == 0 or die &quot;Failed to check-webkit-style.&quot;;
&gt;&gt;&gt; 
&gt;&gt;&gt; like we have it in the svn-apply/svn-unapply scripts.
&gt;&gt; 
&gt;&gt; It&apos;d have to be the script in the current directory to work for me. Sometimes I have multiple SVN checkouts, and the system path you&apos;ve suggested above would be a global, potentially masking some failure in the current directory if it was not the one used in $PATH.
&gt; 
&gt; Fair enough. The way you did it, seems fine!

Can&apos;t we use a similar approach as in Tools/Scripts/commit-log-editor and use $FindBin::Bin?

I don&apos;t see the value in having this function given that it&apos;s referenced exactly once in this script and it&apos;s straightforward to understand. I suggest we inline its implementation at the call site.

Additional remarks:

Most scripts call webkitdirs::chdirWebKit() at the start of a script to change the working directory to the WebKit checkout directory and then hardcode the path to the program relative to the WebKit checkout directory (e.g. Tools/Scripts/check-webkit-style). Obviously this approach has the disadvantage that we need to update this hardcoded relative path should our directory structure change (though this tends to be rare).

&gt;&gt;&gt; Tools/Scripts/svn-create-patch:81
&gt;&gt;&gt; +my $checkWebKitStyle = 0;
&gt;&gt; 
&gt;&gt; I support make it default.
&gt;&gt; 
&gt;&gt; The change looks good to me in general.
&gt; 
&gt; See comment #6. I&apos;d like to leave this a flag for now and change the default if and when the infinite recursion edge cases can be worked out.

This is OK. It&apos;s unnecessary to explicitly initialize this variable to 0. By default a variable is initialized to undef, which evaluates to false in a boolean context. And this variable is used only in a boolean context throughout this script.

&gt; Tools/Scripts/svn-create-patch:87
&gt; +    &quot;ignore-changelogs&quot;    =&gt; \$ignoreChangelogs,

Since we&apos;re modifying this line please remove the extraneous whitespace in this line such that it reads:

&quot;ignore-changelogs&quot; =&gt; \$ignoreChangelogs,

&gt; Tools/Scripts/svn-create-patch:88
&gt; +    &quot;style!&quot; =&gt; \$checkWebKitStyle

I suggest that we add a comma at the end of this line so that a future patch that adds a command line option can avoid modifying this line (so as to add a comma at the end of it).

&gt; Tools/Scripts/svn-create-patch:112
&gt; +# Run check-webkit-style.

This comment is unnecessary as it states exactly what the code is doing below. Please remove this comment.

&gt; Tools/Scripts/svn-create-patch:113
&gt; +unless (caller) {

Did you mean to keep this given that this patch proposes that we don&apos;t run the style checker by default and the remark about reliability that you raised in comment 6? If you choose to keep this then I suggest we add a comment to explain the purpose of this conditional.

&gt;&gt; Tools/Scripts/svn-create-patch:148
&gt;&gt; +    system dirname(File::Spec-&gt;rel2abs(__FILE__)) . &quot;/check-webkit-style&quot;;
&gt; 
&gt; Ditto.

Can&apos;t we use a similar approach as in Tools/Scripts/commit-log-editor and use $FindBin::Bin?

I don&apos;t see the value in having this function given that it&apos;s referenced exactly once in this script and it&apos;s straightforward to understand. I suggest we inline its implementation at the call site.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>999127</commentid>
    <comment_count>14</comment_count>
      <attachid>228562</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-09 00:52:52 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

Thanks for the review. I&apos;ll get those changes in an updated patch ASAP.

&gt;&gt; Tools/ChangeLog:9
&gt;&gt; +        Added as default for prepare-Changelog, but not in svn-create-patch, to avoid loops in recursive calls.
&gt; 
&gt; I take it that it isn&apos;t straightforward to audit all callers of svn-create-patch so as to eliminate recursive/duplicate calls? That is, modify callers to pass --no-style (as applicable) such that we don&apos;t recursively call check-webkit-style or call it more than once.

Yes, that&apos;s the approach I think we should probably take in a future patch, and the main reason I made the --style param nullable here.

&gt;&gt; Tools/Scripts/svn-create-patch:113
&gt;&gt; +unless (caller) {
&gt; 
&gt; Did you mean to keep this given that this patch proposes that we don&apos;t run the style checker by default and the remark about reliability that you raised in comment 6? If you choose to keep this then I suggest we add a comment to explain the purpose of this conditional.

I&apos;ll just get rid of it. I think called with --no-style is the better long-term solution.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>999132</commentid>
    <comment_count>15</comment_count>
      <attachid>228562</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-09 01:33:01 -0700</bug_when>
    <thetext>Comment on attachment 228562
patch

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

&gt;&gt;&gt; Tools/ChangeLog:9
&gt;&gt;&gt; +        Added as default for prepare-Changelog, but not in svn-create-patch, to avoid loops in recursive calls.
&gt;&gt; 
&gt;&gt; I take it that it isn&apos;t straightforward to audit all callers of svn-create-patch so as to eliminate recursive/duplicate calls? That is, modify callers to pass --no-style (as applicable) such that we don&apos;t recursively call check-webkit-style or call it more than once.
&gt; 
&gt; Yes, that&apos;s the approach I think we should probably take in a future patch, and the main reason I made the --style param nullable here.

Actually, there is only one more choke point (Tools/Scripts/webkitpy/common/checkout/scm/svn.py) I missed in the first patch, so I&apos;ll just make --style the default and nullify it there.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>999133</commentid>
    <comment_count>16</comment_count>
      <attachid>228951</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-09 01:46:53 -0700</bug_when>
    <thetext>Created attachment 228951
patch with review feedback</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003175</commentid>
    <comment_count>17</comment_count>
      <attachid>228951</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2014-04-22 21:27:38 -0700</bug_when>
    <thetext>Comment on attachment 228951
patch with review feedback

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

&gt; Tools/Scripts/svn-create-patch:112
&gt; +    print STDERR &quot;  Finished svn-create-patch. Running check-webkit-style.\n  &quot;;

How did you come to the decision to emit &quot;Finished svn-create-patch&quot;? I mean, you didn&apos;t emit &quot;Finished prepare-ChangeLog&quot; in script Tools/Scripts/prepare-ChangeLog. I don&apos;t see much value in emitting such a message. Regardless, we should either omit such a message or emit a similar message in prepare-ChangeLog for consistency.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003310</commentid>
    <comment_count>18</comment_count>
      <attachid>228951</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-23 09:59:00 -0700</bug_when>
    <thetext>Comment on attachment 228951
patch with review feedback

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

&gt;&gt; Tools/Scripts/svn-create-patch:112
&gt;&gt; +    print STDERR &quot;  Finished svn-create-patch. Running check-webkit-style.\n  &quot;;
&gt; 
&gt; How did you come to the decision to emit &quot;Finished svn-create-patch&quot;? I mean, you didn&apos;t emit &quot;Finished prepare-ChangeLog&quot; in script Tools/Scripts/prepare-ChangeLog. I don&apos;t see much value in emitting such a message. Regardless, we should either omit such a message or emit a similar message in prepare-ChangeLog for consistency.

I&apos;m happy to omit it if you think that&apos;s best. The reason I didn&apos;t is because svn-create-patch has no default output, so I wanted to be clear why there was new output. prepare-ChangeLog, on the other hand, has a lot of output, so I thought this distinction was less relevant.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003424</commentid>
    <comment_count>19</comment_count>
      <attachid>230019</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-23 16:20:55 -0700</bug_when>
    <thetext>Created attachment 230019
patch with review feedback</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003437</commentid>
    <comment_count>20</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2014-04-23 16:51:27 -0700</bug_when>
    <thetext>(In reply to comment #18)
&gt; (From update of attachment 228951 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=228951&amp;action=review
&gt; 
&gt; &gt;&gt; Tools/Scripts/svn-create-patch:112
&gt; &gt;&gt; +    print STDERR &quot;  Finished svn-create-patch. Running check-webkit-style.\n  &quot;;
&gt; &gt; 
&gt; &gt; How did you come to the decision to emit &quot;Finished svn-create-patch&quot;? I mean, you didn&apos;t emit &quot;Finished prepare-ChangeLog&quot; in script Tools/Scripts/prepare-ChangeLog. I don&apos;t see much value in emitting such a message. Regardless, we should either omit such a message or emit a similar message in prepare-ChangeLog for consistency.
&gt; 
&gt; I&apos;m happy to omit it if you think that&apos;s best. The reason I didn&apos;t is because svn-create-patch has no default output, so I wanted to be clear why there was new output. prepare-ChangeLog, on the other hand, has a lot of output, so I thought this distinction was less relevant.

I don&apos;t have a strong opinion. I would omit the message as I tend to follow the UNIX philosophy of the Rule of Silence: &quot;When a program has nothing surprising to say, it should say nothing.&quot; (http://www.faqs.org/docs/artu/ch01s06.html). And I don&apos;t find &quot;Finished ...&quot; to be a surprising message. Although prepare-ChangeLog doesn’t seem to follow this philosophy. Regardless, I suggest we be consistent in our choice of emitting the “Finished …” message. That is, if we choose to emit it in prepare-ChangeLog then we should emit it in svn-create-patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003439</commentid>
    <comment_count>21</comment_count>
      <attachid>230019</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-04-23 17:12:58 -0700</bug_when>
    <thetext>Comment on attachment 230019
patch with review feedback

Rejecting attachment 230019 from commit-queue.

jcraig@apple.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json.

- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003440</commentid>
    <comment_count>22</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-23 17:15:43 -0700</bug_when>
    <thetext>I&apos;ll wait 2 hours and try again. Or someone else can CQ+ for me in the meantime.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003446</commentid>
    <comment_count>23</comment_count>
      <attachid>230019</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2014-04-23 17:34:32 -0700</bug_when>
    <thetext>Comment on attachment 230019
patch with review feedback

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

&gt; Tools/Scripts/svn-create-patch:112
&gt; +    system &quot;$FindBin::Bin/check-webkit-style&quot;;

How did you come to the decision to omit the &quot;Running check-webkit-style.&quot; message?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003450</commentid>
    <comment_count>24</comment_count>
      <attachid>230019</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-23 17:47:42 -0700</bug_when>
    <thetext>Comment on attachment 230019
patch with review feedback

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

&gt;&gt; Tools/Scripts/svn-create-patch:112
&gt;&gt; +    system &quot;$FindBin::Bin/check-webkit-style&quot;;
&gt; 
&gt; How did you come to the decision to omit the &quot;Running check-webkit-style.&quot; message?

I must&apos;ve misunderstood. I thought you wanted the entire comment removed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003457</commentid>
    <comment_count>25</comment_count>
      <attachid>230027</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-23 18:47:06 -0700</bug_when>
    <thetext>Created attachment 230027
patch with review feedback

Adding the print statement back in, but with the &quot;Finished&quot; substring removed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003546</commentid>
    <comment_count>26</comment_count>
      <attachid>230027</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-04-23 22:43:21 -0700</bug_when>
    <thetext>Comment on attachment 230027
patch with review feedback

Rejecting attachment 230027 from commit-queue.

Failed to run &quot;[&apos;/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch&apos;, &apos;--status-host=webkit-queues.appspot.com&apos;, &apos;--bot-id=webkit-cq-03&apos;, &apos;validate-changelog&apos;, &apos;--check-oops&apos;, &apos;--non-interactive&apos;, 230027, &apos;--port=mac&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

ChangeLog entry in Tools/ChangeLog contains OOPS!.

Full output: http://webkit-queues.appspot.com/results/4538986685005824</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003547</commentid>
    <comment_count>27</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-23 22:45:48 -0700</bug_when>
    <thetext>I thought commit-queue would change the reviewer automatically. I guess it doesn&apos;t because the r+ was on the previous version of the attachment.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003548</commentid>
    <comment_count>28</comment_count>
      <attachid>230051</attachid>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-23 22:49:03 -0700</bug_when>
    <thetext>Created attachment 230051
patch with reviewer comment included manually</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003552</commentid>
    <comment_count>29</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2014-04-23 23:16:04 -0700</bug_when>
    <thetext>(In reply to comment #24)
&gt; (From update of attachment 230019 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=230019&amp;action=review
&gt; 
&gt; &gt;&gt; Tools/Scripts/svn-create-patch:112
&gt; &gt;&gt; +    system &quot;$FindBin::Bin/check-webkit-style&quot;;
&gt; &gt; 
&gt; &gt; How did you come to the decision to omit the &quot;Running check-webkit-style.&quot; message?
&gt; 
&gt; I must&apos;ve misunderstood. I thought you wanted the entire comment removed.

No, I was only suggesting to remove the substring &quot;Finished svn-create-patch.&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003553</commentid>
    <comment_count>30</comment_count>
      <attachid>230051</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2014-04-23 23:17:14 -0700</bug_when>
    <thetext>Comment on attachment 230051
patch with reviewer comment included manually

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

&gt; Tools/ChangeLog:6
&gt; +        Reviewed by Daniel Bates &lt;dbates@webkit.org&gt;.

No need for an email address. My name is sufficient:

Reviewed by Daniel Bates.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003563</commentid>
    <comment_count>31</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-24 00:08:24 -0700</bug_when>
    <thetext>https://trac.webkit.org/changeset/167751</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1003564</commentid>
    <comment_count>32</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-24 00:08:42 -0700</bug_when>
    <thetext>Thanks Daniel.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004158</commentid>
    <comment_count>33</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2014-04-25 12:27:30 -0700</bug_when>
    <thetext>I&apos;m pretty sad that this got landed without figuring out a better solution for the issue of prepare-ChangeLog whining about not having a bug number *in the text that prepare-ChangeLog just added*. Is there a bug covering that?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004162</commentid>
    <comment_count>34</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2014-04-25 12:40:23 -0700</bug_when>
    <thetext>This also spews super annoying errors about files with properties:

...
ERROR: Unexpected diff format when parsing a chunk: &apos;&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;Property changes on: LayoutTests/fast/files/local-file-drag-security-expected.txt&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;___________________________________________________________________&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;Added: svn:mime-type&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;## -0,0 +1 ##&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;\\ No newline at end of property&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;Added: svn:eol-style&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;## -0,0 +1 ##&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;\\ No newline at end of property&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;Property changes on: LayoutTests/fast/files/local-file-drag-security.html&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;___________________________________________________________________&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;Added: svn:mime-type&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;## -0,0 +1 ##&apos;
ERROR: Unexpected diff format when parsing a chunk: &apos;\\ No newline at end of property&apos;
Total errors found: 0 in 6 files</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004184</commentid>
    <comment_count>35</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-25 13:32:26 -0700</bug_when>
    <thetext>(In reply to comment #33)
&gt; I&apos;m pretty sad that this got landed without figuring out a better solution for the issue of prepare-ChangeLog whining about not having a bug number *in the text that prepare-ChangeLog just added*. Is there a bug covering that?

I think that&apos;s correct behavior. You can avoid it by either running prepare-Changelog with the &quot;open modified changelogs&quot; flag (-o | --open) to edit the logs before the script continues. You can also pass --no-style to avoid running the style checker.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004185</commentid>
    <comment_count>36</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-25 13:35:18 -0700</bug_when>
    <thetext>(In reply to comment #34)
&gt; This also spews super annoying errors about files with properties

Will you file a bug referencing or including a diff that triggers it? I didn&apos;t know about this spew, but we can either fix it in the style checker script or disable that by passing another flag to the caller points in prepare-Changelog and svn-create-patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004187</commentid>
    <comment_count>37</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-25 13:37:59 -0700</bug_when>
    <thetext>(In reply to comment #34)
&gt; ERROR: Unexpected diff format when parsing a chunk: &apos;Property changes on: 

Why isn&apos;t this just an bug filed against check-webkit-style? Do you get different behavior when it&apos;s not called from prepare-Changelog?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004193</commentid>
    <comment_count>38</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2014-04-25 14:04:17 -0700</bug_when>
    <thetext>&gt; Why isn&apos;t this just an bug filed against check-webkit-style? Do you get different behavior when it&apos;s not called from prepare-Changelog?

I never use check-webkit-style, and do not intend to. But I use svn-create-patch and prepare-ChangeLog, and this change regressed their behavior a lot. I think that the best course of action would be to roll out this change.

I also agree with Tim&apos;s comment - it makes no sense to get an error about ChangeLogs when running prepare-ChangeLog. No one should be required to pass extra arguments to prepare-ChangeLog just to get the behavior that makes sense, the default behavior should be right.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004197</commentid>
    <comment_count>39</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-25 14:09:03 -0700</bug_when>
    <thetext>(In reply to comment #38)
&gt; &gt; Why isn&apos;t this just an bug filed against check-webkit-style? Do you get different behavior when it&apos;s not called from prepare-Changelog?
&gt; 
&gt; I never use check-webkit-style, and do not intend to. But I use svn-create-patch and prepare-ChangeLog, and this change regressed their behavior a lot. I think that the best course of action would be to roll out this change.
&gt; 
&gt; I also agree with Tim&apos;s comment - it makes no sense to get an error about ChangeLogs when running prepare-ChangeLog. No one should be required to pass extra arguments to prepare-ChangeLog just to get the behavior that makes sense, the default behavior should be right.

I don&apos;t want to roll out the change, but I&apos;m fine with just changing the default value of the style parameter. That was my original plan, but other reviewers requested making this the default. See the thread above and on webkit-dev.

These are trivial diffs to commit, literally changing a 1 to a 0. That said, I&apos;d like to hear the opinions of those who suggested this be the default behavior.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004198</commentid>
    <comment_count>40</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-25 14:11:43 -0700</bug_when>
    <thetext>Here&apos; the prepare-Changelog diff if you want to modify your local copy in the meantime.

- my $checkWebKitStyle = 1;
+ my $checkWebKitStyle;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004244</commentid>
    <comment_count>41</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-25 15:25:09 -0700</bug_when>
    <thetext>Both complaints are resolved in bug 132209.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004246</commentid>
    <comment_count>42</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2014-04-25 15:29:49 -0700</bug_when>
    <thetext>I also filed Alexey&apos;s check-webkit-style false positive as bug 132210. Thanks for the feedback.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1004716</commentid>
    <comment_count>43</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2014-04-28 13:33:38 -0700</bug_when>
    <thetext>This also made svn-create-patch very slow. Filed bug 132300.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>228439</attachid>
            <date>2014-04-02 16:16:22 -0700</date>
            <delta_ts>2014-04-03 17:09:22 -0700</delta_ts>
            <desc>patch</desc>
            <filename>webkit131115.diff</filename>
            <type>text/plain</type>
            <size>4797</size>
            <attacher name="James Craig">jcraig</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDE2NjY3MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE4IEBACisyMDE0LTA0LTAyICBKYW1lcyBDcmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CisK
KyAgICAgICAgcHJlcGFyZS1jaGFuZ2Vsb2cgYW5kIHN2bi1jcmVhdGUtcGF0Y2ggc2hvdWxkIG9w
dGlvbmFsbHkgcnVuIGNoZWNrLXdlYmtpdC1zdHlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIC1zfC0tc3R5bGUgcGFyYW0gdG8gb3B0aW9u
YWxseSBydW4gY2hlY2std2Via2l0LXN0eWxlLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJl
LUNoYW5nZUxvZzoKKyAgICAgICAgKG1haW4pOgorICAgICAgICAoY2hlY2tXZWJLaXRTdHlsZSk6
CisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOgorICAgICAgICAoY2hlY2tXZWJL
aXRTdHlsZSk6CisKIDIwMTQtMDQtMDEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog
CiAgICAgICAgIExvYWQgTWVkaWEgQ29udHJvbHMganMvY3NzIGZyb20gYnVuZGxlCkluZGV4OiBU
b29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw
dHMvcHJlcGFyZS1DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjY2MSkKKysrIFRvb2xzL1NjcmlwdHMv
cHJlcGFyZS1DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2LDcgQEAgdXNlIFZD
U1V0aWxzOwogc3ViIGNoYW5nZUxvZ0RhdGUoJCk7CiBzdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNz
RnJvbUFyZ3MoJCQpOwogc3ViIGNoYW5nZUxvZ05hbWVGcm9tQXJncygkJCk7CitzdWIgY2hlY2tX
ZWJLaXRTdHlsZSgpOwogc3ViIGNyZWF0ZVBhdGNoQ29tbWFuZCgkJCQkKTsKIHN1YiBkZWNvZGVF
bnRpdGllcygkKTsKIHN1YiBkZXRlcm1pbmVQcm9wZXJ0eUNoYW5nZXMoJCQkKTsKQEAgLTEyOCw2
ICsxMjksNyBAQCBzdWIgbWFpbigpCiAgICAgbXkgJGdpdENvbW1pdCA9IDA7CiAgICAgbXkgJGdp
dEluZGV4ID0gIiI7CiAgICAgbXkgJGdpdFJldmlld2VyID0gIiI7CisgICAgbXkgJGNoZWNrV2Vi
S2l0U3R5bGUgPSAwOwogICAgIG15ICRvcGVuQ2hhbmdlTG9ncyA9IDA7CiAgICAgbXkgJHdyaXRl
Q2hhbmdlTG9ncyA9IDE7CiAgICAgbXkgJHNob3dIZWxwID0gMDsKQEAgLTE0NCw2ICsxNDYsNyBA
QCBzdWIgbWFpbigpCiAgICAgICAgICAgICAgICAgICAgImdpdC1pbmRleCIgPT4gXCRnaXRJbmRl
eCwKICAgICAgICAgICAgICAgICAgICAiZ2l0LXJldmlld2VyOnMiID0+IFwkZ2l0UmV2aWV3ZXIs
CiAgICAgICAgICAgICAgICAgICAgImhlbHB8aCEiID0+IFwkc2hvd0hlbHAsCisgICAgICAgICAg
ICAgICAgICAgInN0eWxlfHMiID0+IFwkY2hlY2tXZWJLaXRTdHlsZSwKICAgICAgICAgICAgICAg
ICAgICAib3BlbnxvISIgPT4gXCRvcGVuQ2hhbmdlTG9ncywKICAgICAgICAgICAgICAgICAgICAi
d3JpdGUhIiA9PiBcJHdyaXRlQ2hhbmdlTG9ncywKICAgICAgICAgICAgICAgICAgICAidXBkYXRl
ISIgPT4gXCR1cGRhdGVDaGFuZ2VMb2dzKTsKQEAgLTE1OCw2ICsxNjEsNyBAQCBzdWIgbWFpbigp
CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtLWdpdC1yZXZpZXdlciAgV2hlbiBwb3B1bGF0aW5n
IHRoZSBDaGFuZ2VMb2dzIGZyb20gYSBnaXQgY29tbWl0IGNsYWltIHRoYXQgdGhlIHNwY2lmaWVk
IG5hbWUgcmV2aWV3ZWQgdGhlIGNoYW5nZS5cbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAg
ICAgICAgICAgICAgICAgVGhpcyBvcHRpb24gaXMgdXNlZnVsIHdoZW4gdGhlIGdpdCBjb21taXQg
bGFja3MgYSBTaWduZWQtT2ZmLUJ5OiBsaW5lXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAg
LWh8LS1oZWxwICAgICAgIFNob3cgdGhpcyBoZWxwIG1lc3NhZ2VcbiI7CisgICAgICAgIHByaW50
IFNUREVSUiAiICAtc3wtLXN0eWxlICAgICAgUnVuIGNoZWNrLXdlYmtpdC1zdHlsZSBzY3JpcHQg
d2hlbiBkb25lXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLW98LS1vcGVuICAgICAgIE9w
ZW4gQ2hhbmdlTG9ncyBpbiBhbiBlZGl0b3Igd2hlbiBkb25lXG4iOwogICAgICAgICBwcmludCBT
VERFUlIgIiAgLS1bbm8tXXVwZGF0ZSAgIFVwZGF0ZSBDaGFuZ2VMb2dzIGZyb20gc3ZuIGJlZm9y
ZSBhZGRpbmcgZW50cnkgKGRlZmF1bHQ6IHVwZGF0ZSlcbiI7CiAgICAgICAgIHByaW50IFNUREVS
UiAiICAtLVtuby1dd3JpdGUgICAgV3JpdGUgQ2hhbmdlTG9ncyB0byBkaXNrIChvdGhlcndpc2Ug
c2VuZCBuZXcgZW50cmllcyB0byBzdGRvdXQpIChkZWZhdWx0OiB3cml0ZSlcbiI7CkBAIC0yMjUs
NiArMjI5LDExIEBAIHN1YiBtYWluKCkKICAgICAgICAgcHJpbnREaWZmKCRjaGFuZ2VkRmlsZXMs
ICRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdlQmFzZSk7CiAgICAgfQogCisgICAgIyBSdW4g
Y2hlY2std2Via2l0LXN0eWxlLgorICAgIGlmICgkY2hlY2tXZWJLaXRTdHlsZSkgeworICAgICAg
ICBjaGVja1dlYktpdFN0eWxlKCk7CisgICAgfSAgCisKICAgICAjIE9wZW4gQ2hhbmdlTG9ncy4K
ICAgICBpZiAoJG9wZW5DaGFuZ2VMb2dzICYmIEAkY2hhbmdlTG9ncykgewogICAgICAgICBvcGVu
Q2hhbmdlTG9ncygkY2hhbmdlTG9ncyk7CkBAIC01ODgsNiArNTk3LDEzIEBAIHN1YiBwcmludERp
ZmYoJCQkJCkKICAgICBjbG9zZSBESUZGOwogfQogCitzdWIgY2hlY2tXZWJLaXRTdHlsZSgpCit7
CisgICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcgY2hlY2std2Via2l0LXN0eWxlLlxuICAiOwor
ICAgIG15ICRkaXIgPSBkaXJuYW1lKEZpbGU6OlNwZWMtPnJlbDJhYnMoX19GSUxFX18pKTsKKyAg
ICBzeXN0ZW0gJGRpciAuICIvY2hlY2std2Via2l0LXN0eWxlIjsKK30KKwogc3ViIG9wZW5DaGFu
Z2VMb2dzKCQpCiB7CiAgICAgbXkgKCRjaGFuZ2VMb2dzKSA9IEBfOwpJbmRleDogVG9vbHMvU2Ny
aXB0cy9zdm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3ZuLWNy
ZWF0ZS1wYXRjaAkocmV2aXNpb24gMTY2NjYxKQorKysgVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRl
LXBhdGNoCSh3b3JraW5nIGNvcHkpCkBAIC01Niw2ICs1Niw3IEBAIHVzZSBUaW1lOjpnbXRpbWU7
CiB1c2UgVkNTVXRpbHM7CiAKIHN1YiBiaW5hcnljbXAoJCQpOworc3ViIGNoZWNrV2ViS2l0U3R5
bGUoKTsKIHN1YiBkaWZmT3B0aW9uc0ZvckZpbGUoJCk7CiBzdWIgZmluZEJhc2VVcmwoJCk7CiBz
dWIgZmluZE1pbWVUeXBlKCQ7JCk7CkBAIC03NywxNSArNzgsMTcgQEAgc3ViIHRlc3RmaWxlY21w
KCQkKTsKICRFTlZ7J0xDX0FMTCd9ID0gJ0MnOwogCiBteSAkc2hvd0hlbHA7CitteSAkY2hlY2tX
ZWJLaXRTdHlsZTsKIG15ICRpZ25vcmVDaGFuZ2Vsb2dzID0gMDsKIG15ICRkZXZOdWxsID0gRmls
ZTo6U3BlYy0+ZGV2bnVsbCgpOwogCiBteSAkcmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAiaGVs
cCIgICAgICAgPT4gXCRzaG93SGVscCwKLSAgICAiaWdub3JlLWNoYW5nZWxvZ3MiICAgID0+IFwk
aWdub3JlQ2hhbmdlbG9ncworICAgICJpZ25vcmUtY2hhbmdlbG9ncyIgICAgPT4gXCRpZ25vcmVD
aGFuZ2Vsb2dzLAorICAgICJzdHlsZXxzIiA9PiBcJGNoZWNrV2ViS2l0U3R5bGUKICk7CiBpZiAo
ISRyZXN1bHQgfHwgJHNob3dIZWxwKSB7Ci0gICAgcHJpbnQgU1RERVJSIGJhc2VuYW1lKCQwKSAu
ICIgWy1ofC0taGVscF0gWy0taWdub3JlLWNoYW5nZWxvZ3NdIFtzdm5kaXIxIFtzdm5kaXIyIC4u
Ll1dXG4iOworICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFstaHwtLWhlbHBdIFst
LWlnbm9yZS1jaGFuZ2Vsb2dzXSBbLXN8LS1zdHlsZV0gW3N2bmRpcjEgW3N2bmRpcjIgLi4uXV1c
biI7CiAgICAgZXhpdCAxOwogfQogCkBAIC0xMDYsNiArMTA5LDExIEBAIGZvciBteSAkcGF0aCAo
c29ydCBwYXRjaHBhdGhjbXAgdmFsdWVzICUKICAgICBnZW5lcmF0ZURpZmYoJHBhdGgsICRwcmVm
aXgpOwogfQogCisjIFJ1biBjaGVjay13ZWJraXQtc3R5bGUuCitpZiAoJGNoZWNrV2ViS2l0U3R5
bGUpIHsKKyAgICBjaGVja1dlYktpdFN0eWxlKCk7Cit9CisKIGV4aXQgMDsKIAogIyBPdmVyYWxs
IHNvcnQsIGNvbnNpZGVyaW5nIG11bHRpcGxlIGNyaXRlcmlhLgpAQCAtMTMyLDYgKzE0MCwxMyBA
QCBzdWIgYmluYXJ5Y21wKCQkKQogICAgIHJldHVybiAkZmlsZURhdGFBLT57aXNCaW5hcnl9IDw9
PiAkZmlsZURhdGFCLT57aXNCaW5hcnl9OwogfQogCitzdWIgY2hlY2tXZWJLaXRTdHlsZSgpCit7
CisgICAgcHJpbnQgU1RERVJSICIgIEZpbmlzaGVkIHN2bi1jcmVhdGUtcGF0Y2guIFJ1bm5pbmcg
Y2hlY2std2Via2l0LXN0eWxlLlxuICAiOworICAgIG15ICRkaXIgPSBkaXJuYW1lKEZpbGU6OlNw
ZWMtPnJlbDJhYnMoX19GSUxFX18pKTsKKyAgICBzeXN0ZW0gJGRpciAuICIvY2hlY2std2Via2l0
LXN0eWxlIjsKK30KKwogc3ViIGRpZmZPcHRpb25zRm9yRmlsZSgkKQogewogICAgIG15ICgkZmls
ZSkgPSBAXzsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>228562</attachid>
            <date>2014-04-03 17:09:22 -0700</date>
            <delta_ts>2014-04-09 01:46:53 -0700</delta_ts>
            <desc>patch</desc>
            <filename>webkit131115.diff</filename>
            <type>text/plain</type>
            <size>7337</size>
            <attacher name="James Craig">jcraig</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDE2Njc1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDIwIEBACisyMDE0LTA0LTAzICBKYW1lcyBDcmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CisK
KyAgICAgICAgcHJlcGFyZS1DaGFuZ2Vsb2cgYW5kIHN2bi1jcmVhdGUtcGF0Y2ggc2hvdWxkIG9w
dGlvbmFsbHkgcnVuIGNoZWNrLXdlYmtpdC1zdHlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIFstLVtuby1dc3R5bGVdIHBhcmFtIHRvIHJ1
biBjaGVjay13ZWJraXQtc3R5bGUgYXMgcGFydCBvZiBwcmVwYXJlLUNoYW5nZWxvZyBhbmQgc3Zu
LWNyZWF0ZS1wYXRjaC4KKyAgICAgICAgQWRkZWQgYXMgZGVmYXVsdCBmb3IgcHJlcGFyZS1DaGFu
Z2Vsb2csIGJ1dCBub3QgaW4gc3ZuLWNyZWF0ZS1wYXRjaCwgdG8gYXZvaWQgbG9vcHMgaW4gcmVj
dXJzaXZlIGNhbGxzLgorCisgICAgICAgICogU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcjoKKyAg
ICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorICAgICAgICAobWFpbik6CisgICAg
ICAgIChjaGVja1dlYktpdFN0eWxlKToKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1jcmVhdGUtcGF0
Y2g6CisgICAgICAgIChjaGVja1dlYktpdFN0eWxlKToKKwogMjAxNC0wNC0wMyAgU2FudG9zaCBN
YWh0byAgPHNhbnRvc2hiaXQyMDA3QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBN
b3ZpbmcgbXkgbmFtZSB0byBjb21taXRlciBzZWN0aW9uCkluZGV4OiBUb29scy9TY3JpcHRzL2Nv
bW1pdC1sb2ctZWRpdG9yCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1l
ZGl0b3IJKHJldmlzaW9uIDE2NjY3OCkKKysrIFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0
b3IJKHdvcmtpbmcgY29weSkKQEAgLTE3Niw3ICsxNzYsNyBAQCBpZiAoaXNHaXQoKSAmJiBAY2hh
bmdlTG9ncyA9PSAwKSB7CiAgICAgICAgIGNob21wKCR3ZWJraXRHZW5lcmF0ZUNvbW1pdE1lc3Nh
Z2UgPSBgZ2l0IGNvbmZpZyAtLWJvb2wgY29yZS53ZWJraXRHZW5lcmF0ZUNvbW1pdE1lc3NhZ2Vg
KTsKICAgICB9CiAgICAgaWYgKCR3ZWJraXRHZW5lcmF0ZUNvbW1pdE1lc3NhZ2UgbmUgImZhbHNl
IikgewotICAgICAgICBvcGVuIENIQU5HRUxPR19FTlRSSUVTLCAiLXwiLCAiJEZpbmRCaW46OkJp
bi9wcmVwYXJlLUNoYW5nZUxvZyAtLWdpdC1pbmRleCAtLW5vLXdyaXRlIiBvciBkaWUgInByZXBh
cmUtQ2hhbmdlTG9nIGZhaWxlZDogJCEuXG4iOworICAgICAgICBvcGVuIENIQU5HRUxPR19FTlRS
SUVTLCAiLXwiLCAiJEZpbmRCaW46OkJpbi9wcmVwYXJlLUNoYW5nZUxvZyAtLWdpdC1pbmRleCAt
LW5vLXdyaXRlIC0tbm8tc3R5bGUiIG9yIGRpZSAicHJlcGFyZS1DaGFuZ2VMb2cgZmFpbGVkOiAk
IS5cbiI7CiAgICAgICAgIHdoaWxlICg8Q0hBTkdFTE9HX0VOVFJJRVM+KSB7CiAgICAgICAgICAg
ICBwcmludCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoJF8sICRlbmRsKTsKICAgICAgICAg
fQpJbmRleDogVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU
b29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjY2NzgpCisrKyBUb29s
cy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC03Miw2ICs3Miw3
IEBAIHN1YiBkZXRlcm1pbmVQcm9wZXJ0eUNoYW5nZXMoJCQkKTsKIHN1YiBkaWZmQ29tbWFuZCgk
JCQkKTsKIHN1YiBkaWZmRnJvbVRvU3RyaW5nKCQkJCk7CiBzdWIgZGlmZkhlYWRlckZvcm1hdCgp
Oworc3ViIGNoZWNrV2ViS2l0U3R5bGUoKTsKIHN1YiBleHRyYWN0TGluZVJhbmdlQWZ0ZXJDaGFu
Z2UoJCk7CiBzdWIgZXh0cmFjdExpbmVSYW5nZUJlZm9yZUNoYW5nZSgkKTsKIHN1YiBmZXRjaEJ1
Z0Rlc2NyaXB0aW9uRnJvbVVSTCgkJCk7CkBAIC0xMjgsNiArMTI5LDcgQEAgc3ViIG1haW4oKQog
ICAgIG15ICRnaXRDb21taXQgPSAwOwogICAgIG15ICRnaXRJbmRleCA9ICIiOwogICAgIG15ICRn
aXRSZXZpZXdlciA9ICIiOworICAgIG15ICRjaGVja1dlYktpdFN0eWxlID0gMTsKICAgICBteSAk
b3BlbkNoYW5nZUxvZ3MgPSAwOwogICAgIG15ICR3cml0ZUNoYW5nZUxvZ3MgPSAxOwogICAgIG15
ICRzaG93SGVscCA9IDA7CkBAIC0xNDQsNiArMTQ2LDcgQEAgc3ViIG1haW4oKQogICAgICAgICAg
ICAgICAgICAgICJnaXQtaW5kZXgiID0+IFwkZ2l0SW5kZXgsCiAgICAgICAgICAgICAgICAgICAg
ImdpdC1yZXZpZXdlcjpzIiA9PiBcJGdpdFJldmlld2VyLAogICAgICAgICAgICAgICAgICAgICJo
ZWxwfGghIiA9PiBcJHNob3dIZWxwLAorICAgICAgICAgICAgICAgICAgICJzdHlsZSEiID0+IFwk
Y2hlY2tXZWJLaXRTdHlsZSwKICAgICAgICAgICAgICAgICAgICAib3BlbnxvISIgPT4gXCRvcGVu
Q2hhbmdlTG9ncywKICAgICAgICAgICAgICAgICAgICAid3JpdGUhIiA9PiBcJHdyaXRlQ2hhbmdl
TG9ncywKICAgICAgICAgICAgICAgICAgICAidXBkYXRlISIgPT4gXCR1cGRhdGVDaGFuZ2VMb2dz
KTsKQEAgLTE1OCw2ICsxNjEsNyBAQCBzdWIgbWFpbigpCiAgICAgICAgIHByaW50IFNUREVSUiAi
ICAtLWdpdC1yZXZpZXdlciAgV2hlbiBwb3B1bGF0aW5nIHRoZSBDaGFuZ2VMb2dzIGZyb20gYSBn
aXQgY29tbWl0IGNsYWltIHRoYXQgdGhlIHNwY2lmaWVkIG5hbWUgcmV2aWV3ZWQgdGhlIGNoYW5n
ZS5cbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAgICAgICAgICAgICAgICAgVGhpcyBvcHRp
b24gaXMgdXNlZnVsIHdoZW4gdGhlIGdpdCBjb21taXQgbGFja3MgYSBTaWduZWQtT2ZmLUJ5OiBs
aW5lXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLWh8LS1oZWxwICAgICAgIFNob3cgdGhp
cyBoZWxwIG1lc3NhZ2VcbiI7CisgICAgICAgIHByaW50IFNUREVSUiAiICAtLVtuby1dc3R5bGUg
ICAgUnVuIGNoZWNrLXdlYmtpdC1zdHlsZSBzY3JpcHQgd2hlbiBkb25lIChkZWZhdWx0OiBzdHls
ZSlcbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtb3wtLW9wZW4gICAgICAgT3BlbiBDaGFu
Z2VMb2dzIGluIGFuIGVkaXRvciB3aGVuIGRvbmVcbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAi
ICAtLVtuby1ddXBkYXRlICAgVXBkYXRlIENoYW5nZUxvZ3MgZnJvbSBzdm4gYmVmb3JlIGFkZGlu
ZyBlbnRyeSAoZGVmYXVsdDogdXBkYXRlKVxuIjsKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0t
W25vLV13cml0ZSAgICBXcml0ZSBDaGFuZ2VMb2dzIHRvIGRpc2sgKG90aGVyd2lzZSBzZW5kIG5l
dyBlbnRyaWVzIHRvIHN0ZG91dCkgKGRlZmF1bHQ6IHdyaXRlKVxuIjsKQEAgLTIyNSw2ICsyMjks
MTEgQEAgc3ViIG1haW4oKQogICAgICAgICBwcmludERpZmYoJGNoYW5nZWRGaWxlcywgJGdpdENv
bW1pdCwgJGdpdEluZGV4LCAkbWVyZ2VCYXNlKTsKICAgICB9CiAKKyAgICAjIFJ1biBjaGVjay13
ZWJraXQtc3R5bGUuCisgICAgaWYgKCRjaGVja1dlYktpdFN0eWxlKSB7CisgICAgICAgIGNoZWNr
V2ViS2l0U3R5bGUoKTsKKyAgICB9ICAKKwogICAgICMgT3BlbiBDaGFuZ2VMb2dzLgogICAgIGlm
ICgkb3BlbkNoYW5nZUxvZ3MgJiYgQCRjaGFuZ2VMb2dzKSB7CiAgICAgICAgIG9wZW5DaGFuZ2VM
b2dzKCRjaGFuZ2VMb2dzKTsKQEAgLTU4OCw2ICs1OTcsMTIgQEAgc3ViIHByaW50RGlmZigkJCQk
KQogICAgIGNsb3NlIERJRkY7CiB9CiAKK3N1YiBjaGVja1dlYktpdFN0eWxlKCkKK3sKKyAgICBw
cmludCBTVERFUlIgIiAgUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGUuXG4gICI7CisgICAgc3lz
dGVtIGRpcm5hbWUoRmlsZTo6U3BlYy0+cmVsMmFicyhfX0ZJTEVfXykpIC4gIi9jaGVjay13ZWJr
aXQtc3R5bGUiOworfQorCiBzdWIgb3BlbkNoYW5nZUxvZ3MoJCkKIHsKICAgICBteSAoJGNoYW5n
ZUxvZ3MpID0gQF87CkluZGV4OiBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCShyZXZpc2lvbiAxNjY2Nzgp
CisrKyBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHdvcmtpbmcgY29weSkKQEAgLTU2
LDYgKzU2LDcgQEAgdXNlIFRpbWU6OmdtdGltZTsKIHVzZSBWQ1NVdGlsczsKIAogc3ViIGJpbmFy
eWNtcCgkJCk7CitzdWIgY2hlY2tXZWJLaXRTdHlsZSgpOwogc3ViIGRpZmZPcHRpb25zRm9yRmls
ZSgkKTsKIHN1YiBmaW5kQmFzZVVybCgkKTsKIHN1YiBmaW5kTWltZVR5cGUoJDskKTsKQEAgLTc3
LDE1ICs3OCwxNyBAQCBzdWIgdGVzdGZpbGVjbXAoJCQpOwogJEVOVnsnTENfQUxMJ30gPSAnQyc7
CiAKIG15ICRzaG93SGVscDsKK215ICRjaGVja1dlYktpdFN0eWxlID0gMDsKIG15ICRpZ25vcmVD
aGFuZ2Vsb2dzID0gMDsKIG15ICRkZXZOdWxsID0gRmlsZTo6U3BlYy0+ZGV2bnVsbCgpOwogCiBt
eSAkcmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAiaGVscCIgICAgICAgPT4gXCRzaG93SGVscCwK
LSAgICAiaWdub3JlLWNoYW5nZWxvZ3MiICAgID0+IFwkaWdub3JlQ2hhbmdlbG9ncworICAgICJp
Z25vcmUtY2hhbmdlbG9ncyIgICAgPT4gXCRpZ25vcmVDaGFuZ2Vsb2dzLAorICAgICJzdHlsZSEi
ID0+IFwkY2hlY2tXZWJLaXRTdHlsZQogKTsKIGlmICghJHJlc3VsdCB8fCAkc2hvd0hlbHApIHsK
LSAgICBwcmludCBTVERFUlIgYmFzZW5hbWUoJDApIC4gIiBbLWh8LS1oZWxwXSBbLS1pZ25vcmUt
Y2hhbmdlbG9nc10gW3N2bmRpcjEgW3N2bmRpcjIgLi4uXV1cbiI7CisgICAgcHJpbnQgU1RERVJS
IGJhc2VuYW1lKCQwKSAuICIgWy1ofC0taGVscF0gWy0taWdub3JlLWNoYW5nZWxvZ3NdIFstLVtu
by1dc3R5bGVdIFtzdm5kaXIxIFtzdm5kaXIyIC4uLl1dXG4iOwogICAgIGV4aXQgMTsKIH0KIApA
QCAtMTA2LDYgKzEwOSwxMyBAQCBmb3IgbXkgJHBhdGggKHNvcnQgcGF0Y2hwYXRoY21wIHZhbHVl
cyAlCiAgICAgZ2VuZXJhdGVEaWZmKCRwYXRoLCAkcHJlZml4KTsKIH0KIAorIyBSdW4gY2hlY2st
d2Via2l0LXN0eWxlLgordW5sZXNzIChjYWxsZXIpIHsKKyAgICBpZiAoJGNoZWNrV2ViS2l0U3R5
bGUpIHsKKyAgICAgICAgY2hlY2tXZWJLaXRTdHlsZSgpOworICAgIH0KK30KKwogZXhpdCAwOwog
CiAjIE92ZXJhbGwgc29ydCwgY29uc2lkZXJpbmcgbXVsdGlwbGUgY3JpdGVyaWEuCkBAIC0xMzIs
NiArMTQyLDEyIEBAIHN1YiBiaW5hcnljbXAoJCQpCiAgICAgcmV0dXJuICRmaWxlRGF0YUEtPntp
c0JpbmFyeX0gPD0+ICRmaWxlRGF0YUItPntpc0JpbmFyeX07CiB9CiAKK3N1YiBjaGVja1dlYktp
dFN0eWxlKCkKK3sKKyAgICBwcmludCBTVERFUlIgIiAgRmluaXNoZWQgc3ZuLWNyZWF0ZS1wYXRj
aC4gUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGUuXG4gICI7CisgICAgc3lzdGVtIGRpcm5hbWUo
RmlsZTo6U3BlYy0+cmVsMmFicyhfX0ZJTEVfXykpIC4gIi9jaGVjay13ZWJraXQtc3R5bGUiOwor
fQorCiBzdWIgZGlmZk9wdGlvbnNGb3JGaWxlKCQpCiB7CiAgICAgbXkgKCRmaWxlKSA9IEBfOwpJ
bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXQtdG9vbHMtY29tcGxldGlvbi5zaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCShyZXZpc2lvbiAx
NjY2NzgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xMDksNiArMTA5LDYgQEAgX3dlYmtpdC1wYXRjaF9jb21wbGV0ZSgpCiAK
IGNvbXBsZXRlIC1GIF93ZWJraXQtcGF0Y2hfY29tcGxldGUgd2Via2l0LXBhdGNoCiBjb21wbGV0
ZSAtbyBkZWZhdWx0IC1XICItLWNvbnRpbnVlIC0tZml4LW1lcmdlZCAtLWhlbHAgLS1uby1jb250
aW51ZSAtLW5vLXdhcm5pbmdzIC0td2FybmluZ3MgLWMgLWYgLWggLXciIHJlc29sdmUtQ2hhbmdl
TG9ncwotY29tcGxldGUgLW8gZGVmYXVsdCAtVyAiLS1idWcgLS1kaWZmIC0tZ2l0LWNvbW1pdCAt
LWdpdC1pbmRleCAtLWdpdC1yZXZpZXdlciAtLWhlbHAgLS1uby11cGRhdGUgLS1uby13cml0ZSAt
LW9wZW4gLS11cGRhdGUgLS13cml0ZSAtZCAtaCAtbyIgcHJlcGFyZS1DaGFuZ2VMb2cKK2NvbXBs
ZXRlIC1vIGRlZmF1bHQgLVcgIi0tYnVnIC0tZGlmZiAtLWdpdC1jb21taXQgLS1naXQtaW5kZXgg
LS1naXQtcmV2aWV3ZXIgLS1oZWxwIC0tbm8tc3R5bGUgLS1uby11cGRhdGUgLS1uby13cml0ZSAt
LW9wZW4gLS1zdHlsZSAtLXVwZGF0ZSAtLXdyaXRlIC1kIC1oIC1vIiBwcmVwYXJlLUNoYW5nZUxv
ZwogY29tcGxldGUgLVcgIi0tY2xlYW4gLS1kZWJ1ZyAtLWhlbHAgLWgiIGJ1aWxkLXdlYmtpdAog
Y29tcGxldGUgLW8gZGVmYXVsdCAtVyAiLS1hZGQtcGxhdGZvcm0tZXhjZXB0aW9ucyAtLWNvbXBs
ZXgtdGV4dCAtLWNvbmZpZ3VyYXRpb24gLS1ndWFyZC1tYWxsb2MgLS1oZWxwIC0taHR0cCAtLWln
bm9yZS10ZXN0cyAtLWxhdW5jaC1zYWZhcmkgLS1sZWFrcyAtLW1lcmdlLWxlYWstZGVwdGggLS1u
ZXctdGVzdC1yZXN1bHRzIC0tbm8taHR0cCAtLW5vLXNob3ctcmVzdWx0cyAtLW5vLW5ldy10ZXN0
LXJlc3VsdHMgLS1uby1zYW1wbGUtb24tdGltZW91dCAtLW5vLXN0cmlwLWVkaXRpbmctY2FsbGJh
Y2tzIC0tcGl4ZWwtdGVzdHMgLS1wbGF0Zm9ybSAtLXBvcnQgLS1xdWlldCAtLXJhbmRvbSAtLXJl
c2V0LXJlc3VsdHMgLS1yZXN1bHRzLWRpcmVjdG9yeSAtLXJldmVyc2UgLS1yb290IC0tc2FtcGxl
LW9uLXRpbWVvdXQgLS1zaW5nbHkgLS1za2lwcGVkIC0tc2xvd2VzdCAtLXN0cmljdCAtLXN0cmlw
LWVkaXRpbmctY2FsbGJhY2tzIC0tdGhyZWFkZWQgLS10aW1lb3V0IC0tdG9sZXJhbmNlIC0tdXNl
LXJlbW90ZS1saW5rcy10by10ZXN0cyAtLXZhbGdyaW5kIC0tdmVyYm9zZSAtMSAtYyAtZyAtaCAt
aSAtbCAtbSAtbyAtcCAtcSAtdCAtdiIgcnVuLXdlYmtpdC10ZXN0cwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>228951</attachid>
            <date>2014-04-09 01:46:53 -0700</date>
            <delta_ts>2014-04-23 16:20:55 -0700</delta_ts>
            <desc>patch with review feedback</desc>
            <filename>webkit131115.diff</filename>
            <type>text/plain</type>
            <size>7649</size>
            <attacher name="James Craig">jcraig</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDE2NzAwNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDIxIEBACisyMDE0LTA0LTA5ICBKYW1lcyBDcmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CisK
KyAgICAgICAgcHJlcGFyZS1DaGFuZ2Vsb2cgYW5kIHN2bi1jcmVhdGUtcGF0Y2ggc2hvdWxkIG9w
dGlvbmFsbHkgcnVuIGNoZWNrLXdlYmtpdC1zdHlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIFstLVtuby1dc3R5bGVdIHBhcmFtIHRvIHJ1
biBjaGVjay13ZWJraXQtc3R5bGUgYXMgcGFydCBvZiBwcmVwYXJlLUNoYW5nZWxvZyBhbmQgc3Zu
LWNyZWF0ZS1wYXRjaC4KKworICAgICAgICAqIFNjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3I6IEFk
ZGVkIC0tbm8tc3R5bGUuCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzogUHJp
bWFyeSBwYXRjaC4KKyAgICAgICAgKG1haW4pOiBQcmltYXJ5IHBhdGNoLgorICAgICAgICAoY3Jl
YXRlUGF0Y2hDb21tYW5kKTogQWRkZWQgLS1uby1zdHlsZS4KKyAgICAgICAgKiBTY3JpcHRzL3N2
bi1jcmVhdGUtcGF0Y2g6IFByaW1hcnkgcGF0Y2guCisgICAgICAgICogU2NyaXB0cy93ZWJraXQt
dG9vbHMtY29tcGxldGlvbi5zaDogQWRkZWQgLS1zdHlsZSBhbmQgLS1uby1zdHlsZS4KKyAgICAg
ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OiBBZGRlZCAt
LW5vLXN0eWxlLgorICAgICAgICAoU1ZOLmNyZWF0ZV9wYXRjaCk6IEFkZGVkIC0tbm8tc3R5bGUu
CisKIDIwMTQtMDQtMDkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAg
ICAgICAgW1dLMl0gSFRUUCBhdXRoZW50aWNhdGlvbiByZWdyZXNzaW9uIHRlc3RzIGZhaWwKSW5k
ZXg6IFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv
U2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgkocmV2aXNpb24gMTY2OTc1KQorKysgVG9vbHMvU2Ny
aXB0cy9jb21taXQtbG9nLWVkaXRvcgkod29ya2luZyBjb3B5KQpAQCAtMTc2LDcgKzE3Niw3IEBA
IGlmIChpc0dpdCgpICYmIEBjaGFuZ2VMb2dzID09IDApIHsKICAgICAgICAgY2hvbXAoJHdlYmtp
dEdlbmVyYXRlQ29tbWl0TWVzc2FnZSA9IGBnaXQgY29uZmlnIC0tYm9vbCBjb3JlLndlYmtpdEdl
bmVyYXRlQ29tbWl0TWVzc2FnZWApOwogICAgIH0KICAgICBpZiAoJHdlYmtpdEdlbmVyYXRlQ29t
bWl0TWVzc2FnZSBuZSAiZmFsc2UiKSB7Ci0gICAgICAgIG9wZW4gQ0hBTkdFTE9HX0VOVFJJRVMs
ICItfCIsICIkRmluZEJpbjo6QmluL3ByZXBhcmUtQ2hhbmdlTG9nIC0tZ2l0LWluZGV4IC0tbm8t
d3JpdGUiIG9yIGRpZSAicHJlcGFyZS1DaGFuZ2VMb2cgZmFpbGVkOiAkIS5cbiI7CisgICAgICAg
IG9wZW4gQ0hBTkdFTE9HX0VOVFJJRVMsICItfCIsICIkRmluZEJpbjo6QmluL3ByZXBhcmUtQ2hh
bmdlTG9nIC0tZ2l0LWluZGV4IC0tbm8td3JpdGUgLS1uby1zdHlsZSIgb3IgZGllICJwcmVwYXJl
LUNoYW5nZUxvZyBmYWlsZWQ6ICQhLlxuIjsKICAgICAgICAgd2hpbGUgKDxDSEFOR0VMT0dfRU5U
UklFUz4pIHsKICAgICAgICAgICAgIHByaW50IE5FV0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygk
XywgJGVuZGwpOwogICAgICAgICB9CkluZGV4OiBUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdl
TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cJKHJldmlz
aW9uIDE2Njk3NSkKKysrIFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cJKHdvcmtpbmcg
Y29weSkKQEAgLTEyOCw2ICsxMjgsNyBAQCBzdWIgbWFpbigpCiAgICAgbXkgJGdpdENvbW1pdCA9
IDA7CiAgICAgbXkgJGdpdEluZGV4ID0gIiI7CiAgICAgbXkgJGdpdFJldmlld2VyID0gIiI7Cisg
ICAgbXkgJGNoZWNrV2ViS2l0U3R5bGUgPSAxOwogICAgIG15ICRvcGVuQ2hhbmdlTG9ncyA9IDA7
CiAgICAgbXkgJHdyaXRlQ2hhbmdlTG9ncyA9IDE7CiAgICAgbXkgJHNob3dIZWxwID0gMDsKQEAg
LTE0NCw2ICsxNDUsNyBAQCBzdWIgbWFpbigpCiAgICAgICAgICAgICAgICAgICAgImdpdC1pbmRl
eCIgPT4gXCRnaXRJbmRleCwKICAgICAgICAgICAgICAgICAgICAiZ2l0LXJldmlld2VyOnMiID0+
IFwkZ2l0UmV2aWV3ZXIsCiAgICAgICAgICAgICAgICAgICAgImhlbHB8aCEiID0+IFwkc2hvd0hl
bHAsCisgICAgICAgICAgICAgICAgICAgInN0eWxlISIgPT4gXCRjaGVja1dlYktpdFN0eWxlLAog
ICAgICAgICAgICAgICAgICAgICJvcGVufG8hIiA9PiBcJG9wZW5DaGFuZ2VMb2dzLAogICAgICAg
ICAgICAgICAgICAgICJ3cml0ZSEiID0+IFwkd3JpdGVDaGFuZ2VMb2dzLAogICAgICAgICAgICAg
ICAgICAgICJ1cGRhdGUhIiA9PiBcJHVwZGF0ZUNoYW5nZUxvZ3MpOwpAQCAtMTU4LDYgKzE2MCw3
IEBAIHN1YiBtYWluKCkKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tZ2l0LXJldmlld2VyICBX
aGVuIHBvcHVsYXRpbmcgdGhlIENoYW5nZUxvZ3MgZnJvbSBhIGdpdCBjb21taXQgY2xhaW0gdGhh
dCB0aGUgc3BjaWZpZWQgbmFtZSByZXZpZXdlZCB0aGUgY2hhbmdlLlxuIjsKICAgICAgICAgcHJp
bnQgU1RERVJSICIgICAgICAgICAgICAgICAgICBUaGlzIG9wdGlvbiBpcyB1c2VmdWwgd2hlbiB0
aGUgZ2l0IGNvbW1pdCBsYWNrcyBhIFNpZ25lZC1PZmYtQnk6IGxpbmVcbiI7CiAgICAgICAgIHBy
aW50IFNUREVSUiAiICAtaHwtLWhlbHAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZVxuIjsK
KyAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV1zdHlsZSAgICBSdW4gY2hlY2std2Via2l0
LXN0eWxlIHNjcmlwdCB3aGVuIGRvbmUgKGRlZmF1bHQ6IHN0eWxlKVxuIjsKICAgICAgICAgcHJp
bnQgU1RERVJSICIgIC1vfC0tb3BlbiAgICAgICBPcGVuIENoYW5nZUxvZ3MgaW4gYW4gZWRpdG9y
IHdoZW4gZG9uZVxuIjsKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV11cGRhdGUgICBV
cGRhdGUgQ2hhbmdlTG9ncyBmcm9tIHN2biBiZWZvcmUgYWRkaW5nIGVudHJ5IChkZWZhdWx0OiB1
cGRhdGUpXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1bbm8tXXdyaXRlICAgIFdyaXRl
IENoYW5nZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVudHJpZXMgdG8gc3Rkb3V0
KSAoZGVmYXVsdDogd3JpdGUpXG4iOwpAQCAtMjI1LDYgKzIyOCwxMSBAQCBzdWIgbWFpbigpCiAg
ICAgICAgIHByaW50RGlmZigkY2hhbmdlZEZpbGVzLCAkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRt
ZXJnZUJhc2UpOwogICAgIH0KIAorICAgIGlmICgkY2hlY2tXZWJLaXRTdHlsZSkgeworICAgICAg
ICBwcmludCBTVERFUlIgIiAgUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGUuXG4gICI7CisgICAg
ICAgIHN5c3RlbSAiJEZpbmRCaW46OkJpbi9jaGVjay13ZWJraXQtc3R5bGUiOworICAgIH0gIAor
CiAgICAgIyBPcGVuIENoYW5nZUxvZ3MuCiAgICAgaWYgKCRvcGVuQ2hhbmdlTG9ncyAmJiBAJGNo
YW5nZUxvZ3MpIHsKICAgICAgICAgb3BlbkNoYW5nZUxvZ3MoJGNoYW5nZUxvZ3MpOwpAQCAtMTY1
Nyw3ICsxNjY1LDcgQEAgc3ViIGNyZWF0ZVBhdGNoQ29tbWFuZCgkJCQkKQogCiAgICAgbXkgJGNv
bW1hbmQ7CiAgICAgaWYgKGlzU1ZOKCkpIHsKLSAgICAgICAgJGNvbW1hbmQgPSAiJyRGaW5kQmlu
OjpCaW4vc3ZuLWNyZWF0ZS1wYXRjaCcgJGNoYW5nZWRGaWxlc1N0cmluZyI7CisgICAgICAgICRj
b21tYW5kID0gIickRmluZEJpbjo6QmluL3N2bi1jcmVhdGUtcGF0Y2ggLS1uby1zdHlsZScgJGNo
YW5nZWRGaWxlc1N0cmluZyI7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkgewogICAgICAgICAkY29t
bWFuZCA9IEdJVCAuICIgZGlmZiAtTSAtQyAiIC4gZGlmZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0
LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwogICAgICAgICAkY29tbWFuZCAuPSAiIC0tICRjaGFu
Z2VkRmlsZXNTdHJpbmciIHVubGVzcyAkZ2l0Q29tbWl0OwpJbmRleDogVG9vbHMvU2NyaXB0cy9z
dm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1w
YXRjaAkocmV2aXNpb24gMTY2OTc1KQorKysgVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNo
CSh3b3JraW5nIGNvcHkpCkBAIC03NywxNSArNzcsMTcgQEAgc3ViIHRlc3RmaWxlY21wKCQkKTsK
ICRFTlZ7J0xDX0FMTCd9ID0gJ0MnOwogCiBteSAkc2hvd0hlbHA7CitteSAkY2hlY2tXZWJLaXRT
dHlsZSA9IDE7CiBteSAkaWdub3JlQ2hhbmdlbG9ncyA9IDA7CiBteSAkZGV2TnVsbCA9IEZpbGU6
OlNwZWMtPmRldm51bGwoKTsKIAogbXkgJHJlc3VsdCA9IEdldE9wdGlvbnMoCiAgICAgImhlbHAi
ICAgICAgID0+IFwkc2hvd0hlbHAsCi0gICAgImlnbm9yZS1jaGFuZ2Vsb2dzIiAgICA9PiBcJGln
bm9yZUNoYW5nZWxvZ3MKKyAgICAiaWdub3JlLWNoYW5nZWxvZ3MiID0+IFwkaWdub3JlQ2hhbmdl
bG9ncywKKyAgICAic3R5bGUhIiA9PiBcJGNoZWNrV2ViS2l0U3R5bGUsCiApOwogaWYgKCEkcmVz
dWx0IHx8ICRzaG93SGVscCkgewotICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFst
aHwtLWhlbHBdIFstLWlnbm9yZS1jaGFuZ2Vsb2dzXSBbc3ZuZGlyMSBbc3ZuZGlyMiAuLi5dXVxu
IjsKKyAgICBwcmludCBTVERFUlIgYmFzZW5hbWUoJDApIC4gIiBbLWh8LS1oZWxwXSBbLS1pZ25v
cmUtY2hhbmdlbG9nc10gWy0tW25vLV1zdHlsZV0gW3N2bmRpcjEgW3N2bmRpcjIgLi4uXV1cbiI7
CiAgICAgZXhpdCAxOwogfQogCkBAIC0xMDYsNiArMTA4LDExIEBAIGZvciBteSAkcGF0aCAoc29y
dCBwYXRjaHBhdGhjbXAgdmFsdWVzICUKICAgICBnZW5lcmF0ZURpZmYoJHBhdGgsICRwcmVmaXgp
OwogfQogCitpZiAoJGNoZWNrV2ViS2l0U3R5bGUpIHsKKyAgICBwcmludCBTVERFUlIgIiAgRmlu
aXNoZWQgc3ZuLWNyZWF0ZS1wYXRjaC4gUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGUuXG4gICI7
CisgICAgc3lzdGVtICIkRmluZEJpbjo6QmluL2NoZWNrLXdlYmtpdC1zdHlsZSI7Cit9CisKIGV4
aXQgMDsKIAogIyBPdmVyYWxsIHNvcnQsIGNvbnNpZGVyaW5nIG11bHRpcGxlIGNyaXRlcmlhLgpJ
bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXQtdG9vbHMtY29tcGxldGlvbi5zaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCShyZXZpc2lvbiAx
NjY5NzUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xMDksNiArMTA5LDYgQEAgX3dlYmtpdC1wYXRjaF9jb21wbGV0ZSgpCiAK
IGNvbXBsZXRlIC1GIF93ZWJraXQtcGF0Y2hfY29tcGxldGUgd2Via2l0LXBhdGNoCiBjb21wbGV0
ZSAtbyBkZWZhdWx0IC1XICItLWNvbnRpbnVlIC0tZml4LW1lcmdlZCAtLWhlbHAgLS1uby1jb250
aW51ZSAtLW5vLXdhcm5pbmdzIC0td2FybmluZ3MgLWMgLWYgLWggLXciIHJlc29sdmUtQ2hhbmdl
TG9ncwotY29tcGxldGUgLW8gZGVmYXVsdCAtVyAiLS1idWcgLS1kaWZmIC0tZ2l0LWNvbW1pdCAt
LWdpdC1pbmRleCAtLWdpdC1yZXZpZXdlciAtLWhlbHAgLS1uby11cGRhdGUgLS1uby13cml0ZSAt
LW9wZW4gLS11cGRhdGUgLS13cml0ZSAtZCAtaCAtbyIgcHJlcGFyZS1DaGFuZ2VMb2cKK2NvbXBs
ZXRlIC1vIGRlZmF1bHQgLVcgIi0tYnVnIC0tZGlmZiAtLWdpdC1jb21taXQgLS1naXQtaW5kZXgg
LS1naXQtcmV2aWV3ZXIgLS1oZWxwIC0tbm8tc3R5bGUgLS1uby11cGRhdGUgLS1uby13cml0ZSAt
LW9wZW4gLS1zdHlsZSAtLXVwZGF0ZSAtLXdyaXRlIC1kIC1oIC1vIiBwcmVwYXJlLUNoYW5nZUxv
ZwogY29tcGxldGUgLVcgIi0tY2xlYW4gLS1kZWJ1ZyAtLWhlbHAgLWgiIGJ1aWxkLXdlYmtpdAog
Y29tcGxldGUgLW8gZGVmYXVsdCAtVyAiLS1hZGQtcGxhdGZvcm0tZXhjZXB0aW9ucyAtLWNvbXBs
ZXgtdGV4dCAtLWNvbmZpZ3VyYXRpb24gLS1ndWFyZC1tYWxsb2MgLS1oZWxwIC0taHR0cCAtLWln
bm9yZS10ZXN0cyAtLWxhdW5jaC1zYWZhcmkgLS1sZWFrcyAtLW1lcmdlLWxlYWstZGVwdGggLS1u
ZXctdGVzdC1yZXN1bHRzIC0tbm8taHR0cCAtLW5vLXNob3ctcmVzdWx0cyAtLW5vLW5ldy10ZXN0
LXJlc3VsdHMgLS1uby1zYW1wbGUtb24tdGltZW91dCAtLW5vLXN0cmlwLWVkaXRpbmctY2FsbGJh
Y2tzIC0tcGl4ZWwtdGVzdHMgLS1wbGF0Zm9ybSAtLXBvcnQgLS1xdWlldCAtLXJhbmRvbSAtLXJl
c2V0LXJlc3VsdHMgLS1yZXN1bHRzLWRpcmVjdG9yeSAtLXJldmVyc2UgLS1yb290IC0tc2FtcGxl
LW9uLXRpbWVvdXQgLS1zaW5nbHkgLS1za2lwcGVkIC0tc2xvd2VzdCAtLXN0cmljdCAtLXN0cmlw
LWVkaXRpbmctY2FsbGJhY2tzIC0tdGhyZWFkZWQgLS10aW1lb3V0IC0tdG9sZXJhbmNlIC0tdXNl
LXJlbW90ZS1saW5rcy10by10ZXN0cyAtLXZhbGdyaW5kIC0tdmVyYm9zZSAtMSAtYyAtZyAtaCAt
aSAtbCAtbSAtbyAtcCAtcSAtdCAtdiIgcnVuLXdlYmtpdC10ZXN0cwpJbmRleDogVG9vbHMvU2Ny
aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU
b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CShyZXZpc2lv
biAxNjY5NzUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v
c3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNzMsNyArMjczLDcgQEAgY2xhc3MgU1ZOKFNDTSwg
U1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGVsaWYgY2hhbmdlZF9maWxlcyA9PSBOb25lOgogICAg
ICAgICAgICAgY2hhbmdlZF9maWxlcyA9IFtdCiAgICAgICAgIHNjcmlwdF9wYXRoID0gc2VsZi5f
ZmlsZXN5c3RlbS5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgIlRvb2xzIiwgIlNjcmlwdHMiLCAi
c3ZuLWNyZWF0ZS1wYXRjaCIpCi0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2NyaXB0X3BhdGhd
ICsgY2hhbmdlZF9maWxlcywKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuKFtzY3JpcHRfcGF0aCwg
Ii0tbm8tc3R5bGUiXSArIGNoYW5nZWRfZmlsZXMsCiAgICAgICAgICAgICBjd2Q9c2VsZi5jaGVj
a291dF9yb290LCByZXR1cm5fc3RkZXJyPUZhbHNlLAogICAgICAgICAgICAgZGVjb2RlX291dHB1
dD1GYWxzZSkKIAo=
</data>
<flag name="review"
          id="253296"
          type_id="1"
          status="+"
          setter="dbates"
    />
    <flag name="commit-queue"
          id="253297"
          type_id="3"
          status="-"
          setter="dbates"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>230019</attachid>
            <date>2014-04-23 16:20:55 -0700</date>
            <delta_ts>2014-04-23 18:47:06 -0700</delta_ts>
            <desc>patch with review feedback</desc>
            <filename>webkit131115.diff</filename>
            <type>text/plain</type>
            <size>7563</size>
            <attacher name="James Craig">jcraig</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDE2NzA4NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDIxIEBACisyMDE0LTA0LTIzICBKYW1lcyBDcmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CisK
KyAgICAgICAgcHJlcGFyZS1DaGFuZ2Vsb2cgYW5kIHN2bi1jcmVhdGUtcGF0Y2ggc2hvdWxkIG9w
dGlvbmFsbHkgcnVuIGNoZWNrLXdlYmtpdC1zdHlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIFstLVtuby1dc3R5bGVdIHBhcmFtIHRvIHJ1
biBjaGVjay13ZWJraXQtc3R5bGUgYXMgcGFydCBvZiBwcmVwYXJlLUNoYW5nZWxvZyBhbmQgc3Zu
LWNyZWF0ZS1wYXRjaC4KKworICAgICAgICAqIFNjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3I6IEFk
ZGVkIC0tbm8tc3R5bGUuCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzogUHJp
bWFyeSBwYXRjaC4KKyAgICAgICAgKG1haW4pOiBQcmltYXJ5IHBhdGNoLgorICAgICAgICAoY3Jl
YXRlUGF0Y2hDb21tYW5kKTogQWRkZWQgLS1uby1zdHlsZS4KKyAgICAgICAgKiBTY3JpcHRzL3N2
bi1jcmVhdGUtcGF0Y2g6IFByaW1hcnkgcGF0Y2guCisgICAgICAgICogU2NyaXB0cy93ZWJraXQt
dG9vbHMtY29tcGxldGlvbi5zaDogQWRkZWQgLS1zdHlsZSBhbmQgLS1uby1zdHlsZS4KKyAgICAg
ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OiBBZGRlZCAt
LW5vLXN0eWxlLgorICAgICAgICAoU1ZOLmNyZWF0ZV9wYXRjaCk6IEFkZGVkIC0tbm8tc3R5bGUu
CisKIDIwMTQtMDQtMTAgIEJyZW5kYW4gTG9uZyAgPGIubG9uZ0BjYWJsZWxhYnMuY29tPgogCiAg
ICAgICAgIFtHdGtdIHJ1bi1sYXVuY2hlciBkb2Vzbid0IHdvcmsgYnkgZGVmYXVsdApJbmRleDog
VG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp
cHRzL2NvbW1pdC1sb2ctZWRpdG9yCShyZXZpc2lvbiAxNjcwODQpCisrKyBUb29scy9TY3JpcHRz
L2NvbW1pdC1sb2ctZWRpdG9yCSh3b3JraW5nIGNvcHkpCkBAIC0xNzYsNyArMTc2LDcgQEAgaWYg
KGlzR2l0KCkgJiYgQGNoYW5nZUxvZ3MgPT0gMCkgewogICAgICAgICBjaG9tcCgkd2Via2l0R2Vu
ZXJhdGVDb21taXRNZXNzYWdlID0gYGdpdCBjb25maWcgLS1ib29sIGNvcmUud2Via2l0R2VuZXJh
dGVDb21taXRNZXNzYWdlYCk7CiAgICAgfQogICAgIGlmICgkd2Via2l0R2VuZXJhdGVDb21taXRN
ZXNzYWdlIG5lICJmYWxzZSIpIHsKLSAgICAgICAgb3BlbiBDSEFOR0VMT0dfRU5UUklFUywgIi18
IiwgIiRGaW5kQmluOjpCaW4vcHJlcGFyZS1DaGFuZ2VMb2cgLS1naXQtaW5kZXggLS1uby13cml0
ZSIgb3IgZGllICJwcmVwYXJlLUNoYW5nZUxvZyBmYWlsZWQ6ICQhLlxuIjsKKyAgICAgICAgb3Bl
biBDSEFOR0VMT0dfRU5UUklFUywgIi18IiwgIiRGaW5kQmluOjpCaW4vcHJlcGFyZS1DaGFuZ2VM
b2cgLS1naXQtaW5kZXggLS1uby13cml0ZSAtLW5vLXN0eWxlIiBvciBkaWUgInByZXBhcmUtQ2hh
bmdlTG9nIGZhaWxlZDogJCEuXG4iOwogICAgICAgICB3aGlsZSAoPENIQU5HRUxPR19FTlRSSUVT
PikgewogICAgICAgICAgICAgcHJpbnQgTkVXTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRfLCAk
ZW5kbCk7CiAgICAgICAgIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwkocmV2aXNpb24g
MTY3MDg0KQorKysgVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwkod29ya2luZyBjb3B5
KQpAQCAtMTI4LDYgKzEyOCw3IEBAIHN1YiBtYWluKCkKICAgICBteSAkZ2l0Q29tbWl0ID0gMDsK
ICAgICBteSAkZ2l0SW5kZXggPSAiIjsKICAgICBteSAkZ2l0UmV2aWV3ZXIgPSAiIjsKKyAgICBt
eSAkY2hlY2tXZWJLaXRTdHlsZSA9IDE7CiAgICAgbXkgJG9wZW5DaGFuZ2VMb2dzID0gMDsKICAg
ICBteSAkd3JpdGVDaGFuZ2VMb2dzID0gMTsKICAgICBteSAkc2hvd0hlbHAgPSAwOwpAQCAtMTQ0
LDYgKzE0NSw3IEBAIHN1YiBtYWluKCkKICAgICAgICAgICAgICAgICAgICAiZ2l0LWluZGV4IiA9
PiBcJGdpdEluZGV4LAogICAgICAgICAgICAgICAgICAgICJnaXQtcmV2aWV3ZXI6cyIgPT4gXCRn
aXRSZXZpZXdlciwKICAgICAgICAgICAgICAgICAgICAiaGVscHxoISIgPT4gXCRzaG93SGVscCwK
KyAgICAgICAgICAgICAgICAgICAic3R5bGUhIiA9PiBcJGNoZWNrV2ViS2l0U3R5bGUsCiAgICAg
ICAgICAgICAgICAgICAgIm9wZW58byEiID0+IFwkb3BlbkNoYW5nZUxvZ3MsCiAgICAgICAgICAg
ICAgICAgICAgIndyaXRlISIgPT4gXCR3cml0ZUNoYW5nZUxvZ3MsCiAgICAgICAgICAgICAgICAg
ICAgInVwZGF0ZSEiID0+IFwkdXBkYXRlQ2hhbmdlTG9ncyk7CkBAIC0xNTgsNiArMTYwLDcgQEAg
c3ViIG1haW4oKQogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1naXQtcmV2aWV3ZXIgIFdoZW4g
cG9wdWxhdGluZyB0aGUgQ2hhbmdlTG9ncyBmcm9tIGEgZ2l0IGNvbW1pdCBjbGFpbSB0aGF0IHRo
ZSBzcGNpZmllZCBuYW1lIHJldmlld2VkIHRoZSBjaGFuZ2UuXG4iOwogICAgICAgICBwcmludCBT
VERFUlIgIiAgICAgICAgICAgICAgICAgIFRoaXMgb3B0aW9uIGlzIHVzZWZ1bCB3aGVuIHRoZSBn
aXQgY29tbWl0IGxhY2tzIGEgU2lnbmVkLU9mZi1CeTogbGluZVxuIjsKICAgICAgICAgcHJpbnQg
U1RERVJSICIgIC1ofC0taGVscCAgICAgICBTaG93IHRoaXMgaGVscCBtZXNzYWdlXG4iOworICAg
ICAgICBwcmludCBTVERFUlIgIiAgLS1bbm8tXXN0eWxlICAgIFJ1biBjaGVjay13ZWJraXQtc3R5
bGUgc2NyaXB0IHdoZW4gZG9uZSAoZGVmYXVsdDogc3R5bGUpXG4iOwogICAgICAgICBwcmludCBT
VERFUlIgIiAgLW98LS1vcGVuICAgICAgIE9wZW4gQ2hhbmdlTG9ncyBpbiBhbiBlZGl0b3Igd2hl
biBkb25lXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1bbm8tXXVwZGF0ZSAgIFVwZGF0
ZSBDaGFuZ2VMb2dzIGZyb20gc3ZuIGJlZm9yZSBhZGRpbmcgZW50cnkgKGRlZmF1bHQ6IHVwZGF0
ZSlcbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtLVtuby1dd3JpdGUgICAgV3JpdGUgQ2hh
bmdlTG9ncyB0byBkaXNrIChvdGhlcndpc2Ugc2VuZCBuZXcgZW50cmllcyB0byBzdGRvdXQpIChk
ZWZhdWx0OiB3cml0ZSlcbiI7CkBAIC0yMjUsNiArMjI4LDExIEBAIHN1YiBtYWluKCkKICAgICAg
ICAgcHJpbnREaWZmKCRjaGFuZ2VkRmlsZXMsICRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdl
QmFzZSk7CiAgICAgfQogCisgICAgaWYgKCRjaGVja1dlYktpdFN0eWxlKSB7CisgICAgICAgIHBy
aW50IFNUREVSUiAiICBSdW5uaW5nIGNoZWNrLXdlYmtpdC1zdHlsZS5cbiAgIjsKKyAgICAgICAg
c3lzdGVtICIkRmluZEJpbjo6QmluL2NoZWNrLXdlYmtpdC1zdHlsZSI7CisgICAgfSAgCisKICAg
ICAjIE9wZW4gQ2hhbmdlTG9ncy4KICAgICBpZiAoJG9wZW5DaGFuZ2VMb2dzICYmIEAkY2hhbmdl
TG9ncykgewogICAgICAgICBvcGVuQ2hhbmdlTG9ncygkY2hhbmdlTG9ncyk7CkBAIC0xNjU3LDcg
KzE2NjUsNyBAQCBzdWIgY3JlYXRlUGF0Y2hDb21tYW5kKCQkJCQpCiAKICAgICBteSAkY29tbWFu
ZDsKICAgICBpZiAoaXNTVk4oKSkgewotICAgICAgICAkY29tbWFuZCA9ICInJEZpbmRCaW46OkJp
bi9zdm4tY3JlYXRlLXBhdGNoJyAkY2hhbmdlZEZpbGVzU3RyaW5nIjsKKyAgICAgICAgJGNvbW1h
bmQgPSAiJyRGaW5kQmluOjpCaW4vc3ZuLWNyZWF0ZS1wYXRjaCAtLW5vLXN0eWxlJyAkY2hhbmdl
ZEZpbGVzU3RyaW5nIjsKICAgICB9IGVsc2lmIChpc0dpdCgpKSB7CiAgICAgICAgICRjb21tYW5k
ID0gR0lUIC4gIiBkaWZmIC1NIC1DICIgLiBkaWZmRnJvbVRvU3RyaW5nKCRnaXRDb21taXQsICRn
aXRJbmRleCwgJG1lcmdlQmFzZSk7CiAgICAgICAgICRjb21tYW5kIC49ICIgLS0gJGNoYW5nZWRG
aWxlc1N0cmluZyIgdW5sZXNzICRnaXRDb21taXQ7CkluZGV4OiBUb29scy9TY3JpcHRzL3N2bi1j
cmVhdGUtcGF0Y2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNo
CShyZXZpc2lvbiAxNjcwODQpCisrKyBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHdv
cmtpbmcgY29weSkKQEAgLTc3LDE1ICs3NywxNyBAQCBzdWIgdGVzdGZpbGVjbXAoJCQpOwogJEVO
VnsnTENfQUxMJ30gPSAnQyc7CiAKIG15ICRzaG93SGVscDsKK215ICRjaGVja1dlYktpdFN0eWxl
ID0gMTsKIG15ICRpZ25vcmVDaGFuZ2Vsb2dzID0gMDsKIG15ICRkZXZOdWxsID0gRmlsZTo6U3Bl
Yy0+ZGV2bnVsbCgpOwogCiBteSAkcmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAiaGVscCIgICAg
ICAgPT4gXCRzaG93SGVscCwKLSAgICAiaWdub3JlLWNoYW5nZWxvZ3MiICAgID0+IFwkaWdub3Jl
Q2hhbmdlbG9ncworICAgICJpZ25vcmUtY2hhbmdlbG9ncyIgPT4gXCRpZ25vcmVDaGFuZ2Vsb2dz
LAorICAgICJzdHlsZSEiID0+IFwkY2hlY2tXZWJLaXRTdHlsZSwKICk7CiBpZiAoISRyZXN1bHQg
fHwgJHNob3dIZWxwKSB7Ci0gICAgcHJpbnQgU1RERVJSIGJhc2VuYW1lKCQwKSAuICIgWy1ofC0t
aGVscF0gWy0taWdub3JlLWNoYW5nZWxvZ3NdIFtzdm5kaXIxIFtzdm5kaXIyIC4uLl1dXG4iOwor
ICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFstaHwtLWhlbHBdIFstLWlnbm9yZS1j
aGFuZ2Vsb2dzXSBbLS1bbm8tXXN0eWxlXSBbc3ZuZGlyMSBbc3ZuZGlyMiAuLi5dXVxuIjsKICAg
ICBleGl0IDE7CiB9CiAKQEAgLTEwNiw2ICsxMDgsMTAgQEAgZm9yIG15ICRwYXRoIChzb3J0IHBh
dGNocGF0aGNtcCB2YWx1ZXMgJQogICAgIGdlbmVyYXRlRGlmZigkcGF0aCwgJHByZWZpeCk7CiB9
CiAKK2lmICgkY2hlY2tXZWJLaXRTdHlsZSkgeworICAgIHN5c3RlbSAiJEZpbmRCaW46OkJpbi9j
aGVjay13ZWJraXQtc3R5bGUiOworfQorCiBleGl0IDA7CiAKICMgT3ZlcmFsbCBzb3J0LCBjb25z
aWRlcmluZyBtdWx0aXBsZSBjcml0ZXJpYS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0LXRv
b2xzLWNvbXBsZXRpb24uc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXQtdG9v
bHMtY29tcGxldGlvbi5zaAkocmV2aXNpb24gMTY3MDg0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr
aXQtdG9vbHMtY29tcGxldGlvbi5zaAkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYgKzEwOSw2IEBA
IF93ZWJraXQtcGF0Y2hfY29tcGxldGUoKQogCiBjb21wbGV0ZSAtRiBfd2Via2l0LXBhdGNoX2Nv
bXBsZXRlIHdlYmtpdC1wYXRjaAogY29tcGxldGUgLW8gZGVmYXVsdCAtVyAiLS1jb250aW51ZSAt
LWZpeC1tZXJnZWQgLS1oZWxwIC0tbm8tY29udGludWUgLS1uby13YXJuaW5ncyAtLXdhcm5pbmdz
IC1jIC1mIC1oIC13IiByZXNvbHZlLUNoYW5nZUxvZ3MKLWNvbXBsZXRlIC1vIGRlZmF1bHQgLVcg
Ii0tYnVnIC0tZGlmZiAtLWdpdC1jb21taXQgLS1naXQtaW5kZXggLS1naXQtcmV2aWV3ZXIgLS1o
ZWxwIC0tbm8tdXBkYXRlIC0tbm8td3JpdGUgLS1vcGVuIC0tdXBkYXRlIC0td3JpdGUgLWQgLWgg
LW8iIHByZXBhcmUtQ2hhbmdlTG9nCitjb21wbGV0ZSAtbyBkZWZhdWx0IC1XICItLWJ1ZyAtLWRp
ZmYgLS1naXQtY29tbWl0IC0tZ2l0LWluZGV4IC0tZ2l0LXJldmlld2VyIC0taGVscCAtLW5vLXN0
eWxlIC0tbm8tdXBkYXRlIC0tbm8td3JpdGUgLS1vcGVuIC0tc3R5bGUgLS11cGRhdGUgLS13cml0
ZSAtZCAtaCAtbyIgcHJlcGFyZS1DaGFuZ2VMb2cKIGNvbXBsZXRlIC1XICItLWNsZWFuIC0tZGVi
dWcgLS1oZWxwIC1oIiBidWlsZC13ZWJraXQKIGNvbXBsZXRlIC1vIGRlZmF1bHQgLVcgIi0tYWRk
LXBsYXRmb3JtLWV4Y2VwdGlvbnMgLS1jb21wbGV4LXRleHQgLS1jb25maWd1cmF0aW9uIC0tZ3Vh
cmQtbWFsbG9jIC0taGVscCAtLWh0dHAgLS1pZ25vcmUtdGVzdHMgLS1sYXVuY2gtc2FmYXJpIC0t
bGVha3MgLS1tZXJnZS1sZWFrLWRlcHRoIC0tbmV3LXRlc3QtcmVzdWx0cyAtLW5vLWh0dHAgLS1u
by1zaG93LXJlc3VsdHMgLS1uby1uZXctdGVzdC1yZXN1bHRzIC0tbm8tc2FtcGxlLW9uLXRpbWVv
dXQgLS1uby1zdHJpcC1lZGl0aW5nLWNhbGxiYWNrcyAtLXBpeGVsLXRlc3RzIC0tcGxhdGZvcm0g
LS1wb3J0IC0tcXVpZXQgLS1yYW5kb20gLS1yZXNldC1yZXN1bHRzIC0tcmVzdWx0cy1kaXJlY3Rv
cnkgLS1yZXZlcnNlIC0tcm9vdCAtLXNhbXBsZS1vbi10aW1lb3V0IC0tc2luZ2x5IC0tc2tpcHBl
ZCAtLXNsb3dlc3QgLS1zdHJpY3QgLS1zdHJpcC1lZGl0aW5nLWNhbGxiYWNrcyAtLXRocmVhZGVk
IC0tdGltZW91dCAtLXRvbGVyYW5jZSAtLXVzZS1yZW1vdGUtbGlua3MtdG8tdGVzdHMgLS12YWxn
cmluZCAtLXZlcmJvc2UgLTEgLWMgLWcgLWggLWkgLWwgLW0gLW8gLXAgLXEgLXQgLXYiIHJ1bi13
ZWJraXQtdGVzdHMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0
L3NjbS9zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v
Y2hlY2tvdXQvc2NtL3N2bi5weQkocmV2aXNpb24gMTY3MDg0KQorKysgVG9vbHMvU2NyaXB0cy93
ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtMjcz
LDcgKzI3Myw3IEBAIGNsYXNzIFNWTihTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICBlbGlm
IGNoYW5nZWRfZmlsZXMgPT0gTm9uZToKICAgICAgICAgICAgIGNoYW5nZWRfZmlsZXMgPSBbXQog
ICAgICAgICBzY3JpcHRfcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLmNoZWNrb3V0
X3Jvb3QsICJUb29scyIsICJTY3JpcHRzIiwgInN2bi1jcmVhdGUtcGF0Y2giKQotICAgICAgICBy
ZXR1cm4gc2VsZi5ydW4oW3NjcmlwdF9wYXRoXSArIGNoYW5nZWRfZmlsZXMsCisgICAgICAgIHJl
dHVybiBzZWxmLnJ1bihbc2NyaXB0X3BhdGgsICItLW5vLXN0eWxlIl0gKyBjaGFuZ2VkX2ZpbGVz
LAogICAgICAgICAgICAgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCwgcmV0dXJuX3N0ZGVycj1GYWxz
ZSwKICAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9RmFsc2UpCiAK
</data>
<flag name="review"
          id="254395"
          type_id="1"
          status="+"
          setter="dbates"
    />
    <flag name="commit-queue"
          id="254394"
          type_id="3"
          status="-"
          setter="commit-queue"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>230027</attachid>
            <date>2014-04-23 18:47:06 -0700</date>
            <delta_ts>2014-04-23 22:49:03 -0700</delta_ts>
            <desc>patch with review feedback</desc>
            <filename>webkit131115.diff</filename>
            <type>text/plain</type>
            <size>7634</size>
            <attacher name="James Craig">jcraig</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDE2NzczMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDIxIEBACisyMDE0LTA0LTIzICBKYW1lcyBDcmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CisK
KyAgICAgICAgcHJlcGFyZS1DaGFuZ2Vsb2cgYW5kIHN2bi1jcmVhdGUtcGF0Y2ggc2hvdWxkIG9w
dGlvbmFsbHkgcnVuIGNoZWNrLXdlYmtpdC1zdHlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIFstLVtuby1dc3R5bGVdIHBhcmFtIHRvIHJ1
biBjaGVjay13ZWJraXQtc3R5bGUgYXMgcGFydCBvZiBwcmVwYXJlLUNoYW5nZWxvZyBhbmQgc3Zu
LWNyZWF0ZS1wYXRjaC4KKworICAgICAgICAqIFNjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3I6IEFk
ZGVkIC0tbm8tc3R5bGUuCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzogUHJp
bWFyeSBwYXRjaC4KKyAgICAgICAgKG1haW4pOiBQcmltYXJ5IHBhdGNoLgorICAgICAgICAoY3Jl
YXRlUGF0Y2hDb21tYW5kKTogQWRkZWQgLS1uby1zdHlsZS4KKyAgICAgICAgKiBTY3JpcHRzL3N2
bi1jcmVhdGUtcGF0Y2g6IFByaW1hcnkgcGF0Y2guCisgICAgICAgICogU2NyaXB0cy93ZWJraXQt
dG9vbHMtY29tcGxldGlvbi5zaDogQWRkZWQgLS1zdHlsZSBhbmQgLS1uby1zdHlsZS4KKyAgICAg
ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OiBBZGRlZCAt
LW5vLXN0eWxlLgorICAgICAgICAoU1ZOLmNyZWF0ZV9wYXRjaCk6IEFkZGVkIC0tbm8tc3R5bGUu
CisKIDIwMTQtMDQtMjMgIEphbWVzIENyYWlnICA8amNyYWlnQGFwcGxlLmNvbT4KIAogICAgICAg
ICBVbnJldmlld2VkLiBNb3ZpbmcgbXlzZWxmIGZyb20gQ29udHJpYnV0b3JzIHRvIENvbW1pdHRl
cnMgbGlzdC4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgkocmV2aXNpb24gMTY3NzMxKQor
KysgVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgkod29ya2luZyBjb3B5KQpAQCAtMTc2
LDcgKzE3Niw3IEBAIGlmIChpc0dpdCgpICYmIEBjaGFuZ2VMb2dzID09IDApIHsKICAgICAgICAg
Y2hvbXAoJHdlYmtpdEdlbmVyYXRlQ29tbWl0TWVzc2FnZSA9IGBnaXQgY29uZmlnIC0tYm9vbCBj
b3JlLndlYmtpdEdlbmVyYXRlQ29tbWl0TWVzc2FnZWApOwogICAgIH0KICAgICBpZiAoJHdlYmtp
dEdlbmVyYXRlQ29tbWl0TWVzc2FnZSBuZSAiZmFsc2UiKSB7Ci0gICAgICAgIG9wZW4gQ0hBTkdF
TE9HX0VOVFJJRVMsICItfCIsICIkRmluZEJpbjo6QmluL3ByZXBhcmUtQ2hhbmdlTG9nIC0tZ2l0
LWluZGV4IC0tbm8td3JpdGUiIG9yIGRpZSAicHJlcGFyZS1DaGFuZ2VMb2cgZmFpbGVkOiAkIS5c
biI7CisgICAgICAgIG9wZW4gQ0hBTkdFTE9HX0VOVFJJRVMsICItfCIsICIkRmluZEJpbjo6Qmlu
L3ByZXBhcmUtQ2hhbmdlTG9nIC0tZ2l0LWluZGV4IC0tbm8td3JpdGUgLS1uby1zdHlsZSIgb3Ig
ZGllICJwcmVwYXJlLUNoYW5nZUxvZyBmYWlsZWQ6ICQhLlxuIjsKICAgICAgICAgd2hpbGUgKDxD
SEFOR0VMT0dfRU5UUklFUz4pIHsKICAgICAgICAgICAgIHByaW50IE5FV0xPRyBub3JtYWxpemVM
aW5lRW5kaW5ncygkXywgJGVuZGwpOwogICAgICAgICB9CkluZGV4OiBUb29scy9TY3JpcHRzL3By
ZXBhcmUtQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFu
Z2VMb2cJKHJldmlzaW9uIDE2NzczMSkKKysrIFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VM
b2cJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw2ICsxMjgsNyBAQCBzdWIgbWFpbigpCiAgICAgbXkg
JGdpdENvbW1pdCA9IDA7CiAgICAgbXkgJGdpdEluZGV4ID0gIiI7CiAgICAgbXkgJGdpdFJldmll
d2VyID0gIiI7CisgICAgbXkgJGNoZWNrV2ViS2l0U3R5bGUgPSAxOwogICAgIG15ICRvcGVuQ2hh
bmdlTG9ncyA9IDA7CiAgICAgbXkgJHdyaXRlQ2hhbmdlTG9ncyA9IDE7CiAgICAgbXkgJHNob3dI
ZWxwID0gMDsKQEAgLTE0NCw2ICsxNDUsNyBAQCBzdWIgbWFpbigpCiAgICAgICAgICAgICAgICAg
ICAgImdpdC1pbmRleCIgPT4gXCRnaXRJbmRleCwKICAgICAgICAgICAgICAgICAgICAiZ2l0LXJl
dmlld2VyOnMiID0+IFwkZ2l0UmV2aWV3ZXIsCiAgICAgICAgICAgICAgICAgICAgImhlbHB8aCEi
ID0+IFwkc2hvd0hlbHAsCisgICAgICAgICAgICAgICAgICAgInN0eWxlISIgPT4gXCRjaGVja1dl
YktpdFN0eWxlLAogICAgICAgICAgICAgICAgICAgICJvcGVufG8hIiA9PiBcJG9wZW5DaGFuZ2VM
b2dzLAogICAgICAgICAgICAgICAgICAgICJ3cml0ZSEiID0+IFwkd3JpdGVDaGFuZ2VMb2dzLAog
ICAgICAgICAgICAgICAgICAgICJ1cGRhdGUhIiA9PiBcJHVwZGF0ZUNoYW5nZUxvZ3MpOwpAQCAt
MTU4LDYgKzE2MCw3IEBAIHN1YiBtYWluKCkKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tZ2l0
LXJldmlld2VyICBXaGVuIHBvcHVsYXRpbmcgdGhlIENoYW5nZUxvZ3MgZnJvbSBhIGdpdCBjb21t
aXQgY2xhaW0gdGhhdCB0aGUgc3BjaWZpZWQgbmFtZSByZXZpZXdlZCB0aGUgY2hhbmdlLlxuIjsK
ICAgICAgICAgcHJpbnQgU1RERVJSICIgICAgICAgICAgICAgICAgICBUaGlzIG9wdGlvbiBpcyB1
c2VmdWwgd2hlbiB0aGUgZ2l0IGNvbW1pdCBsYWNrcyBhIFNpZ25lZC1PZmYtQnk6IGxpbmVcbiI7
CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtaHwtLWhlbHAgICAgICAgU2hvdyB0aGlzIGhlbHAg
bWVzc2FnZVxuIjsKKyAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV1zdHlsZSAgICBSdW4g
Y2hlY2std2Via2l0LXN0eWxlIHNjcmlwdCB3aGVuIGRvbmUgKGRlZmF1bHQ6IHN0eWxlKVxuIjsK
ICAgICAgICAgcHJpbnQgU1RERVJSICIgIC1vfC0tb3BlbiAgICAgICBPcGVuIENoYW5nZUxvZ3Mg
aW4gYW4gZWRpdG9yIHdoZW4gZG9uZVxuIjsKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tW25v
LV11cGRhdGUgICBVcGRhdGUgQ2hhbmdlTG9ncyBmcm9tIHN2biBiZWZvcmUgYWRkaW5nIGVudHJ5
IChkZWZhdWx0OiB1cGRhdGUpXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1bbm8tXXdy
aXRlICAgIFdyaXRlIENoYW5nZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVudHJp
ZXMgdG8gc3Rkb3V0KSAoZGVmYXVsdDogd3JpdGUpXG4iOwpAQCAtMjI1LDYgKzIyOCwxMSBAQCBz
dWIgbWFpbigpCiAgICAgICAgIHByaW50RGlmZigkY2hhbmdlZEZpbGVzLCAkZ2l0Q29tbWl0LCAk
Z2l0SW5kZXgsICRtZXJnZUJhc2UpOwogICAgIH0KIAorICAgIGlmICgkY2hlY2tXZWJLaXRTdHls
ZSkgeworICAgICAgICBwcmludCBTVERFUlIgIiAgUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGUu
XG4gICI7CisgICAgICAgIHN5c3RlbSAiJEZpbmRCaW46OkJpbi9jaGVjay13ZWJraXQtc3R5bGUi
OworICAgIH0gIAorCiAgICAgIyBPcGVuIENoYW5nZUxvZ3MuCiAgICAgaWYgKCRvcGVuQ2hhbmdl
TG9ncyAmJiBAJGNoYW5nZUxvZ3MpIHsKICAgICAgICAgb3BlbkNoYW5nZUxvZ3MoJGNoYW5nZUxv
Z3MpOwpAQCAtMTY1Nyw3ICsxNjY1LDcgQEAgc3ViIGNyZWF0ZVBhdGNoQ29tbWFuZCgkJCQkKQog
CiAgICAgbXkgJGNvbW1hbmQ7CiAgICAgaWYgKGlzU1ZOKCkpIHsKLSAgICAgICAgJGNvbW1hbmQg
PSAiJyRGaW5kQmluOjpCaW4vc3ZuLWNyZWF0ZS1wYXRjaCcgJGNoYW5nZWRGaWxlc1N0cmluZyI7
CisgICAgICAgICRjb21tYW5kID0gIickRmluZEJpbjo6QmluL3N2bi1jcmVhdGUtcGF0Y2ggLS1u
by1zdHlsZScgJGNoYW5nZWRGaWxlc1N0cmluZyI7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkgewog
ICAgICAgICAkY29tbWFuZCA9IEdJVCAuICIgZGlmZiAtTSAtQyAiIC4gZGlmZkZyb21Ub1N0cmlu
ZygkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwogICAgICAgICAkY29tbWFuZCAu
PSAiIC0tICRjaGFuZ2VkRmlsZXNTdHJpbmciIHVubGVzcyAkZ2l0Q29tbWl0OwpJbmRleDogVG9v
bHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv
c3ZuLWNyZWF0ZS1wYXRjaAkocmV2aXNpb24gMTY3NzMxKQorKysgVG9vbHMvU2NyaXB0cy9zdm4t
Y3JlYXRlLXBhdGNoCSh3b3JraW5nIGNvcHkpCkBAIC03NywxNSArNzcsMTcgQEAgc3ViIHRlc3Rm
aWxlY21wKCQkKTsKICRFTlZ7J0xDX0FMTCd9ID0gJ0MnOwogCiBteSAkc2hvd0hlbHA7CitteSAk
Y2hlY2tXZWJLaXRTdHlsZSA9IDE7CiBteSAkaWdub3JlQ2hhbmdlbG9ncyA9IDA7CiBteSAkZGV2
TnVsbCA9IEZpbGU6OlNwZWMtPmRldm51bGwoKTsKIAogbXkgJHJlc3VsdCA9IEdldE9wdGlvbnMo
CiAgICAgImhlbHAiICAgICAgID0+IFwkc2hvd0hlbHAsCi0gICAgImlnbm9yZS1jaGFuZ2Vsb2dz
IiAgICA9PiBcJGlnbm9yZUNoYW5nZWxvZ3MKKyAgICAiaWdub3JlLWNoYW5nZWxvZ3MiID0+IFwk
aWdub3JlQ2hhbmdlbG9ncywKKyAgICAic3R5bGUhIiA9PiBcJGNoZWNrV2ViS2l0U3R5bGUsCiAp
OwogaWYgKCEkcmVzdWx0IHx8ICRzaG93SGVscCkgewotICAgIHByaW50IFNUREVSUiBiYXNlbmFt
ZSgkMCkgLiAiIFstaHwtLWhlbHBdIFstLWlnbm9yZS1jaGFuZ2Vsb2dzXSBbc3ZuZGlyMSBbc3Zu
ZGlyMiAuLi5dXVxuIjsKKyAgICBwcmludCBTVERFUlIgYmFzZW5hbWUoJDApIC4gIiBbLWh8LS1o
ZWxwXSBbLS1pZ25vcmUtY2hhbmdlbG9nc10gWy0tW25vLV1zdHlsZV0gW3N2bmRpcjEgW3N2bmRp
cjIgLi4uXV1cbiI7CiAgICAgZXhpdCAxOwogfQogCkBAIC0xMDYsNiArMTA4LDExIEBAIGZvciBt
eSAkcGF0aCAoc29ydCBwYXRjaHBhdGhjbXAgdmFsdWVzICUKICAgICBnZW5lcmF0ZURpZmYoJHBh
dGgsICRwcmVmaXgpOwogfQogCitpZiAoJGNoZWNrV2ViS2l0U3R5bGUpIHsKKyAgICBwcmludCBT
VERFUlIgIiAgUnVubmluZyBjaGVjay13ZWJraXQtc3R5bGUuXG4gICI7CisgICAgc3lzdGVtICIk
RmluZEJpbjo6QmluL2NoZWNrLXdlYmtpdC1zdHlsZSI7Cit9CisKIGV4aXQgMDsKIAogIyBPdmVy
YWxsIHNvcnQsIGNvbnNpZGVyaW5nIG11bHRpcGxlIGNyaXRlcmlhLgpJbmRleDogVG9vbHMvU2Ny
aXB0cy93ZWJraXQtdG9vbHMtY29tcGxldGlvbi5zaAo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp
cHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCShyZXZpc2lvbiAxNjc3MzEpCisrKyBUb29s
cy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCSh3b3JraW5nIGNvcHkpCkBAIC0x
MDksNiArMTA5LDYgQEAgX3dlYmtpdC1wYXRjaF9jb21wbGV0ZSgpCiAKIGNvbXBsZXRlIC1GIF93
ZWJraXQtcGF0Y2hfY29tcGxldGUgd2Via2l0LXBhdGNoCiBjb21wbGV0ZSAtbyBkZWZhdWx0IC1X
ICItLWNvbnRpbnVlIC0tZml4LW1lcmdlZCAtLWhlbHAgLS1uby1jb250aW51ZSAtLW5vLXdhcm5p
bmdzIC0td2FybmluZ3MgLWMgLWYgLWggLXciIHJlc29sdmUtQ2hhbmdlTG9ncwotY29tcGxldGUg
LW8gZGVmYXVsdCAtVyAiLS1idWcgLS1kaWZmIC0tZ2l0LWNvbW1pdCAtLWdpdC1pbmRleCAtLWdp
dC1yZXZpZXdlciAtLWhlbHAgLS1uby11cGRhdGUgLS1uby13cml0ZSAtLW9wZW4gLS11cGRhdGUg
LS13cml0ZSAtZCAtaCAtbyIgcHJlcGFyZS1DaGFuZ2VMb2cKK2NvbXBsZXRlIC1vIGRlZmF1bHQg
LVcgIi0tYnVnIC0tZGlmZiAtLWdpdC1jb21taXQgLS1naXQtaW5kZXggLS1naXQtcmV2aWV3ZXIg
LS1oZWxwIC0tbm8tc3R5bGUgLS1uby11cGRhdGUgLS1uby13cml0ZSAtLW9wZW4gLS1zdHlsZSAt
LXVwZGF0ZSAtLXdyaXRlIC1kIC1oIC1vIiBwcmVwYXJlLUNoYW5nZUxvZwogY29tcGxldGUgLVcg
Ii0tY2xlYW4gLS1kZWJ1ZyAtLWhlbHAgLWgiIGJ1aWxkLXdlYmtpdAogY29tcGxldGUgLW8gZGVm
YXVsdCAtVyAiLS1hZGQtcGxhdGZvcm0tZXhjZXB0aW9ucyAtLWNvbXBsZXgtdGV4dCAtLWNvbmZp
Z3VyYXRpb24gLS1ndWFyZC1tYWxsb2MgLS1oZWxwIC0taHR0cCAtLWlnbm9yZS10ZXN0cyAtLWxh
dW5jaC1zYWZhcmkgLS1sZWFrcyAtLW1lcmdlLWxlYWstZGVwdGggLS1uZXctdGVzdC1yZXN1bHRz
IC0tbm8taHR0cCAtLW5vLXNob3ctcmVzdWx0cyAtLW5vLW5ldy10ZXN0LXJlc3VsdHMgLS1uby1z
YW1wbGUtb24tdGltZW91dCAtLW5vLXN0cmlwLWVkaXRpbmctY2FsbGJhY2tzIC0tcGl4ZWwtdGVz
dHMgLS1wbGF0Zm9ybSAtLXBvcnQgLS1xdWlldCAtLXJhbmRvbSAtLXJlc2V0LXJlc3VsdHMgLS1y
ZXN1bHRzLWRpcmVjdG9yeSAtLXJldmVyc2UgLS1yb290IC0tc2FtcGxlLW9uLXRpbWVvdXQgLS1z
aW5nbHkgLS1za2lwcGVkIC0tc2xvd2VzdCAtLXN0cmljdCAtLXN0cmlwLWVkaXRpbmctY2FsbGJh
Y2tzIC0tdGhyZWFkZWQgLS10aW1lb3V0IC0tdG9sZXJhbmNlIC0tdXNlLXJlbW90ZS1saW5rcy10
by10ZXN0cyAtLXZhbGdyaW5kIC0tdmVyYm9zZSAtMSAtYyAtZyAtaCAtaSAtbCAtbSAtbyAtcCAt
cSAtdCAtdiIgcnVuLXdlYmtpdC10ZXN0cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j
b21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl
YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CShyZXZpc2lvbiAxNjc3MzEpCisrKyBU
b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CSh3b3JraW5n
IGNvcHkpCkBAIC0yNzMsNyArMjczLDcgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6
CiAgICAgICAgIGVsaWYgY2hhbmdlZF9maWxlcyA9PSBOb25lOgogICAgICAgICAgICAgY2hhbmdl
ZF9maWxlcyA9IFtdCiAgICAgICAgIHNjcmlwdF9wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2lu
KHNlbGYuY2hlY2tvdXRfcm9vdCwgIlRvb2xzIiwgIlNjcmlwdHMiLCAic3ZuLWNyZWF0ZS1wYXRj
aCIpCi0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2NyaXB0X3BhdGhdICsgY2hhbmdlZF9maWxl
cywKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuKFtzY3JpcHRfcGF0aCwgIi0tbm8tc3R5bGUiXSAr
IGNoYW5nZWRfZmlsZXMsCiAgICAgICAgICAgICBjd2Q9c2VsZi5jaGVja291dF9yb290LCByZXR1
cm5fc3RkZXJyPUZhbHNlLAogICAgICAgICAgICAgZGVjb2RlX291dHB1dD1GYWxzZSkKIAo=
</data>
<flag name="commit-queue"
          id="254423"
          type_id="3"
          status="-"
          setter="commit-queue"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>230051</attachid>
            <date>2014-04-23 22:49:03 -0700</date>
            <delta_ts>2014-04-23 23:17:14 -0700</delta_ts>
            <desc>patch with reviewer comment included manually</desc>
            <filename>webkit131115.diff</filename>
            <type>text/plain</type>
            <size>0</size>
            <attacher name="James Craig">jcraig</attacher>
            
              <data encoding="base64"></data>
<flag name="commit-queue"
          id="254424"
          type_id="3"
          status="-"
          setter="dbates"
    />
          </attachment>
      

    </bug>

</bugzilla>