<?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>66332</bug_id>
          
          <creation_ts>2011-08-16 14:38:38 -0700</creation_ts>
          <short_desc>change references to leveldb.gyp to leveldatabase.gyp</short_desc>
          <delta_ts>2011-08-17 20:25:15 -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="David Grogan">dgrogan</reporter>
          <assigned_to name="David Grogan">dgrogan</assigned_to>
          <cc>hans</cc>
    
    <cc>scottmg</cc>
    
    <cc>tonyg</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>451877</commentid>
    <comment_count>0</comment_count>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2011-08-16 14:38:38 -0700</bug_when>
    <thetext>change references to leveldb.gyp to leveldatabase.gyp</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>451888</commentid>
    <comment_count>1</comment_count>
      <attachid>104095</attachid>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2011-08-16 14:53:08 -0700</bug_when>
    <thetext>Created attachment 104095
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>451889</commentid>
    <comment_count>2</comment_count>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2011-08-16 14:53:36 -0700</bug_when>
    <thetext>Hans, would you like to review?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452215</commentid>
    <comment_count>3</comment_count>
    <who name="Hans Wennborg">hans</who>
    <bug_when>2011-08-17 05:54:09 -0700</bug_when>
    <thetext>Looks good to me! It will be very nice to get this sorted out.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452284</commentid>
    <comment_count>4</comment_count>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2011-08-17 08:53:03 -0700</bug_when>
    <thetext>Tony, could you review this?

This is stage 3 of the plan described here: http://code.google.com/p/chromium/issues/detail?id=89378

The summary is that we&apos;re splitting up the leveldb code so that chromium-specific bits will live in the chromium repository.  This patch makes webcore use the new leveldb checkout.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452292</commentid>
    <comment_count>5</comment_count>
      <attachid>104095</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-17 09:38:31 -0700</bug_when>
    <thetext>Comment on attachment 104095
Patch

Rejecting attachment 104095 from commit-queue.

Failed to run &quot;[&apos;./Tools/Scripts/webkit-patch&apos;, &apos;--status-host=queues.webkit.org&apos;, &apos;--bot-id=ec2-cq-03&apos;, &apos;--port...&quot; exit_code: 2

Last 500 characters of output:
romium/test_expectations.txt
Auto-merging LayoutTests/platform/win/Skipped
Failed to merge in the changes.
Patch failed at 0001 Add Windows results for new test added in r91777

When you have resolved this problem run &quot;git rebase --continue&quot;.
If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
To restore the original branch and stop rebasing run &quot;git rebase --abort&quot;.

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 146.

Full output: http://queues.webkit.org/results/9405922</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452366</commentid>
    <comment_count>6</comment_count>
      <attachid>104194</attachid>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2011-08-17 11:03:03 -0700</bug_when>
    <thetext>Created attachment 104194
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452379</commentid>
    <comment_count>7</comment_count>
      <attachid>104194</attachid>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2011-08-17 11:09:45 -0700</bug_when>
    <thetext>Comment on attachment 104194
Patch

This is just a rebase to try to fix the patch-command problem.

But it looks like it had nothing to with the patch, just git acting out.  Could you r+ and cq+ this to see if it will land this time?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452829</commentid>
    <comment_count>8</comment_count>
      <attachid>104194</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-17 20:25:11 -0700</bug_when>
    <thetext>Comment on attachment 104194
Patch

Clearing flags on attachment: 104194

Committed r93278: &lt;http://trac.webkit.org/changeset/93278&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452830</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-17 20:25:15 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104095</attachid>
            <date>2011-08-16 14:53:08 -0700</date>
            <delta_ts>2011-08-17 11:03:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-66332-20110816145307.patch</filename>
            <type>text/plain</type>
            <size>1651</size>
            <attacher name="David Grogan">dgrogan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTMxNTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMTdkNGFhNmFiODA1NTg1
YmE1ZmM4YjMzZDViZGYwNDI0ZjEyZDllLi5kNWVlYWUwNzYyMzU1YzBjZGUyODQ4YWQ1MDQ1OTVi
MzRhNWZlOTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDgtMTYgIERhdmlk
IEdyb2dhbiAgPGRncm9nYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENoYW5nZSByZWZlcmVu
Y2VzIHRvIGxldmVsZGIuZ3lwIHRvIGxldmVsZGF0YWJhc2UuZ3lwIGFzIHBhcnQgb2YgdGhlCisg
ICAgICAgIGxldmVsZGIgcmVmYWN0b3JpbmcgZ29pbmcgb24gaW4gY2hyb21pdW06IGNyYnVnLmNv
bS84OTM3OAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
NjYzMzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU
ZXN0czogbmV3LXJ1bi13ZWJraXQtdGVzdHMgLS1kZWJ1ZyAtLWNocm9taXVtIC0tbm8tcmV0cnkt
ZmFpbHVyZXMgLS1idWlsZC1kaXJlY3Rvcnk9bGx2bSBzdG9yYWdlL2luZGV4ZWRkYgorCisgICAg
ICAgICogV2ViQ29yZS5neXAvV2ViQ29yZS5neXA6CisKIDIwMTEtMDgtMTYgIE1paG5lYSBPdmlk
ZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CiAKICAgICAgICAgVW5tYXRyaXggYWxnb3JpdGhtIGlt
cGxlbWVudGF0aW9uIGlzIHdyb25nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl
Lmd5cC9XZWJDb3JlLmd5cCBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lw
CmluZGV4IDE0YzUxZTc0YTgwNGQ5OTBhNGUxMTkzYmEwOTFkMjU4NTdiZjlkYTkuLjAyYjFlNDY1
ZWY1YjJjZWNhNzg0ZTZjMWIzOTVhZmJlZDEyMmNjZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu
Z3lwL1dlYkNvcmUuZ3lwCkBAIC0xMjY3LDEwICsxMjY3LDEwIEBACiAgICAgICAgIH1dLAogICAg
ICAgICBbJyJFTkFCTEVfTEVWRUxEQj0xIiBpbiBmZWF0dXJlX2RlZmluZXMnLCB7CiAgICAgICAg
ICAgJ2RlcGVuZGVuY2llcyc6IFsKLSAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3Ro
aXJkX3BhcnR5L2xldmVsZGIvbGV2ZWxkYi5neXA6bGV2ZWxkYicsCisgICAgICAgICAgICAnPChj
aHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9sZXZlbGRhdGFiYXNlL2xldmVsZGF0YWJhc2Uu
Z3lwOmxldmVsZGF0YWJhc2UnLAogICAgICAgICAgIF0sCiAgICAgICAgICAgJ2V4cG9ydF9kZXBl
bmRlbnRfc2V0dGluZ3MnOiBbCi0gICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGly
ZF9wYXJ0eS9sZXZlbGRiL2xldmVsZGIuZ3lwOmxldmVsZGInLAorICAgICAgICAgICAgJzwoY2hy
b21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvbGV2ZWxkYXRhYmFzZS9sZXZlbGRhdGFiYXNlLmd5
cDpsZXZlbGRhdGFiYXNlJywKICAgICAgICAgICBdLAogICAgICAgICB9XSwKICAgICAgIF0sCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104194</attachid>
            <date>2011-08-17 11:03:03 -0700</date>
            <delta_ts>2011-08-17 20:25:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-66332-20110817110303.patch</filename>
            <type>text/plain</type>
            <size>1670</size>
            <attacher name="David Grogan">dgrogan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTMxNjYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhODI4Y2VjMDAzMjMxNzQ3
MWE3YThiMTg3MWU1M2JlMWM1ZmIxNjNmLi45M2YwNjI0ZTdiNjUxOTVjNjllMDgyZWYyOWVkNDM1
N2EzMzc1YTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDgtMTYgIERhdmlk
IEdyb2dhbiAgPGRncm9nYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENoYW5nZSByZWZlcmVu
Y2VzIHRvIGxldmVsZGIuZ3lwIHRvIGxldmVsZGF0YWJhc2UuZ3lwIGFzIHBhcnQgb2YgdGhlCisg
ICAgICAgIGxldmVsZGIgcmVmYWN0b3JpbmcgZ29pbmcgb24gaW4gY2hyb21pdW06IGNyYnVnLmNv
bS84OTM3OAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
NjYzMzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU
ZXN0czogbmV3LXJ1bi13ZWJraXQtdGVzdHMgLS1kZWJ1ZyAtLWNocm9taXVtIC0tbm8tcmV0cnkt
ZmFpbHVyZXMgLS1idWlsZC1kaXJlY3Rvcnk9bGx2bSBzdG9yYWdlL2luZGV4ZWRkYgorCisgICAg
ICAgICogV2ViQ29yZS5neXAvV2ViQ29yZS5neXA6CisKIDIwMTEtMDgtMTYgIEpvc2VwaCBQZWNv
cmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIENocm9taXVt
IFdpbmRvd3MgYnVpbGQgZml4IGFmdGVyIHI5MzE0MC4gVGFrZSA0LgpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD
b3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCAxNGM1MWU3NGE4MDRkOTkwYTRlMTE5M2JhMDkxZDI1
ODU3YmY5ZGE5Li4wMmIxZTQ2NWVmNWIyY2VjYTc4NGU2YzFiMzk1YWZiZWQxMjJjY2ZkIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMTI2NywxMCArMTI2NywxMCBA
QAogICAgICAgICB9XSwKICAgICAgICAgWyciRU5BQkxFX0xFVkVMREI9MSIgaW4gZmVhdHVyZV9k
ZWZpbmVzJywgewogICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCi0gICAgICAgICAgICAnPChj
aHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9sZXZlbGRiL2xldmVsZGIuZ3lwOmxldmVsZGIn
LAorICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvbGV2ZWxkYXRh
YmFzZS9sZXZlbGRhdGFiYXNlLmd5cDpsZXZlbGRhdGFiYXNlJywKICAgICAgICAgICBdLAogICAg
ICAgICAgICdleHBvcnRfZGVwZW5kZW50X3NldHRpbmdzJzogWwotICAgICAgICAgICAgJzwoY2hy
b21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvbGV2ZWxkYi9sZXZlbGRiLmd5cDpsZXZlbGRiJywK
KyAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3RoaXJkX3BhcnR5L2xldmVsZGF0YWJh
c2UvbGV2ZWxkYXRhYmFzZS5neXA6bGV2ZWxkYXRhYmFzZScsCiAgICAgICAgICAgXSwKICAgICAg
ICAgfV0sCiAgICAgICBdLAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>