<?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>124785</bug_id>
          
          <creation_ts>2013-11-22 11:36:53 -0800</creation_ts>
          <short_desc>Add TextTrackList::getTrackById().</short_desc>
          <delta_ts>2013-11-22 13:41:57 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Media</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Brendan Long">b.long</reporter>
          <assigned_to name="Brendan Long">b.long</assigned_to>
          <cc>cdumez</cc>
    
    <cc>commit-queue</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>glenn</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>jer.noble</cc>
    
    <cc>kondapallykalyan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>953633</commentid>
    <comment_count>0</comment_count>
    <who name="Brendan Long">b.long</who>
    <bug_when>2013-11-22 11:36:53 -0800</bug_when>
    <thetext>&gt; The getTrackById(id) method must return the first TextTrack in the TextTrackList object whose id IDL attribute would return a value equal to the value of the id argument. When no tracks match the given argument, the method must return null.

http://www.w3.org/TR/html5/embedded-content-0.html#dom-texttracklist-gettrackbyid

&gt; The AudioTrackList.getTrackById(id) and VideoTrackList.getTrackById(id) methods must return the first AudioTrack or VideoTrack object (respectively) in the AudioTrackList or VideoTrackList object (respectively) whose identifier is equal to the value of the id argument (in the natural order of the list, as defined above). When no tracks match the given argument, the methods must return null.

The getTrackById(id) method must return the first TextTrack in the TextTrackList object whose id IDL attribute would return a value equal to the value of the id argument. When no tracks match the given argument, the method must return null.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>953634</commentid>
    <comment_count>1</comment_count>
    <who name="Brendan Long">b.long</who>
    <bug_when>2013-11-22 11:38:52 -0800</bug_when>
    <thetext>It looks like AudioTrackList and VideoTrackList already have it. I think this was added to the spec after those interfaces were created.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>953650</commentid>
    <comment_count>2</comment_count>
      <attachid>217708</attachid>
    <who name="Brendan Long">b.long</who>
    <bug_when>2013-11-22 12:37:38 -0800</bug_when>
    <thetext>Created attachment 217708
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>953653</commentid>
    <comment_count>3</comment_count>
      <attachid>217708</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2013-11-22 12:50:56 -0800</bug_when>
    <thetext>Comment on attachment 217708
Patch

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

&gt; Source/WebCore/html/track/TextTrackList.cpp:143
&gt; +    return 0;

Nit: nullptr

&gt; Source/WebCore/html/track/TextTrackList.h:51
&gt; +    TextTrack* getTrackById(const AtomicString&amp; id);

Nit: &quot;id&quot; is unnecessary.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>953658</commentid>
    <comment_count>4</comment_count>
      <attachid>217711</attachid>
    <who name="Brendan Long">b.long</who>
    <bug_when>2013-11-22 13:04:26 -0800</bug_when>
    <thetext>Created attachment 217711
Fix nits</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>953668</commentid>
    <comment_count>5</comment_count>
      <attachid>217711</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-11-22 13:41:55 -0800</bug_when>
    <thetext>Comment on attachment 217711
Fix nits

Clearing flags on attachment: 217711

Committed r159711: &lt;http://trac.webkit.org/changeset/159711&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>953669</commentid>
    <comment_count>6</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-11-22 13:41:57 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>217708</attachid>
            <date>2013-11-22 12:37:38 -0800</date>
            <delta_ts>2013-11-22 13:04:21 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-124785-20131122143737.patch</filename>
            <type>text/plain</type>
            <size>6851</size>
            <attacher name="Brendan Long">b.long</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyYjUzYzk0NzIwY2E5
YmYwNmVjZmZjYWQ3NGE2OGI5YjcwYTQxNS4uYTJlZDAzZWE5NzE3ODBmNjU0NDkzNjNhYjhlNzk5
OWI3OTBhODkzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTExLTIyICBCcmVu
ZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAgICBBZGQgVGV4dFRyYWNr
TGlzdDo6Z2V0VHJhY2tCeUlkKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xMjQ3ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBUZXN0OiBtZWRpYS90cmFjay90cmFjay1pZC5odG1sCisKKyAgICAgICAg
KiBodG1sL3RyYWNrL1RleHRUcmFja0xpc3QuY3BwOiBBZGQgZ2V0VHJhY2tCeUlkKCkKKyAgICAg
ICAgKFRleHRUcmFja0xpc3Q6OmdldFRyYWNrQnlJZCk6CisgICAgICAgICogaHRtbC90cmFjay9U
ZXh0VHJhY2tMaXN0Lmg6IFNhbWUuCisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0
LmlkbDogU2FtZS4KKwogMjAxMy0xMS0yMiAgQW5kcmVzIEdvbWV6ICA8YWdvbWV6QGlnYWxpYS5j
b20+CiAKICAgICAgICAgU2V2ZXJhbCBtaXNzaW5nL2luY29ycmVjdCBndWFyZHMgZm9yIExPR19E
SVNBQkxFRD0wIGFnYWluc3QgUmVsZWFzZSBidWlsZCAoTWFjKQpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0
bWwvdHJhY2svVGV4dFRyYWNrTGlzdC5jcHAKaW5kZXggNGE5YWExOThmMzUyNWM0NmNkNTAxODI2
ZDhhZDhiYTk3NzBkMTczOC4uMjNkMTQzZWFhOWYwY2FlNGU3ZGMxMGQ2NTA0ZmVjZjg3Yjk2MWUw
NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0LmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuY3BwCkBAIC0x
MjcsNiArMTI3LDIyIEBAIFRleHRUcmFjayogVGV4dFRyYWNrTGlzdDo6aXRlbSh1bnNpZ25lZCBp
bmRleCkgY29uc3QKICAgICByZXR1cm4gMDsKIH0KIAorVGV4dFRyYWNrKiBUZXh0VHJhY2tMaXN0
OjpnZXRUcmFja0J5SWQoY29uc3QgQXRvbWljU3RyaW5nJiBpZCkKK3sKKyAgICAvLyA0LjguMTAu
MTIuNSBUZXh0IHRyYWNrIEFQSQorICAgIC8vIFRoZSBnZXRUcmFja0J5SWQoaWQpIG1ldGhvZCBt
dXN0IHJldHVybiB0aGUgZmlyc3QgVGV4dFRyYWNrIGluIHRoZQorICAgIC8vIFRleHRUcmFja0xp
c3Qgb2JqZWN0IHdob3NlIGlkIElETCBhdHRyaWJ1dGUgd291bGQgcmV0dXJuIGEgdmFsdWUgZXF1
YWwKKyAgICAvLyB0byB0aGUgdmFsdWUgb2YgdGhlIGlkIGFyZ3VtZW50LgorICAgIGZvciAodW5z
aWduZWQgaSA9IDA7IGkgPCBsZW5ndGgoKTsgKytpKSB7CisgICAgICAgIFRleHRUcmFjayogdHJh
Y2sgPSBpdGVtKGkpOworICAgICAgICBpZiAodHJhY2stPmlkKCkgPT0gaWQpCisgICAgICAgICAg
ICByZXR1cm4gdHJhY2s7CisgICAgfQorCisgICAgLy8gV2hlbiBubyB0cmFja3MgbWF0Y2ggdGhl
IGdpdmVuIGFyZ3VtZW50LCB0aGUgbWV0aG9kIG11c3QgcmV0dXJuIG51bGwuCisgICAgcmV0dXJu
IDA7Cit9CisKIHZvaWQgVGV4dFRyYWNrTGlzdDo6aW52YWxpZGF0ZVRyYWNrSW5kZXhlc0FmdGVy
VHJhY2soVGV4dFRyYWNrKiB0cmFjaykKIHsKICAgICBWZWN0b3I8UmVmUHRyPFRyYWNrQmFzZT4+
KiB0cmFja3MgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0
VHJhY2tMaXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuaApp
bmRleCBkOWQ4OWY3OTZlNzM4NDc1NjdlMDkzMjQ4YWQ5NGMzNDcxYTY4ZWM5Li41ZjVkY2NkM2Y1
ZTc0NmI5NjgwZGVhNzkyZjY4ZGM1ZmM5YmUxNmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3Ry
YWNrL1RleHRUcmFja0xpc3QuaApAQCAtNDgsNiArNDgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh
bCBib29sIGNvbnRhaW5zKFRyYWNrQmFzZSopIGNvbnN0IE9WRVJSSURFOwogCiAgICAgVGV4dFRy
YWNrKiBpdGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdDsKKyAgICBUZXh0VHJhY2sqIGdldFRyYWNr
QnlJZChjb25zdCBBdG9taWNTdHJpbmcmIGlkKTsKICAgICBUZXh0VHJhY2sqIGxhc3RJdGVtKCkg
Y29uc3QgeyByZXR1cm4gaXRlbShsZW5ndGgoKSAtIDEpOyB9CiAKICAgICB2b2lkIGFwcGVuZChQ
YXNzUmVmUHRyPFRleHRUcmFjaz4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90
cmFjay9UZXh0VHJhY2tMaXN0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRy
YWNrTGlzdC5pZGwKaW5kZXggOTZkMjNlYjc1NDMxNWVlODVmNTZlZWUwNjI1ZjM5NjE4MWJkOGIx
ZS4uMWM3ODdjNGE0YTBkNDhmZjdmOTkxODc2ZWMyZTE2YzQ5NzM4ZDNlYSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0LmlkbAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuaWRsCkBAIC0zMSw2ICszMSw3IEBACiBd
IGludGVyZmFjZSBUZXh0VHJhY2tMaXN0IHsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWdu
ZWQgbG9uZyBsZW5ndGg7CiAgICAgZ2V0dGVyIFRleHRUcmFjayBpdGVtKHVuc2lnbmVkIGxvbmcg
aW5kZXgpOworICAgIFRleHRUcmFjayBnZXRUcmFja0J5SWQoRE9NU3RyaW5nIGlkKTsKIAogICAg
IGF0dHJpYnV0ZSBFdmVudExpc3RlbmVyIG9uYWRkdHJhY2s7CiAgICAgYXR0cmlidXRlIEV2ZW50
TGlzdGVuZXIgb25yZW1vdmV0cmFjazsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlM2ZjMjJkMzFhZmU2NDE5ZTFkYWI0N2Fi
MWUyMTRmNGYwNmM2MzhiLi42Y2Y1ZTU2ZDQxNDNiMzA5MDkwYjU3MzZkMjZiOTQ3Yzg2MzhlM2Nh
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMTEtMjIgIEJyZW5kYW4gTG9uZyAgPGIubG9u
Z0BjYWJsZWxhYnMuY29tPgorCisgICAgICAgIEFkZCBUZXh0VHJhY2tMaXN0OjpnZXRUcmFja0J5
SWQoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy
NDc4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVw
ZGF0ZSB0aGlzIHRlc3QgdG8gbWFrZSBpdCBtb3JlIGludGVyZXN0aW5nLiBJdCBub3cgY2hlY2tz
IHRoYXQgdGhlICJpZCIKKyAgICAgICAgY2hhbmdlcyB3aGVuIHRoZSA8dHJhY2s+IGlkIGNoYW5n
ZXMsIG1ha2VzIHN1cmUgVGV4dFRyYWNrOjppZCBpcyByZWFkb25seSwKKyAgICAgICAgYW5kIGxv
b2tzIHRoZSB0cmFjayB1cCBieSBpZCB3aXRoIGdldFRyYWNrQnlJZCgpLgorCisgICAgICAgICog
bWVkaWEvdHJhY2svdHJhY2staWQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3RyYWNr
L3RyYWNrLWlkLmh0bWw6CisKIDIwMTMtMTEtMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBh
cHBsZS5jb20+CiAKICAgICAgICAgTGF5b3V0IFRlc3QgZWRpdGluZy9kZWxldGluZy9wYXNzd29y
ZC1kZWxldGUtcGVyZm9ybWFuY2UuaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9tZWRpYS90cmFjay90cmFjay1pZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRp
YS90cmFjay90cmFjay1pZC1leHBlY3RlZC50eHQKaW5kZXggYWZjYTY1MjA2YjQ0YjNmYWZiMmI4
ZmI2ZDQ1MWQzMTEzNmI1NDUyMy4uMzQyMGJiYTNlZDM3MjY5OWJkYjAyZWY3YTJhOGFiY2ZiMzY5
MGViMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2staWQtZXhwZWN0
ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWlkLWV4cGVjdGVkLnR4
dApAQCAtMSw3ICsxLDE2IEBACi1UZXN0cyB0aGF0IHRoZSAnaWQnIGF0dHJpYnV0ZSBvbiBhIFRl
eHRUcmFjayBtYXRjaGVzIHRoZSB0cmFjayBlbGVtZW50LgorVGVzdHMgdGhhdCB0aGUgVGV4dFRy
YWNrICJpZCIgYXR0cmlidXRlIGlzIGFwcHJvcHJpYXRlbHkgc2V0LgogCiAKLUVYUEVDVEVEICh2
aWRlby50ZXh0VHJhY2tzWzBdLmlkID09ICdUZXN0LUlELTEyMycpIE9LCiAKKysrIFRlc3QgZGVm
YXVsdCBhdHRyaWJ1dGUgdmFsdWUKK0VYUEVDVEVEICh0ZXh0VHJhY2suaWQgPT0gJ0xvcmVtSXBz
dW0nKSBPSworRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbMF0uaWQgPT0gJ0xvcmVtSXBzdW0n
KSBPSworCisrKyBNYWtlIHN1cmUgd2UgY2FuIGxvb2sgdHJhY2tzIHVwIGJ5IGlkCitFWFBFQ1RF
RCAodmlkZW8udGV4dFRyYWNrcy5nZXRUcmFja0J5SWQoJ0xvcmVtSXBzdW0nKSA9PSAnW29iamVj
dCBUZXh0VHJhY2tdJykgT0sKKworKysgVGVzdCB0aGF0IGl0J3MgcmVhZG9ubHkKK1JVTih0ZXh0
VHJhY2suaWQgPSAnbmV3dmFsdWUnOykKK0VYUEVDVEVEICh0ZXh0VHJhY2suaWQgPT0gJ0xvcmVt
SXBzdW0nKSBPSwogRU5EIE9GIFRFU1QKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEv
dHJhY2svdHJhY2staWQuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWlkLmh0
bWwKaW5kZXggZDU1YzQ5ODE3N2YyYjdiYTk0MzBmZGQ5OTk5ZTViYjYxMmI5YmNjNi4uZTg2Y2Fl
MTNjNGI5ZDZmOTcyZGNiYTU3MjE0MzkxY2FjZDkwMDVmOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvbWVkaWEvdHJhY2svdHJhY2staWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS90cmFj
ay90cmFjay1pZC5odG1sCkBAIC0xLDI5ICsxLDQyIEBACiA8IURPQ1RZUEUgaHRtbD4KIDxodG1s
PgogICAgIDxoZWFkPgorCiAgICAgICAgIDxzY3JpcHQgc3JjPS4uL21lZGlhLWZpbGUuanM+PC9z
Y3JpcHQ+CiAgICAgICAgIDxzY3JpcHQgc3JjPS4uL3ZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CiAg
ICAgICAgIDxzY3JpcHQ+CiAKLSAgICAgICAgICAgIGZ1bmN0aW9uIGxvYWRlZCgpCisgICAgICAg
ICAgICB2YXIgdGV4dFRyYWNrOworCisgICAgICAgICAgICBmdW5jdGlvbiBzdGFydCgpCiAgICAg
ICAgICAgICB7CiAgICAgICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOwotICAgICAgICAg
ICAgICAgIHZhciB0cmFja0VsZW1lbnQgPSB2aWRlby5maXJzdEVsZW1lbnRDaGlsZDsKKyAgICAg
ICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworCisgICAgICAgICAgICAgICAgdGV4dFRyYWNr
ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIkxvcmVtSXBzdW0iKS50cmFjazsKIAotICAgICAg
ICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1swXS5pZCIsIHRyYWNrRWxl
bWVudC5pZCk7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8Yj4rKyBUZXN0IGRlZmF1
bHQgYXR0cmlidXRlIHZhbHVlPC9iPiIpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgi
dGV4dFRyYWNrLmlkIiwgIkxvcmVtSXBzdW0iKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0
ZWQoInZpZGVvLnRleHRUcmFja3NbMF0uaWQiLCAiTG9yZW1JcHN1bSIpOworICAgICAgICAgICAg
ICAgIGNvbnNvbGVXcml0ZSgiIik7CiAKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxi
PisrIE1ha2Ugc3VyZSB3ZSBjYW4gbG9vayB0cmFja3MgdXAgYnkgaWQ8L2I+Iik7CisgICAgICAg
ICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzLmdldFRyYWNrQnlJZCgnTG9y
ZW1JcHN1bScpIiwgdGV4dFRyYWNrKTsKICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIp
OworCisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8Yj4rKyBUZXN0IHRoYXQgaXQncyBy
ZWFkb25seTwvYj4iKTsKKyAgICAgICAgICAgICAgICBydW4oInRleHRUcmFjay5pZCA9ICduZXd2
YWx1ZSc7Iik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ0ZXh0VHJhY2suaWQiLCAi
TG9yZW1JcHN1bSIpOworCiAgICAgICAgICAgICAgICAgZW5kVGVzdCgpOwogICAgICAgICAgICAg
fQogCi0gICAgICAgICAgICBzZXRDYXB0aW9uRGlzcGxheU1vZGUoJ0F1dG9tYXRpYycpOwotCiAg
ICAgICAgIDwvc2NyaXB0PgogICAgIDwvaGVhZD4KLSAgICA8Ym9keSBvbmxvYWQ9ImxvYWRlZCgp
Ij4KLSAgICAgICAgPHA+VGVzdHMgdGhhdCB0aGUgJ2lkJyBhdHRyaWJ1dGUgb24gYSBUZXh0VHJh
Y2sgbWF0Y2hlcyB0aGUgdHJhY2sgZWxlbWVudC48L3A+CisgICAgPGJvZHkgb25sb2FkPSJzdGFy
dCgpIj4KKyAgICAgICAgPHA+VGVzdHMgdGhhdCB0aGUgVGV4dFRyYWNrICJpZCIgYXR0cmlidXRl
IGlzIGFwcHJvcHJpYXRlbHkgc2V0LjwvcD4KICAgICAgICAgPHZpZGVvPgotICAgICAgICAgICAg
PHRyYWNrIGlkPSJUZXN0LUlELTEyMyIgc3JjPSJjYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMtZmFz
dC52dHQiPgorICAgICAgICAgICAgPHRyYWNrIGlkPSJMb3JlbUlwc3VtIiBzcmM9ImNhcHRpb25z
LXdlYnZ0dC9jYXB0aW9ucy1mYXN0LnZ0dCI+CiAgICAgICAgIDwvdmlkZW8+CiAgICAgPC9ib2R5
PgogPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>217711</attachid>
            <date>2013-11-22 13:04:26 -0800</date>
            <delta_ts>2013-11-22 13:41:55 -0800</delta_ts>
            <desc>Fix nits</desc>
            <filename>bug-124785-20131122150425.patch</filename>
            <type>text/plain</type>
            <size>6854</size>
            <attacher name="Brendan Long">b.long</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyYjUzYzk0NzIwY2E5
YmYwNmVjZmZjYWQ3NGE2OGI5YjcwYTQxNS4uYTJlZDAzZWE5NzE3ODBmNjU0NDkzNjNhYjhlNzk5
OWI3OTBhODkzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTExLTIyICBCcmVu
ZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAgICBBZGQgVGV4dFRyYWNr
TGlzdDo6Z2V0VHJhY2tCeUlkKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xMjQ3ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBUZXN0OiBtZWRpYS90cmFjay90cmFjay1pZC5odG1sCisKKyAgICAgICAg
KiBodG1sL3RyYWNrL1RleHRUcmFja0xpc3QuY3BwOiBBZGQgZ2V0VHJhY2tCeUlkKCkKKyAgICAg
ICAgKFRleHRUcmFja0xpc3Q6OmdldFRyYWNrQnlJZCk6CisgICAgICAgICogaHRtbC90cmFjay9U
ZXh0VHJhY2tMaXN0Lmg6IFNhbWUuCisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0
LmlkbDogU2FtZS4KKwogMjAxMy0xMS0yMiAgQW5kcmVzIEdvbWV6ICA8YWdvbWV6QGlnYWxpYS5j
b20+CiAKICAgICAgICAgU2V2ZXJhbCBtaXNzaW5nL2luY29ycmVjdCBndWFyZHMgZm9yIExPR19E
SVNBQkxFRD0wIGFnYWluc3QgUmVsZWFzZSBidWlsZCAoTWFjKQpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0
bWwvdHJhY2svVGV4dFRyYWNrTGlzdC5jcHAKaW5kZXggNGE5YWExOThmMzUyNWM0NmNkNTAxODI2
ZDhhZDhiYTk3NzBkMTczOC4uMThkM2YxYmFiZDNjMWYxNjQ0NjNmZGJiMzIyOGFhNWRiYmUzM2Jh
NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0LmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuY3BwCkBAIC0x
MjcsNiArMTI3LDIyIEBAIFRleHRUcmFjayogVGV4dFRyYWNrTGlzdDo6aXRlbSh1bnNpZ25lZCBp
bmRleCkgY29uc3QKICAgICByZXR1cm4gMDsKIH0KIAorVGV4dFRyYWNrKiBUZXh0VHJhY2tMaXN0
OjpnZXRUcmFja0J5SWQoY29uc3QgQXRvbWljU3RyaW5nJiBpZCkKK3sKKyAgICAvLyA0LjguMTAu
MTIuNSBUZXh0IHRyYWNrIEFQSQorICAgIC8vIFRoZSBnZXRUcmFja0J5SWQoaWQpIG1ldGhvZCBt
dXN0IHJldHVybiB0aGUgZmlyc3QgVGV4dFRyYWNrIGluIHRoZQorICAgIC8vIFRleHRUcmFja0xp
c3Qgb2JqZWN0IHdob3NlIGlkIElETCBhdHRyaWJ1dGUgd291bGQgcmV0dXJuIGEgdmFsdWUgZXF1
YWwKKyAgICAvLyB0byB0aGUgdmFsdWUgb2YgdGhlIGlkIGFyZ3VtZW50LgorICAgIGZvciAodW5z
aWduZWQgaSA9IDA7IGkgPCBsZW5ndGgoKTsgKytpKSB7CisgICAgICAgIFRleHRUcmFjayogdHJh
Y2sgPSBpdGVtKGkpOworICAgICAgICBpZiAodHJhY2stPmlkKCkgPT0gaWQpCisgICAgICAgICAg
ICByZXR1cm4gdHJhY2s7CisgICAgfQorCisgICAgLy8gV2hlbiBubyB0cmFja3MgbWF0Y2ggdGhl
IGdpdmVuIGFyZ3VtZW50LCB0aGUgbWV0aG9kIG11c3QgcmV0dXJuIG51bGwuCisgICAgcmV0dXJu
IG51bGxwdHI7Cit9CisKIHZvaWQgVGV4dFRyYWNrTGlzdDo6aW52YWxpZGF0ZVRyYWNrSW5kZXhl
c0FmdGVyVHJhY2soVGV4dFRyYWNrKiB0cmFjaykKIHsKICAgICBWZWN0b3I8UmVmUHRyPFRyYWNr
QmFzZT4+KiB0cmFja3MgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFj
ay9UZXh0VHJhY2tMaXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xp
c3QuaAppbmRleCBkOWQ4OWY3OTZlNzM4NDc1NjdlMDkzMjQ4YWQ5NGMzNDcxYTY4ZWM5Li5jZmNk
NmI0ODY4NjM0OTY3NzZkOTljMTgyNWJhNTQ3NTdlMDkxY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o
dG1sL3RyYWNrL1RleHRUcmFja0xpc3QuaApAQCAtNDgsNiArNDgsNyBAQCBwdWJsaWM6CiAgICAg
dmlydHVhbCBib29sIGNvbnRhaW5zKFRyYWNrQmFzZSopIGNvbnN0IE9WRVJSSURFOwogCiAgICAg
VGV4dFRyYWNrKiBpdGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdDsKKyAgICBUZXh0VHJhY2sqIGdl
dFRyYWNrQnlJZChjb25zdCBBdG9taWNTdHJpbmcmKTsKICAgICBUZXh0VHJhY2sqIGxhc3RJdGVt
KCkgY29uc3QgeyByZXR1cm4gaXRlbShsZW5ndGgoKSAtIDEpOyB9CiAKICAgICB2b2lkIGFwcGVu
ZChQYXNzUmVmUHRyPFRleHRUcmFjaz4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt
bC90cmFjay9UZXh0VHJhY2tMaXN0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4
dFRyYWNrTGlzdC5pZGwKaW5kZXggOTZkMjNlYjc1NDMxNWVlODVmNTZlZWUwNjI1ZjM5NjE4MWJk
OGIxZS4uMWM3ODdjNGE0YTBkNDhmZjdmOTkxODc2ZWMyZTE2YzQ5NzM4ZDNlYSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tMaXN0LmlkbAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuaWRsCkBAIC0zMSw2ICszMSw3IEBA
CiBdIGludGVyZmFjZSBUZXh0VHJhY2tMaXN0IHsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5z
aWduZWQgbG9uZyBsZW5ndGg7CiAgICAgZ2V0dGVyIFRleHRUcmFjayBpdGVtKHVuc2lnbmVkIGxv
bmcgaW5kZXgpOworICAgIFRleHRUcmFjayBnZXRUcmFja0J5SWQoRE9NU3RyaW5nIGlkKTsKIAog
ICAgIGF0dHJpYnV0ZSBFdmVudExpc3RlbmVyIG9uYWRkdHJhY2s7CiAgICAgYXR0cmlidXRlIEV2
ZW50TGlzdGVuZXIgb25yZW1vdmV0cmFjazsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlM2ZjMjJkMzFhZmU2NDE5ZTFkYWI0
N2FiMWUyMTRmNGYwNmM2MzhiLi42Y2Y1ZTU2ZDQxNDNiMzA5MDkwYjU3MzZkMjZiOTQ3Yzg2Mzhl
M2NhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMTEtMjIgIEJyZW5kYW4gTG9uZyAgPGIu
bG9uZ0BjYWJsZWxhYnMuY29tPgorCisgICAgICAgIEFkZCBUZXh0VHJhY2tMaXN0OjpnZXRUcmFj
a0J5SWQoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTEyNDc4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFVwZGF0ZSB0aGlzIHRlc3QgdG8gbWFrZSBpdCBtb3JlIGludGVyZXN0aW5nLiBJdCBub3cgY2hl
Y2tzIHRoYXQgdGhlICJpZCIKKyAgICAgICAgY2hhbmdlcyB3aGVuIHRoZSA8dHJhY2s+IGlkIGNo
YW5nZXMsIG1ha2VzIHN1cmUgVGV4dFRyYWNrOjppZCBpcyByZWFkb25seSwKKyAgICAgICAgYW5k
IGxvb2tzIHRoZSB0cmFjayB1cCBieSBpZCB3aXRoIGdldFRyYWNrQnlJZCgpLgorCisgICAgICAg
ICogbWVkaWEvdHJhY2svdHJhY2staWQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3Ry
YWNrL3RyYWNrLWlkLmh0bWw6CisKIDIwMTMtMTEtMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxh
cEBhcHBsZS5jb20+CiAKICAgICAgICAgTGF5b3V0IFRlc3QgZWRpdGluZy9kZWxldGluZy9wYXNz
d29yZC1kZWxldGUtcGVyZm9ybWFuY2UuaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1pZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9t
ZWRpYS90cmFjay90cmFjay1pZC1leHBlY3RlZC50eHQKaW5kZXggYWZjYTY1MjA2YjQ0YjNmYWZi
MmI4ZmI2ZDQ1MWQzMTEzNmI1NDUyMy4uMzQyMGJiYTNlZDM3MjY5OWJkYjAyZWY3YTJhOGFiY2Zi
MzY5MGViMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2staWQtZXhw
ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWlkLWV4cGVjdGVk
LnR4dApAQCAtMSw3ICsxLDE2IEBACi1UZXN0cyB0aGF0IHRoZSAnaWQnIGF0dHJpYnV0ZSBvbiBh
IFRleHRUcmFjayBtYXRjaGVzIHRoZSB0cmFjayBlbGVtZW50LgorVGVzdHMgdGhhdCB0aGUgVGV4
dFRyYWNrICJpZCIgYXR0cmlidXRlIGlzIGFwcHJvcHJpYXRlbHkgc2V0LgogCiAKLUVYUEVDVEVE
ICh2aWRlby50ZXh0VHJhY2tzWzBdLmlkID09ICdUZXN0LUlELTEyMycpIE9LCiAKKysrIFRlc3Qg
ZGVmYXVsdCBhdHRyaWJ1dGUgdmFsdWUKK0VYUEVDVEVEICh0ZXh0VHJhY2suaWQgPT0gJ0xvcmVt
SXBzdW0nKSBPSworRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbMF0uaWQgPT0gJ0xvcmVtSXBz
dW0nKSBPSworCisrKyBNYWtlIHN1cmUgd2UgY2FuIGxvb2sgdHJhY2tzIHVwIGJ5IGlkCitFWFBF
Q1RFRCAodmlkZW8udGV4dFRyYWNrcy5nZXRUcmFja0J5SWQoJ0xvcmVtSXBzdW0nKSA9PSAnW29i
amVjdCBUZXh0VHJhY2tdJykgT0sKKworKysgVGVzdCB0aGF0IGl0J3MgcmVhZG9ubHkKK1JVTih0
ZXh0VHJhY2suaWQgPSAnbmV3dmFsdWUnOykKK0VYUEVDVEVEICh0ZXh0VHJhY2suaWQgPT0gJ0xv
cmVtSXBzdW0nKSBPSwogRU5EIE9GIFRFU1QKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVk
aWEvdHJhY2svdHJhY2staWQuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWlk
Lmh0bWwKaW5kZXggZDU1YzQ5ODE3N2YyYjdiYTk0MzBmZGQ5OTk5ZTViYjYxMmI5YmNjNi4uZTg2
Y2FlMTNjNGI5ZDZmOTcyZGNiYTU3MjE0MzkxY2FjZDkwMDVmOSAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvbWVkaWEvdHJhY2svdHJhY2staWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS90
cmFjay90cmFjay1pZC5odG1sCkBAIC0xLDI5ICsxLDQyIEBACiA8IURPQ1RZUEUgaHRtbD4KIDxo
dG1sPgogICAgIDxoZWFkPgorCiAgICAgICAgIDxzY3JpcHQgc3JjPS4uL21lZGlhLWZpbGUuanM+
PC9zY3JpcHQ+CiAgICAgICAgIDxzY3JpcHQgc3JjPS4uL3ZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+
CiAgICAgICAgIDxzY3JpcHQ+CiAKLSAgICAgICAgICAgIGZ1bmN0aW9uIGxvYWRlZCgpCisgICAg
ICAgICAgICB2YXIgdGV4dFRyYWNrOworCisgICAgICAgICAgICBmdW5jdGlvbiBzdGFydCgpCiAg
ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOwotICAgICAg
ICAgICAgICAgIHZhciB0cmFja0VsZW1lbnQgPSB2aWRlby5maXJzdEVsZW1lbnRDaGlsZDsKKyAg
ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworCisgICAgICAgICAgICAgICAgdGV4dFRy
YWNrID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIkxvcmVtSXBzdW0iKS50cmFjazsKIAotICAg
ICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1swXS5pZCIsIHRyYWNr
RWxlbWVudC5pZCk7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8Yj4rKyBUZXN0IGRl
ZmF1bHQgYXR0cmlidXRlIHZhbHVlPC9iPiIpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3Rl
ZCgidGV4dFRyYWNrLmlkIiwgIkxvcmVtSXBzdW0iKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhw
ZWN0ZWQoInZpZGVvLnRleHRUcmFja3NbMF0uaWQiLCAiTG9yZW1JcHN1bSIpOworICAgICAgICAg
ICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CiAKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUo
IjxiPisrIE1ha2Ugc3VyZSB3ZSBjYW4gbG9vayB0cmFja3MgdXAgYnkgaWQ8L2I+Iik7CisgICAg
ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzLmdldFRyYWNrQnlJZCgn
TG9yZW1JcHN1bScpIiwgdGV4dFRyYWNrKTsKICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUo
IiIpOworCisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8Yj4rKyBUZXN0IHRoYXQgaXQn
cyByZWFkb25seTwvYj4iKTsKKyAgICAgICAgICAgICAgICBydW4oInRleHRUcmFjay5pZCA9ICdu
ZXd2YWx1ZSc7Iik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ0ZXh0VHJhY2suaWQi
LCAiTG9yZW1JcHN1bSIpOworCiAgICAgICAgICAgICAgICAgZW5kVGVzdCgpOwogICAgICAgICAg
ICAgfQogCi0gICAgICAgICAgICBzZXRDYXB0aW9uRGlzcGxheU1vZGUoJ0F1dG9tYXRpYycpOwot
CiAgICAgICAgIDwvc2NyaXB0PgogICAgIDwvaGVhZD4KLSAgICA8Ym9keSBvbmxvYWQ9ImxvYWRl
ZCgpIj4KLSAgICAgICAgPHA+VGVzdHMgdGhhdCB0aGUgJ2lkJyBhdHRyaWJ1dGUgb24gYSBUZXh0
VHJhY2sgbWF0Y2hlcyB0aGUgdHJhY2sgZWxlbWVudC48L3A+CisgICAgPGJvZHkgb25sb2FkPSJz
dGFydCgpIj4KKyAgICAgICAgPHA+VGVzdHMgdGhhdCB0aGUgVGV4dFRyYWNrICJpZCIgYXR0cmli
dXRlIGlzIGFwcHJvcHJpYXRlbHkgc2V0LjwvcD4KICAgICAgICAgPHZpZGVvPgotICAgICAgICAg
ICAgPHRyYWNrIGlkPSJUZXN0LUlELTEyMyIgc3JjPSJjYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMt
ZmFzdC52dHQiPgorICAgICAgICAgICAgPHRyYWNrIGlkPSJMb3JlbUlwc3VtIiBzcmM9ImNhcHRp
b25zLXdlYnZ0dC9jYXB0aW9ucy1mYXN0LnZ0dCI+CiAgICAgICAgIDwvdmlkZW8+CiAgICAgPC9i
b2R5PgogPC9odG1sPgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>