<?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>148270</bug_id>
          
          <creation_ts>2015-08-20 17:08:34 -0700</creation_ts>
          <short_desc>Merge ConditionBase and Condition</short_desc>
          <delta_ts>2015-08-20 17:43:08 -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>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>REOPENED</bug_status>
          <resolution></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>
          <dependson>148272</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Anders Carlsson">andersca</reporter>
          <assigned_to name="Anders Carlsson">andersca</assigned_to>
          <cc>benjamin</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>commit-queue</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1119470</commentid>
    <comment_count>0</comment_count>
    <who name="Anders Carlsson">andersca</who>
    <bug_when>2015-08-20 17:08:34 -0700</bug_when>
    <thetext>Merge ConditionBase and Condition</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1119472</commentid>
    <comment_count>1</comment_count>
      <attachid>259532</attachid>
    <who name="Anders Carlsson">andersca</who>
    <bug_when>2015-08-20 17:09:43 -0700</bug_when>
    <thetext>Created attachment 259532
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1119474</commentid>
    <comment_count>2</comment_count>
    <who name="Anders Carlsson">andersca</who>
    <bug_when>2015-08-20 17:11:23 -0700</bug_when>
    <thetext>Committed r188719: &lt;http://trac.webkit.org/changeset/188719&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1119498</commentid>
    <comment_count>3</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-08-20 17:43:08 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 148272</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>259532</attachid>
            <date>2015-08-20 17:09:43 -0700</date>
            <delta_ts>2015-08-20 17:10:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-148270-20150820170937.patch</filename>
            <type>text/plain</type>
            <size>3916</size>
            <attacher name="Anders Carlsson">andersca</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIwZWExMDcwNWFjNDdiZmJjMzg4ODQ2
ZDczMmM5ZTI4OWI5OGYzNjYuLjg4YzU3OGZiM2UwNzllZTliNTQ0ZTEzOTkzNjRlNzE3OTcyNWZk
Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTUtMDgtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFu
ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBNZXJnZSBDb25kaXRpb25CYXNlIGFuZCBDb25k
aXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0
ODI3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
d3RmL0NvbmRpdGlvbi5oOgorICAgICAgICBEaXJlY3QgaW5pdGlhbGl6ZSBtX2hhc1dhaXRlcnMg
c28gQ29uZGl0aW9uIGdldHMgYSBjb25zdGV4cHIgY29uc3RydWN0b3IuCisKKyAgICAgICAgKiB3
dGYvTG9jay5oOgorICAgICAgICBSZW1vdmUgYSBub3cgb3V0ZGF0ZWQgY29tbWVudC4KKworMjAx
NS0wOC0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAg
IE1lcmdlIExvY2sgYW5kIExvY2tCYXNlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0xNDgyNjYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh
bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFjZjM5NGFmMjQ4NDE1NThm
NGJhYTY1OTFiMDc2ZGI2ODA2YWY0MGIuLjRiNDk3OWU4MTA2NWJiYWMzMTc3MmY1NmRhMTQxZmQz
ZTBmNDRmNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAxNS0wOC0yMCAgQW5kZXJz
IENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIE1lcmdlIENvbmRpdGlv
bkJhc2UgYW5kIENvbmRpdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MTQ4MjcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQ2hhbmdlIFN0YXRpY0NvbmRpdGlvbiB0byBDb25kaXRpb24uCisKKyAgICAg
ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL0xvYWRlclJ1bkxvb3BDRi5jcHA6CisKKzIwMTUtMDgt
MjAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBTdG9w
IHVzaW5nIGNhbmNlbENhbGxPbk1haW5UaHJlYWQgaW4gTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFG
b3VuZGF0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xNDgyNTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQ29uZGl0aW9uLmggYi9Tb3Vy
Y2UvV1RGL3d0Zi9Db25kaXRpb24uaAppbmRleCA4MGMwNzI5M2EwOTY5NThkYTExY2I5MWIwMmE5
YWNjOTlhMmFhODM0Li42YzQ3NzJmMGI2NmIyZDJkZWUyMDYwZmFjOGIwYThiMjlkMDlmNzMzIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Db25kaXRpb24uaAorKysgYi9Tb3VyY2UvV1RGL3d0
Zi9Db25kaXRpb24uaApAQCAtNDMsOSArNDMsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIC8vIGNhc2Ug
d2hlcmUgbm8gdGhyZWFkIGlzIHdhaXRpbmcuIFRoaXMgY29uZGl0aW9uIHZhcmlhYmxlLCB3aGVu
IHVzZWQgd2l0aCBXVEY6OkxvY2ssIGNhbgogLy8gb3V0cGVyZm9ybSBhIHN5c3RlbSBjb25kaXRp
b24gdmFyaWFibGUgYW5kIGxvY2sgYnkgdXAgdG8gNTh4LgogCi0vLyBUaGlzIGlzIGEgc3RydWN0
IHdpdGhvdXQgYSBjb25zdHJ1Y3RvciBvciBkZXN0cnVjdG9yIHNvIHRoYXQgaXQgY2FuIGJlIHN0
YXRpY2FsbHkgaW5pdGlhbGl6ZWQuCi0vLyBVc2UgTG9jayBpbiBpbnN0YW5jZSB2YXJpYWJsZXMu
Ci1zdHJ1Y3QgQ29uZGl0aW9uQmFzZSB7CitzdHJ1Y3QgQ29uZGl0aW9uIHsKICAgICB0eXBlZGVm
IFBhcmtpbmdMb3Q6OkNsb2NrIENsb2NrOwogICAgIAogICAgIC8vIFdhaXQgb24gYSBwYXJraW5n
IHF1ZXVlIHdoaWxlIHJlbGVhc2luZyB0aGUgZ2l2ZW4gbG9jay4gSXQgd2lsbCB1bmxvY2sgdGhl
IGxvY2sganVzdCBiZWZvcmUKQEAgLTIyOCwyNCArMjI2LDEyIEBAIHByb3RlY3RlZDoKICAgICAg
ICAgcmV0dXJuIENsb2NrOjpub3coKSArIG15UmVsYXRpdmVUaW1lb3V0OwogICAgIH0KIAotICAg
IEF0b21pYzxib29sPiBtX2hhc1dhaXRlcnM7CisgICAgQXRvbWljPGJvb2w+IG1faGFzV2FpdGVy
cyB7IGZhbHNlIH07CiB9OyAgICAKIAotY2xhc3MgQ29uZGl0aW9uIDogcHVibGljIENvbmRpdGlv
bkJhc2UgewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENvbmRpdGlvbik7Ci1wdWJsaWM6Ci0g
ICAgQ29uZGl0aW9uKCkKLSAgICB7Ci0gICAgICAgIG1faGFzV2FpdGVycy5zdG9yZShmYWxzZSk7
Ci0gICAgfQotfTsKLQotdHlwZWRlZiBDb25kaXRpb25CYXNlIFN0YXRpY0NvbmRpdGlvbjsKLQog
fSAvLyBuYW1lc3BhY2UgV1RGCiAKIHVzaW5nIFdURjo6Q29uZGl0aW9uOwotdXNpbmcgV1RGOjpT
dGF0aWNDb25kaXRpb247CiAKICNlbmRpZiAvLyBXVEZfQ29uZGl0aW9uX2gKIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dURi93dGYvTG9jay5oIGIvU291cmNlL1dURi93dGYvTG9jay5oCmluZGV4IGIy
YzY4ZjdmMDE0MjBlZGNkYjY4NDE3NTcyMzE4MTU5MTQzY2Y4NTUuLjQ0NTNlZGY4ZmE2ZWM5ODQz
OTY4N2QxOWI1OWRmOWFkMDYxOTg2ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xvY2su
aAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Mb2NrLmgKQEAgLTQzLDggKzQzLDYgQEAgbmFtZXNwYWNl
IFdURiB7CiAvLyBjYW5ub3QgYmUgYWNxdWlyZWQgaW4gYSBzaG9ydCBwZXJpb2Qgb2YgdGltZSwg
dGhlIHRocmVhZCBpcyBwdXQgdG8gc2xlZXAgdW50aWwgdGhlIGxvY2sgaXMgYXZhaWxhYmxlCiAv
LyBhZ2FpbikuIEl0IHVzZXMgbGVzcyBtZW1vcnkgdGhhbiBhIHN0ZDo6bXV0ZXguCiAKLS8vIFRo
aXMgaXMgYSBzdHJ1Y3Qgd2l0aG91dCBhIGNvbnN0cnVjdG9yIG9yIGRlc3RydWN0b3Igc28gdGhh
dCBpdCBjYW4gYmUgc3RhdGljYWxseSBpbml0aWFsaXplZC4KLS8vIFVzZSBMb2NrIGluIGluc3Rh
bmNlIHZhcmlhYmxlcy4KIHN0cnVjdCBMb2NrIHsKICAgICB2b2lkIGxvY2soKQogICAgIHsKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvTG9hZGVyUnVuTG9v
cENGLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvTG9hZGVyUnVuTG9v
cENGLmNwcAppbmRleCBhZDE2ZGQ5NjYzN2NmN2RiOThhMDA0MTc1NDgxY2RhNDRjYWNjOWUxLi5m
NjM5OGU4NjRjNjAyOTc0MWNkZmJkZDE5MmUxZjExNTZjNjgwNzU2IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0xvYWRlclJ1bkxvb3BDRi5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Mb2FkZXJSdW5Mb29wQ0YuY3BwCkBA
IC00Myw3ICs0Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHN0YXRpYyBDRlJ1bkxvb3BSZWYg
bG9hZGVyUnVuTG9vcE9iamVjdCA9IDA7CiAKIHN0YXRpYyBTdGF0aWNMb2NrIGxvYWRlclJ1bkxv
b3BNdXRleDsKLXN0YXRpYyBTdGF0aWNDb25kaXRpb24gbG9hZGVyUnVuTG9vcENvbmRpdGlvblZh
cmlhYmxlOworc3RhdGljIENvbmRpdGlvbiBsb2FkZXJSdW5Mb29wQ29uZGl0aW9uVmFyaWFibGU7
CiAKIHN0YXRpYyB2b2lkIGVtcHR5UGVyZm9ybSh2b2lkKikgCiB7Cg==
</data>
<flag name="review"
          id="284714"
          type_id="1"
          status="+"
          setter="fpizlo"
    />
          </attachment>
      

    </bug>

</bugzilla>