<?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>99759</bug_id>
          
          <creation_ts>2012-10-18 14:47:35 -0700</creation_ts>
          <short_desc>Create skia_webkit.gyp to improve rebaselining.</short_desc>
          <delta_ts>2012-10-24 12:31:27 -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></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter>bungeman</reporter>
          <assigned_to>bungeman</assigned_to>
          <cc>dpranke</cc>
    
    <cc>epoger</cc>
    
    <cc>reed</cc>
    
    <cc>schenney</cc>
    
    <cc>tomhudson</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>745594</commentid>
    <comment_count>0</comment_count>
    <who name="">bungeman</who>
    <bug_when>2012-10-18 14:47:35 -0700</bug_when>
    <thetext>Create skia_webkit.gyp to improve rebaselining.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>745596</commentid>
    <comment_count>1</comment_count>
      <attachid>169479</attachid>
    <who name="">bungeman</who>
    <bug_when>2012-10-18 14:50:48 -0700</bug_when>
    <thetext>Created attachment 169479
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>745918</commentid>
    <comment_count>2</comment_count>
    <who name="">bungeman</who>
    <bug_when>2012-10-18 19:47:12 -0700</bug_when>
    <thetext>If this is committed, then https://codereview.chromium.org/11191074 would be checked in to Chromium after the next WebKit roll into Chromium.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>747573</commentid>
    <comment_count>3</comment_count>
    <who name="Stephen Chenney">schenney</who>
    <bug_when>2012-10-22 08:34:07 -0700</bug_when>
    <thetext>Am I correct in understanding that there is a matching chromium patch that adds the reference to this file?

To rebaseline, we would:
1. Change a flag in this new skia_webkit.gyp file
2. Watch the build bots generate all the new images (with lots and lots of failures)
3. Rebaseline WebKit
4. Roll WebKit into Chromium, and pick up both the flag change and the new baselines

Sounds to me like a much better workflow.

The only downside is that it adds the possibility that a Skia change in WebKit might cause breakage of chromium browser or unit tests on the WebKit roll. I don&apos;t think we can really do anything much about that, but it does mean that the skia team will have to be aware when a flag change rolls into chromium.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>747630</commentid>
    <comment_count>4</comment_count>
    <who name="">bungeman</who>
    <bug_when>2012-10-22 09:44:52 -0700</bug_when>
    <thetext>&gt;Am I correct in understanding that there is a matching chromium patch that adds the reference to this file?

See https://codereview.chromium.org/11191074

&gt;To rebaseline, we would:

Your description is accurate as to the intended workflow. The entire process previous to this is something like.

-4. Make a change in Skia behind a build flag because it is known to need new baselines in WebKit.
-3. Roll Skia into Chromium with the code suppression flag in Chromium&apos;s skia.gyp.
-2. At any point here or previous, get the code suppression flag into the skia_webkit.gyp and roll (or wait for roll of) WebKit into Chromium.
-1. Remove suppression from Chromium&apos;s skia.gyp.
 0. Roll (or wait for roll of) Chromium into WebKit.

At this point the rebaseline can proceed as you describe.

&gt;might cause breakage of chromium browser or unit tests on the WebKit roll
To mitigate this, we can send the full change to the trybots ahead of time to make sure that only layout tests are affected.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>748121</commentid>
    <comment_count>5</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-10-22 17:35:24 -0700</bug_when>
    <thetext>This change (and the corresponding Chromium-side change) look fine (well, frankly, it looks ugly but I don&apos;t think there&apos;s another way to solve this), but I&apos;d like to hold off on landing it until after we can meet to discuss the flow on Wednesday, if that&apos;s okay.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>749906</commentid>
    <comment_count>6</comment_count>
      <attachid>169479</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-10-24 12:21:27 -0700</bug_when>
    <thetext>Comment on attachment 169479
Patch

We agreed to land it :).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>749917</commentid>
    <comment_count>7</comment_count>
      <attachid>169479</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-10-24 12:31:23 -0700</bug_when>
    <thetext>Comment on attachment 169479
Patch

Clearing flags on attachment: 169479

Committed r132385: &lt;http://trac.webkit.org/changeset/132385&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>749918</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-10-24 12:31:27 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>169479</attachid>
            <date>2012-10-18 14:50:48 -0700</date>
            <delta_ts>2012-10-24 12:31:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-99759-20121018174933.patch</filename>
            <type>text/plain</type>
            <size>3440</size>
            <attacher>bungeman</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzE4MTIpCisrKyBTb3Vy
Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0
IEBACisyMDEyLTEwLTE4ICBCZW4gV2FnbmVyICA8YnVuZ2VtYW5AY2hyb21pdW0ub3JnPgorCisg
ICAgICAgIENyZWF0ZSBza2lhX3dlYmtpdC5neXAgdG8gaW1wcm92ZSByZWJhc2VsaW5pbmcuCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTc1OQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWxsb3dz
IGZvciBjb2RlIHN1cHByZXNzaW9ucyB0byBiZSBsaWZ0ZWQgYXRvbWljYWxseSB3aXRoIG5ldyBi
YXNlbGluZXMuCisKKyAgICAgICAgKiBza2lhX3dlYmtpdC5neXA6IEFkZGVkLgorCiAyMDEyLTEw
LTE4ICBBbHBoYSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVt
XSBJbXBsZW1lbnQgZGVmZXJyZWQgaW1hZ2UgZGVjb2RpbmcKSW5kZXg6IFNvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vc2tpYV93ZWJraXQuZ3lwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hy
b21pdW0vc2tpYV93ZWJraXQuZ3lwCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYktpdC9jaHJv
bWl1bS9za2lhX3dlYmtpdC5neXAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTggQEAKKyMKKyMg
Q29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisj
IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg
b3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0
aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICAgICAqIFJlZGlz
dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0
CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz
Y2xhaW1lci4KKyMgICAgICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0
IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv
bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRh
dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1
dGlvbi4KKyMgICAgICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRo
ZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3Ig
cHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNw
ZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQ
Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMg
SVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU
IE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ
TElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlN
RUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVU
T1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQ
RUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV
VCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT
RVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO
VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklM
SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJ
TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg
T0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP
U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorIworCisjIFRoaXMgc2tpYV93ZWJraXQgdGFyZ2V0
IGlzIGEgZGVwZW5kZW5jeSBvZiBDaHJvbWl1bSdzIHNraWEvc2tpYS5neXAuCisjIEl0IG9ubHkg
Y29udGFpbnMgY29kZSBzdXBwcmVzc2lvbnMgd2hpY2gga2VlcCBXZWJraXQgdGVzdHMgZnJvbSBm
YWlsaW5nLgoreworICAndGFyZ2V0cyc6IFsKKyAgICB7CisgICAgICAndGFyZ2V0X25hbWUnOiAn
c2tpYV93ZWJraXQnLAorICAgICAgJ3R5cGUnOiAnbm9uZScsCisgICAgICAnZGlyZWN0X2RlcGVu
ZGVudF9zZXR0aW5ncyc6IHsKKyAgICAgICAgJ2RlZmluZXMnOiBbCisgICAgICAgICAgIyB0ZW1w
b3JhcnkgZm9yIGxhbmRpbmcgU2tpYSByZXYgMzA3NyB3aXRoIG1pbmltYWwgbGF5b3V0IHRlc3Qg
YnJlYWthZ2UKKyAgICAgICAgICAnU0tfU0lNUExFX1RXT0NPTE9SX1ZFUlRJQ0FMX0dSQURJRU5U
UycsCisKKyAgICAgICAgICAjIFRlbXBvcmFyaWx5IGRpc2FibGUgdGhlIFNraWEgZml4IGluCisg
ICAgICAgICAgIyBodHRwOi8vY29kZS5nb29nbGUuY29tL3Avc2tpYS9zb3VyY2UvZGV0YWlsP3I9
MzAzNyA7IGVuYWJsaW5nIHRoYXQKKyAgICAgICAgICAjIGZpeCB3aWxsIHJlcXVpcmUgc3Vic3Rh
bnRpYWwgcmViYXNlbGluaW5nLgorICAgICAgICAgICdTS19EUkFXX1BPU19URVhUX0lHTk9SRV9T
VUJQSVhFTF9MRUZUX0FMSUdOX0ZJWCcsCisKKyAgICAgICAgICAjIFRlbXBvcmFyaWx5IGlnbm9y
ZSBmaXggdG8gYW50aWFsaWFzIGNvdmVyYWdlLCB1bnRpbCB3ZSBjYW4gcmViYXNlbGluZQorICAg
ICAgICAgICdTS19VU0VfTEVHQUNZX0FBX0NPVkVSQUdFJywKKworICAgICAgICAgICMgVGVtcG9y
YXJpbHkgZGlzYWJsZSBvcGFjaXR5IGZpeCBpbiBleHRyYWN0U3Vic2V0CisgICAgICAgICAgJ1NL
X0RJU0FCTEVfRVhUUkFDVFNVQlNFVF9PUEFRVUVfRklYJywKKyAgICAgICAgXSwKKyAgICAgIH0s
CisgICAgfSwKKyAgXSwKK30KKwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>