<?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>84208</bug_id>
          
          <creation_ts>2012-04-17 16:31:28 -0700</creation_ts>
          <short_desc>[Chromium] IndexedDB: Prep for changing keyPath return type</short_desc>
          <delta_ts>2012-04-19 17:58:33 -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>New Bugs</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="Joshua Bell">jsbell</reporter>
          <assigned_to name="Joshua Bell">jsbell</assigned_to>
          <cc>abarth</cc>
    
    <cc>alecflett</cc>
    
    <cc>dglazkov</cc>
    
    <cc>dgrogan</cc>
    
    <cc>fishd</cc>
    
    <cc>jamesr</cc>
    
    <cc>tkent+wkapi</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>604463</commentid>
    <comment_count>0</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-04-17 16:31:28 -0700</bug_when>
    <thetext>[Chromium] IndexedDB: Prep for changing keyPath return type</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>604465</commentid>
    <comment_count>1</comment_count>
      <attachid>137631</attachid>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-04-17 16:34:34 -0700</bug_when>
    <thetext>Created attachment 137631
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>604472</commentid>
    <comment_count>2</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-04-17 16:39:52 -0700</bug_when>
    <thetext>Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>604477</commentid>
    <comment_count>3</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-04-17 16:44:58 -0700</bug_when>
    <thetext>FYI, the Chromium side is at: https://chromiumcodereview.appspot.com/10041014

This will end up being a 5-part patch:
(1) WebKit prep: keyPath -&gt; keyPathString rename
(2) Chromium prep: keyPath -&gt; keyPathString rename
(3) WebKit API change: WebIDBKeyPath type addition to the API, with compat shims
(4) Chromium use of the new API
(5) implementation in WebCore of the new IDB functionality (and drop shims)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>604545</commentid>
    <comment_count>4</comment_count>
      <attachid>137631</attachid>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2012-04-17 18:44:16 -0700</bug_when>
    <thetext>Comment on attachment 137631
Patch

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

LGTM

&gt; Source/WebKit/chromium/src/WebIDBIndexImpl.h:48
&gt; +    virtual WebString keyPathString() const OVERRIDE;

You probably already know, but you can leave off the OVERRIDEs for WebKit API overrides if they make commit engineering difficult.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>604546</commentid>
    <comment_count>5</comment_count>
      <attachid>137631</attachid>
    <who name="James Robinson">jamesr</who>
    <bug_when>2012-04-17 18:46:55 -0700</bug_when>
    <thetext>Comment on attachment 137631
Patch

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

&gt; Source/WebKit/chromium/public/WebIDBIndex.h:2
&gt; + * Copyright (C) 2012 Google Inc. All rights reserved.

we don&apos;t do this in WebKit. leave the date alone

&gt;&gt; Source/WebKit/chromium/src/WebIDBIndexImpl.h:48
&gt;&gt; +    virtual WebString keyPathString() const OVERRIDE;
&gt; 
&gt; You probably already know, but you can leave off the OVERRIDEs for WebKit API overrides if they make commit engineering difficult.

we typically don&apos;t use OVERRIDE for things in the WebKit API.  The hard rule is that if the declaration you are overriding is in a different repository, do not use OVERRIDE cos it&apos;ll make staging changes difficult. In this case, keyPathString() is in the same repo so that shouldn&apos;t be an issue - but we also say to favor consistency, which would be a strike against using OVERRIDE here.  So on balance I think you should not add OVERRIDE here unless you want to do it everywhere</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>604837</commentid>
    <comment_count>6</comment_count>
      <attachid>137714</attachid>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-04-18 09:51:45 -0700</bug_when>
    <thetext>Created attachment 137714
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>604838</commentid>
    <comment_count>7</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-04-18 09:52:42 -0700</bug_when>
    <thetext>Oops, thanks. So eager to be done I was dotting t&apos;s and crossing i&apos;s. :)

Take another look?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>605082</commentid>
    <comment_count>8</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-04-18 14:21:24 -0700</bug_when>
    <thetext>@abarth or @fishd - can you take a look?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>605146</commentid>
    <comment_count>9</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-04-18 15:22:07 -0700</bug_when>
    <thetext>or dglazkov@ ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>606107</commentid>
    <comment_count>10</comment_count>
      <attachid>137714</attachid>
    <who name="Kent Tamura">tkent</who>
    <bug_when>2012-04-19 16:21:03 -0700</bug_when>
    <thetext>Comment on attachment 137714
Patch

ok</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>606244</commentid>
    <comment_count>11</comment_count>
      <attachid>137714</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-04-19 17:58:28 -0700</bug_when>
    <thetext>Comment on attachment 137714
Patch

Clearing flags on attachment: 137714

Committed r114708: &lt;http://trac.webkit.org/changeset/114708&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>606245</commentid>
    <comment_count>12</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-04-19 17:58:33 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>137631</attachid>
            <date>2012-04-17 16:34:34 -0700</date>
            <delta_ts>2012-04-18 09:51:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-84208-20120417163433.patch</filename>
            <type>text/plain</type>
            <size>6947</size>
            <attacher name="Joshua Bell">jsbell</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No
cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4
IDA0YWM1YjljNjNiNmQyNjMwNGVlNWUzNGVkZjgyZDExMGNkMmNkZGMuLjhhYTRiMzcwMDY5OWQx
Nzc2MGU5YmY0Y2M5ZDkzNWYyMjMzMjNjNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMzAgQEAKKzIwMTItMDQtMTcgIEpvc2h1YSBCZWxsICA8anNiZWxsQGNocm9taXVt
Lm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEluZGV4ZWREQjogUHJlcCBmb3IgY2hhbmdpbmcg
a2V5UGF0aCByZXR1cm4gdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9ODQyMDgKKworICAgICAgICBUbyBpbnRyb2R1Y2UgQXJyYXktdHlwZSBrZXkg
cGF0aHMgKHNlZSBodHRwOi8vd2Via2l0Lm9yZy9iLzg0MjA3KSB0aGUga2V5UGF0aCgpIGFjY2Vz
c29ycyAKKyAgICAgICAgb24gV2ViSURCT2JqZWN0U3RvcmUgYW5kIFdlYklEQkluZGV4IG5lZWQg
dG8gY2hhbmdlIHJldHVybiB0eXBlLiBUbyBkbyBzbyByZXF1aXJlcyB0ZW1wb3JhcmlseQorICAg
ICAgICBjaGFuZ2luZyB0aGUgbWV0aG9kIG5hbWVzIHRvIGtleVBhdGhTdHJpbmcgd2l0aCBjb21w
YXRpYmlsaXR5IHNoaW1zIChvbiB0aGUgV2ViS2l0IHNpZGUpCisgICAgICAgIHRoZW4gc3dpdGNo
aW5nIHRoZSBpbXBsZW1lbnRhdGlvbiBpbiB0aGUgQ2hyb21pdW0gcG9ydCBpbiBhIGZvbGxvdy11
cCBwYXRjaC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIHB1YmxpYy9XZWJJREJJbmRleC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJJbmRleDo6
a2V5UGF0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4OjprZXlQYXRoU3RyaW5nKToK
KyAgICAgICAgKiBwdWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaDoKKyAgICAgICAgKFdlYktpdDo6
V2ViSURCT2JqZWN0U3RvcmU6OmtleVBhdGgpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJPYmpl
Y3RTdG9yZTo6a2V5UGF0aFN0cmluZyk6CisgICAgICAgICogc3JjL1dlYklEQkluZGV4SW1wbC5j
cHA6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4SW1wbDo6a2V5UGF0aFN0cmluZyk6Cisg
ICAgICAgICogc3JjL1dlYklEQkluZGV4SW1wbC5oOgorICAgICAgICAoV2ViSURCSW5kZXhJbXBs
KToKKyAgICAgICAgKiBzcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNwcDoKKyAgICAgICAgKFdl
YktpdDo6V2ViSURCT2JqZWN0U3RvcmVJbXBsOjprZXlQYXRoU3RyaW5nKToKKyAgICAgICAgKiBz
cmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmg6CisgICAgICAgIChXZWJJREJPYmplY3RTdG9yZUlt
cGwpOgorCiAyMDEyLTA0LTE1ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgog
CiAgICAgICAgIEludHJvZHVjZSBNZW51SXRlbUlEIHRvIGF1dG9maWxsIHBvcHVwCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJJbmRleC5oIGIvU291cmNl
L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCSW5kZXguaAppbmRleCBiN2Y1MjZkNzYzYjVm
ZjJjYjNmYmRiZTUwNWUwODU5NTQwZDlmOTJmLi41MGY4YTEwNGI0OTJmZDc1ZDViOWRmYjRjMjBk
OTJmZGJiNjExM2I1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X
ZWJJREJJbmRleC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQklu
ZGV4LmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwIEdvb2dsZSBJ
bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIElu
Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu
IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv
biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpA
QCAtNTMsNiArNTMsMTIgQEAgcHVibGljOgogICAgIH0KICAgICB2aXJ0dWFsIFdlYlN0cmluZyBr
ZXlQYXRoKCkgY29uc3QKICAgICB7CisgICAgICAgIHJldHVybiBrZXlQYXRoU3RyaW5nKCk7Cisg
ICAgfQorICAgIHZpcnR1YWwgV2ViU3RyaW5nIGtleVBhdGhTdHJpbmcoKSBjb25zdAorICAgIHsK
KyAgICAgICAgLy8gRklYTUU6IFRlbXBvcmFyeSB0byBhbGxvdyBrZXlQYXRoKCkncyByZXR1cm4g
dHlwZSB0byBjaGFuZ2UuCisgICAgICAgIC8vIGh0dHA6Ly93ZWJraXQub3JnL2IvODQyMDcKICAg
ICAgICAgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gV2ViU3Ry
aW5nKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv
V2ViSURCT2JqZWN0U3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklE
Qk9iamVjdFN0b3JlLmgKaW5kZXggY2M0MWI5YWM0NTU5MWI4MWIzZjI1ZjNkOWE0ODZkYjFlZTE4
MTdlZS4uNzgxN2YxYjAyMGI3OThhZGRhMTJhNDMxZWY0ZjgzZGU0MGZmNDFiNSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaAorKysg
Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5oCkBAIC0x
LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmln
aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdo
dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k
IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt
aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTUwLDYgKzUw
LDEyIEBAIHB1YmxpYzoKICAgICB9CiAgICAgdmlydHVhbCBXZWJTdHJpbmcga2V5UGF0aCgpIGNv
bnN0CiAgICAgeworICAgICAgICByZXR1cm4ga2V5UGF0aFN0cmluZygpOworICAgIH0KKyAgICB2
aXJ0dWFsIFdlYlN0cmluZyBrZXlQYXRoU3RyaW5nKCkgY29uc3QKKyAgICB7CisgICAgICAgIC8v
IEZJWE1FOiBUZW1wb3JhcnkgdG8gYWxsb3cga2V5UGF0aCgpJ3MgcmV0dXJuIHR5cGUgdG8gY2hh
bmdlLgorICAgICAgICAvLyBodHRwOi8vd2Via2l0Lm9yZy9iLzg0MjA3CiAgICAgICAgIFdFQktJ
VF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIFdlYlN0cmluZygpOwogICAg
IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1w
bC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuY3BwCmlu
ZGV4IDcxMGUzMDBmOWQ4NTliNWZlNWM2NmY5ZWY0ZmUzYmM1MGZhNThlMWYuLjBlMDRhYTY4ODNk
ZDY5YzdhNWM1YWE0ZDVmOGMyNTU1MjBkZjJhYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9zcmMvV2ViSURCSW5kZXhJbXBsLmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5
cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly
aWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl
ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig
d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl
IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01OCw3ICs1OCw3IEBAIFdlYlN0cmluZyBXZWJJREJJ
bmRleEltcGw6OnN0b3JlTmFtZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fYmFja2VuZC0+c3RvcmVO
YW1lKCk7CiB9CiAKLVdlYlN0cmluZyBXZWJJREJJbmRleEltcGw6OmtleVBhdGgoKSBjb25zdAor
V2ViU3RyaW5nIFdlYklEQkluZGV4SW1wbDo6a2V5UGF0aFN0cmluZygpIGNvbnN0CiB7CiAgICAg
cmV0dXJuIG1fYmFja2VuZC0+a2V5UGF0aCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9jaHJvbWl1bS9zcmMvV2ViSURCSW5kZXhJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt
L3NyYy9XZWJJREJJbmRleEltcGwuaAppbmRleCAyMjZmZWI4ZTMwMWYzMTc3NTEwOGYzNDc1ZThm
M2M5YmQyNmZkNjVlLi5jZmQzZTc4N2U3ZjNlOWRhYThhM2I4OTQ1NjhjYzQ0NGZiNjM4NjkzIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuaAor
KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuaApAQCAtMSw1
ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0
cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRz
IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi
aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0
dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00NSw3ICs0NSw3
IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgV2ViU3RyaW5nIG5hbWUoKSBjb25zdDsKICAgICB2
aXJ0dWFsIFdlYlN0cmluZyBzdG9yZU5hbWUoKSBjb25zdDsKLSAgICB2aXJ0dWFsIFdlYlN0cmlu
ZyBrZXlQYXRoKCkgY29uc3Q7CisgICAgdmlydHVhbCBXZWJTdHJpbmcga2V5UGF0aFN0cmluZygp
IGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCB1bmlxdWUoKSBjb25zdDsKICAgICB2
aXJ0dWFsIGJvb2wgbXVsdGlFbnRyeSgpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuY3BwIGIvU291cmNlL1dlYktp
dC9jaHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNwcAppbmRleCBhYmRlZTQ1N2E0
OGE2Mjk1ZWNhZmI2NTVmYjUzNTZiNDZhYzc5NjEwLi43MzhkZjQ1OWIyOTE5ZmE4OTkwYzQwMzJk
Y2Q2ZDg0ZTY3ZGM2MTAyIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X
ZWJJREJPYmplY3RTdG9yZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj
L1dlYklEQk9iamVjdFN0b3JlSW1wbC5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp
Z2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln
aHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp
c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp
dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm
b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNTcsNyArNTcsNyBAQCBXZWJTdHJpbmcgV2ViSURCT2Jq
ZWN0U3RvcmVJbXBsOjpuYW1lKCkgY29uc3QKICAgICByZXR1cm4gbV9vYmplY3RTdG9yZS0+bmFt
ZSgpOwogfQogCi1XZWJTdHJpbmcgV2ViSURCT2JqZWN0U3RvcmVJbXBsOjprZXlQYXRoKCkgY29u
c3QKK1dlYlN0cmluZyBXZWJJREJPYmplY3RTdG9yZUltcGw6OmtleVBhdGhTdHJpbmcoKSBjb25z
dAogewogICAgIHJldHVybiBtX29iamVjdFN0b3JlLT5rZXlQYXRoKCk7CiB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuaCBiL1Nv
dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQk9iamVjdFN0b3JlSW1wbC5oCmluZGV4IDc2
NGQ3YWZkMzZjNGE0MmEzNDNmYWU0ZmZlZThmOWY4YWUwYjc1ZDkuLjk5ZmYwZTBiZjM2MjhlMzEy
OWY3NzY3MTVhMGJlYWUxOTQxZmFlYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vc3JjL1dlYklEQk9iamVjdFN0b3JlSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vc3JjL1dlYklEQk9iamVjdFN0b3JlSW1wbC5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv
cHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w
eXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog
UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv
ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0
aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ2LDcgKzQ2LDcgQEAgcHVibGljOgogICAgIH5X
ZWJJREJPYmplY3RTdG9yZUltcGwoKTsKIAogICAgIFdlYlN0cmluZyBuYW1lKCkgY29uc3Q7Ci0g
ICAgV2ViU3RyaW5nIGtleVBhdGgoKSBjb25zdDsKKyAgICBXZWJTdHJpbmcga2V5UGF0aFN0cmlu
ZygpIGNvbnN0IE9WRVJSSURFOwogICAgIFdlYkRPTVN0cmluZ0xpc3QgaW5kZXhOYW1lcygpIGNv
bnN0OwogCiAgICAgdm9pZCBnZXQoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNr
cyosIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiwgV2ViRXhjZXB0aW9uQ29kZSYpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>137714</attachid>
            <date>2012-04-18 09:51:45 -0700</date>
            <delta_ts>2012-04-19 17:58:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-84208-20120418095144.patch</filename>
            <type>text/plain</type>
            <size>5260</size>
            <attacher name="Joshua Bell">jsbell</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No
cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4
IDA0YWM1YjljNjNiNmQyNjMwNGVlNWUzNGVkZjgyZDExMGNkMmNkZGMuLmYzMDFjZWU0NzE1NzEw
NTE0NWQ5ODYyYmY5YzdkNDhkMDQ5MDIyNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMzAgQEAKKzIwMTItMDQtMTcgIEpvc2h1YSBCZWxsICA8anNiZWxsQGNocm9taXVt
Lm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEluZGV4ZWREQjogUHJlcCBmb3IgY2hhbmdpbmcg
a2V5UGF0aCByZXR1cm4gdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9ODQyMDgKKworICAgICAgICBUbyBpbnRyb2R1Y2UgQXJyYXktdHlwZSBrZXkg
cGF0aHMgKHNlZSBodHRwOi8vd2Via2l0Lm9yZy9iLzg0MjA3KSB0aGUga2V5UGF0aCgpIGFjY2Vz
c29ycworICAgICAgICBvbiBXZWJJREJPYmplY3RTdG9yZSBhbmQgV2ViSURCSW5kZXggbmVlZCB0
byBjaGFuZ2UgcmV0dXJuIHR5cGUuIFRvIGRvIHNvIHJlcXVpcmVzIHRlbXBvcmFyaWx5CisgICAg
ICAgIGNoYW5naW5nIHRoZSBtZXRob2QgbmFtZXMgdG8ga2V5UGF0aFN0cmluZyB3aXRoIGNvbXBh
dGliaWxpdHkgc2hpbXMgKG9uIHRoZSBXZWJLaXQgc2lkZSkKKyAgICAgICAgdGhlbiBzd2l0Y2hp
bmcgdGhlIGltcGxlbWVudGF0aW9uIGluIHRoZSBDaHJvbWl1bSBwb3J0IGluIGEgZm9sbG93LXVw
IHBhdGNoLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogcHVibGljL1dlYklEQkluZGV4Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYklEQkluZGV4Ojpr
ZXlQYXRoKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCSW5kZXg6OmtleVBhdGhTdHJpbmcpOgor
ICAgICAgICAqIHB1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5oOgorICAgICAgICAoV2ViS2l0OjpX
ZWJJREJPYmplY3RTdG9yZTo6a2V5UGF0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQk9iamVj
dFN0b3JlOjprZXlQYXRoU3RyaW5nKToKKyAgICAgICAgKiBzcmMvV2ViSURCSW5kZXhJbXBsLmNw
cDoKKyAgICAgICAgKFdlYktpdDo6V2ViSURCSW5kZXhJbXBsOjprZXlQYXRoU3RyaW5nKToKKyAg
ICAgICAgKiBzcmMvV2ViSURCSW5kZXhJbXBsLmg6CisgICAgICAgIChXZWJJREJJbmRleEltcGwp
OgorICAgICAgICAqIHNyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuY3BwOgorICAgICAgICAoV2Vi
S2l0OjpXZWJJREJPYmplY3RTdG9yZUltcGw6OmtleVBhdGhTdHJpbmcpOgorICAgICAgICAqIHNy
Yy9XZWJJREJPYmplY3RTdG9yZUltcGwuaDoKKyAgICAgICAgKFdlYklEQk9iamVjdFN0b3JlSW1w
bCk6CisKIDIwMTItMDQtMTUgIEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAK
ICAgICAgICAgSW50cm9kdWNlIE1lbnVJdGVtSUQgdG8gYXV0b2ZpbGwgcG9wdXAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkluZGV4LmggYi9Tb3VyY2Uv
V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJJbmRleC5oCmluZGV4IGI3ZjUyNmQ3NjNiNWZm
MmNiM2ZiZGJlNTA1ZTA4NTk1NDBkOWY5MmYuLjM3ZWRjY2U5NmMxNDAzNDdhM2M4MDdhMjg1Mjk1
ODUzMThiMTdiNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl
YklEQkluZGV4LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCSW5k
ZXguaApAQCAtNTMsNiArNTMsMTIgQEAgcHVibGljOgogICAgIH0KICAgICB2aXJ0dWFsIFdlYlN0
cmluZyBrZXlQYXRoKCkgY29uc3QKICAgICB7CisgICAgICAgIHJldHVybiBrZXlQYXRoU3RyaW5n
KCk7CisgICAgfQorICAgIHZpcnR1YWwgV2ViU3RyaW5nIGtleVBhdGhTdHJpbmcoKSBjb25zdAor
ICAgIHsKKyAgICAgICAgLy8gRklYTUU6IFRlbXBvcmFyeSB0byBhbGxvdyBrZXlQYXRoKCkncyBy
ZXR1cm4gdHlwZSB0byBjaGFuZ2UuCisgICAgICAgIC8vIGh0dHA6Ly93ZWJraXQub3JnL2IvODQy
MDcKICAgICAgICAgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4g
V2ViU3RyaW5nKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w
dWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj
L1dlYklEQk9iamVjdFN0b3JlLmgKaW5kZXggY2M0MWI5YWM0NTU5MWI4MWIzZjI1ZjNkOWE0ODZk
YjFlZTE4MTdlZS4uZTI2ZGY1NjdiZTE4OTJhMzlmNDIyZTU0ODQwZDA3NmMzNDlhNWJjMCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCT2JqZWN0U3RvcmUu
aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5o
CkBAIC01MCw2ICs1MCwxMiBAQCBwdWJsaWM6CiAgICAgfQogICAgIHZpcnR1YWwgV2ViU3RyaW5n
IGtleVBhdGgoKSBjb25zdAogICAgIHsKKyAgICAgICAgcmV0dXJuIGtleVBhdGhTdHJpbmcoKTsK
KyAgICB9CisgICAgdmlydHVhbCBXZWJTdHJpbmcga2V5UGF0aFN0cmluZygpIGNvbnN0CisgICAg
eworICAgICAgICAvLyBGSVhNRTogVGVtcG9yYXJ5IHRvIGFsbG93IGtleVBhdGgoKSdzIHJldHVy
biB0eXBlIHRvIGNoYW5nZS4KKyAgICAgICAgLy8gaHR0cDovL3dlYmtpdC5vcmcvYi84NDIwNwog
ICAgICAgICBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBXZWJT
dHJpbmcoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X
ZWJJREJJbmRleEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCSW5k
ZXhJbXBsLmNwcAppbmRleCA3MTBlMzAwZjlkODU5YjVmZTVjNjZmOWVmNGZlM2JjNTBmYTU4ZTFm
Li5mMTRiYzEwZjgxZGQ3NmEyMjllOTQ2MGVlMTMyMzVlMTc5MTYwYzVkIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuY3BwCisrKyBiL1NvdXJj
ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1wbC5jcHAKQEAgLTU4LDcgKzU4LDcg
QEAgV2ViU3RyaW5nIFdlYklEQkluZGV4SW1wbDo6c3RvcmVOYW1lKCkgY29uc3QKICAgICByZXR1
cm4gbV9iYWNrZW5kLT5zdG9yZU5hbWUoKTsKIH0KIAotV2ViU3RyaW5nIFdlYklEQkluZGV4SW1w
bDo6a2V5UGF0aCgpIGNvbnN0CitXZWJTdHJpbmcgV2ViSURCSW5kZXhJbXBsOjprZXlQYXRoU3Ry
aW5nKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9iYWNrZW5kLT5rZXlQYXRoKCk7CiB9CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuaCBiL1Nv
dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1wbC5oCmluZGV4IDIyNmZlYjhl
MzAxZjMxNzc1MTA4ZjM0NzVlOGYzYzliZDI2ZmQ2NWUuLjFkYTZkMWJmMTZjOTlkMDcxYWY1MWRj
YjcwMGZlMzk1NWEyM2Y0MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj
L1dlYklEQkluZGV4SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklE
QkluZGV4SW1wbC5oCkBAIC00NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgV2Vi
U3RyaW5nIG5hbWUoKSBjb25zdDsKICAgICB2aXJ0dWFsIFdlYlN0cmluZyBzdG9yZU5hbWUoKSBj
b25zdDsKLSAgICB2aXJ0dWFsIFdlYlN0cmluZyBrZXlQYXRoKCkgY29uc3Q7CisgICAgdmlydHVh
bCBXZWJTdHJpbmcga2V5UGF0aFN0cmluZygpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCB1bmlx
dWUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgbXVsdGlFbnRyeSgpIGNvbnN0OwogCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwu
Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNw
cAppbmRleCBhYmRlZTQ1N2E0OGE2Mjk1ZWNhZmI2NTVmYjUzNTZiNDZhYzc5NjEwLi41ODA0NGE2
OTZjZGYzYmQyNWI3YTIwZTY3NDM3MGIyOTMwZGRlNzg5IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2Vi
S2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuY3BwCisrKyBiL1NvdXJjZS9X
ZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQk9iamVjdFN0b3JlSW1wbC5jcHAKQEAgLTU3LDcgKzU3
LDcgQEAgV2ViU3RyaW5nIFdlYklEQk9iamVjdFN0b3JlSW1wbDo6bmFtZSgpIGNvbnN0CiAgICAg
cmV0dXJuIG1fb2JqZWN0U3RvcmUtPm5hbWUoKTsKIH0KIAotV2ViU3RyaW5nIFdlYklEQk9iamVj
dFN0b3JlSW1wbDo6a2V5UGF0aCgpIGNvbnN0CitXZWJTdHJpbmcgV2ViSURCT2JqZWN0U3RvcmVJ
bXBsOjprZXlQYXRoU3RyaW5nKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9vYmplY3RTdG9yZS0+
a2V5UGF0aCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi
SURCT2JqZWN0U3RvcmVJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJP
YmplY3RTdG9yZUltcGwuaAppbmRleCA3NjRkN2FmZDM2YzRhNDJhMzQzZmFlNGZmZWU4ZjlmOGFl
MGI3NWQ5Li4xODNiZGI0ZDIyNTZjZmNlNjNjMzU2N2ExMGFkZjlmNzgxY2E3NjdiIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuaAor
KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuaApA
QCAtNDYsNyArNDYsNyBAQCBwdWJsaWM6CiAgICAgfldlYklEQk9iamVjdFN0b3JlSW1wbCgpOwog
CiAgICAgV2ViU3RyaW5nIG5hbWUoKSBjb25zdDsKLSAgICBXZWJTdHJpbmcga2V5UGF0aCgpIGNv
bnN0OworICAgIFdlYlN0cmluZyBrZXlQYXRoU3RyaW5nKCkgY29uc3Q7CiAgICAgV2ViRE9NU3Ry
aW5nTGlzdCBpbmRleE5hbWVzKCkgY29uc3Q7CiAKICAgICB2b2lkIGdldChjb25zdCBXZWJJREJL
ZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJF
eGNlcHRpb25Db2RlJik7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>