<?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>88569</bug_id>
          
          <creation_ts>2012-06-07 12:32:34 -0700</creation_ts>
          <short_desc>Chromium Mac: don’t #include things in subframeworks of ApplicationServices.framework</short_desc>
          <delta_ts>2012-06-13 12:21:40 -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>Platform</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Mac (Intel)</rep_platform>
          <op_sys>OS X 10.5</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="Mark Mentovai">mark</reporter>
          <assigned_to name="Mark Mentovai">mark</assigned_to>
          <cc>bashi</cc>
    
    <cc>caryclark</cc>
    
    <cc>senorblanco</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>643797</commentid>
    <comment_count>0</comment_count>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-07 12:32:34 -0700</bug_when>
    <thetext>Subframeworks move around from SDK to SDK and OS release to OS release, but just using the top-level umbrella framework guarantees forward compatibility. Because of an error in the Chromium build files that leaked into WebKit, some code was reaching into ApplicationServices.framework to #include things in subframeworks. In order to fix the build file leak in Chromium and stop doing this, the offenders in WebKit need to be fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>643803</commentid>
    <comment_count>1</comment_count>
      <attachid>146362</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-07 12:40:01 -0700</bug_when>
    <thetext>Created attachment 146362
Don’t reach into subframeworks, just #include &lt;ApplicationServices/ApplicationServices.h&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>643807</commentid>
    <comment_count>2</comment_count>
      <attachid>146363</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-07 12:45:09 -0700</bug_when>
    <thetext>Created attachment 146363
Updated to current trunk (r119733)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>646969</commentid>
    <comment_count>3</comment_count>
      <attachid>146363</attachid>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2012-06-12 08:39:24 -0700</bug_when>
    <thetext>Comment on attachment 146363
Updated to current trunk (r119733)

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

&gt; WebCore/platform/graphics/GlyphBuffer.h:42
&gt; +#if (PLATFORM(WX) &amp;&amp; OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)

Not your fault, but I think SKIA_ON_MAC_CHROMIUM is always on by default now, so this could be something like

#if (OS(DARWIN) &amp;&amp; (PLATFORM(WX) || PLATFORM(CHROMIUM)))

Cary, could you verify?  Should we keep these around or just nuke them?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>646975</commentid>
    <comment_count>4</comment_count>
      <attachid>146363</attachid>
    <who name="Cary Clark">caryclark</who>
    <bug_when>2012-06-12 08:45:26 -0700</bug_when>
    <thetext>Comment on attachment 146363
Updated to current trunk (r119733)

For files that are shared with Apple (e.g., WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm) this would make things less stable, not more so, since edits to the Apple side of the #include list would not be reflected in the Chromium build. Is it permissible to replace the Apple side as well?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>646980</commentid>
    <comment_count>5</comment_count>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-12 08:53:32 -0700</bug_when>
    <thetext>I don’t know what you mean by “replace the Apple side.” I was trying to scope my patch to be a minimal-change one that only touched Chromium.

In the general sense, #include &lt;ApplicationServices/ApplicationServices.h&gt; is never a problem, although in newer SDKs, CoreGraphics.framework has been promoted to be a top-level framework instead of being a subframework under ApplicationServices.framework. I’m not sure what Apple’s requirements for SDK use are, but they (and other WebKit ports on the Mac) may have reasons to prefer including things of the form &lt;CoreGraphics/xxx.h&gt;. In Chromium’s case, we still need to operate with the old 10.5 SDK, and will soon switch to the 10.6 SDK, in which CoreGraphics.framework is still a subframework, and we’re supposed to disallow subframework includes of this form.

I don’t know exactly when Chrome’s compiler flag leak into WebKit was introduced, but it probably happened when we switched to using Skia, which means that this change merely restores the old (correct) state of affairs, where Chrome code (including WebKit built for Chrome) couldn’t reach into subframeworks of ApplicationServices.framework.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>646984</commentid>
    <comment_count>6</comment_count>
      <attachid>146363</attachid>
    <who name="Cary Clark">caryclark</who>
    <bug_when>2012-06-12 09:01:55 -0700</bug_when>
    <thetext>Comment on attachment 146363
Updated to current trunk (r119733)

What I mean by &apos;the Apple side&apos; is #if USE(CG). Sorry for the confusion. What I was attempting to say that if, in the future, the USE(CG) bracketed code in GlyphBuffer.h line 38 or the code following the #else in ComplexTextControllerCoreText.mm line 38 is edited in a way that changes the behavior of the rest of the file, the Chromium port won&apos;t benefit from that change. If this is not a concern, then feel free to ignore.

To address Stephen&apos;s question, yes, USE(SKIA_ON_MAC_CHROMIUM) should be deprecated and replaced with PLATFORM(CHROMIUM) &amp;&amp; OS(DARWIN). The code base with CG+Chromium doesn&apos;t compile and isn&apos;t maintained.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647001</commentid>
    <comment_count>7</comment_count>
      <attachid>147097</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-12 09:22:18 -0700</bug_when>
    <thetext>Created attachment 147097
Don’t use SKIA_ON_MAC_CHROMIUM

I don’t think that the divergent paths for #includes are worth worrying about. &lt;ApplicationServices/ApplicationServices.h&gt; brings in both &lt;CoreGraphics/CGGeometry.h&gt; and &lt;CoreText/CoreText.h&gt;, and more. I’m not sure if that change is desirable for the Apple CG port, which appears content (on the basis of the existing code) to reach into subframeworks in this manner, and both CoreGraphics and CoreText have been promoted to top-level frameworks in SDKs newer than what Chrome can build with.

This version of the patch assumes that OS(DARWIN) &amp;&amp; PLATFORM(CHROMIUM) is always Skia, and doesn’t use SKIA_ON_MAC_CHROMIUM at all.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647003</commentid>
    <comment_count>8</comment_count>
      <attachid>147097</attachid>
    <who name="Cary Clark">caryclark</who>
    <bug_when>2012-06-12 09:24:56 -0700</bug_when>
    <thetext>Comment on attachment 147097
Don’t use SKIA_ON_MAC_CHROMIUM

lgtm</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647053</commentid>
    <comment_count>9</comment_count>
      <attachid>147097</attachid>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2012-06-12 10:35:36 -0700</bug_when>
    <thetext>Comment on attachment 147097
Don’t use SKIA_ON_MAC_CHROMIUM

The patch is not applying because it&apos;s diffed at Source, rather than at the webkit checkout root.  Please rebuild the patch and re-upload so we can get some EWS coverage.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647174</commentid>
    <comment_count>10</comment_count>
      <attachid>147134</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-12 12:25:53 -0700</bug_when>
    <thetext>Created attachment 147134
Patch rooted above Source</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647178</commentid>
    <comment_count>11</comment_count>
      <attachid>147134</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-12 12:30:25 -0700</bug_when>
    <thetext>Comment on attachment 147134
Patch rooted above Source

Thanks, this one seems to apply on the EWS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647196</commentid>
    <comment_count>12</comment_count>
      <attachid>147134</attachid>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2012-06-12 12:54:38 -0700</bug_when>
    <thetext>Comment on attachment 147134
Patch rooted above Source

Looks good, assuming the bots are OK with it.  r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647279</commentid>
    <comment_count>13</comment_count>
      <attachid>147134</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-12 13:59:27 -0700</bug_when>
    <thetext>Comment on attachment 147134
Patch rooted above Source

The bots are OK with it. Let’s do it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647350</commentid>
    <comment_count>14</comment_count>
      <attachid>147134</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-12 14:39:31 -0700</bug_when>
    <thetext>Comment on attachment 147134
Patch rooted above Source

Clearing flags on attachment: 147134

Committed r120122: &lt;http://trac.webkit.org/changeset/120122&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647351</commentid>
    <comment_count>15</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-12 14:39:35 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648098</commentid>
    <comment_count>16</comment_count>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-13 09:09:11 -0700</bug_when>
    <thetext>One more cropped up yesterday. It was added by a Chromium contributor. This wouldn’t have happened if I was able to land https://chromiumcodereview.appspot.com/10535059/ first, but I was waiting for the WebKit roll. Patch coming…</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648099</commentid>
    <comment_count>17</comment_count>
      <attachid>147333</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-13 09:09:42 -0700</bug_when>
    <thetext>Created attachment 147333
Fix new violation in platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648104</commentid>
    <comment_count>18</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-13 09:13:00 -0700</bug_when>
    <thetext>Attachment 147333 did not pass style-queue:

Failed to run &quot;[&apos;Tools/Scripts/check-webkit-style&apos;, &apos;--diff-files&apos;, u&apos;Source/WebCore/ChangeLog&apos;, u&apos;Source/WebCor...&quot; exit_code: 1
Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp:34:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648129</commentid>
    <comment_count>19</comment_count>
      <attachid>147337</attachid>
    <who name="Mark Mentovai">mark</who>
    <bug_when>2012-06-13 09:28:59 -0700</bug_when>
    <thetext>Created attachment 147337
Style-conformant patch for HarfBuzzFaceCoreText.cpp</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648273</commentid>
    <comment_count>20</comment_count>
      <attachid>147337</attachid>
    <who name="Stephen White">senorblanco</who>
    <bug_when>2012-06-13 11:17:57 -0700</bug_when>
    <thetext>Comment on attachment 147337
Style-conformant patch for HarfBuzzFaceCoreText.cpp

OK.  r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648351</commentid>
    <comment_count>21</comment_count>
      <attachid>147337</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-13 12:21:34 -0700</bug_when>
    <thetext>Comment on attachment 147337
Style-conformant patch for HarfBuzzFaceCoreText.cpp

Clearing flags on attachment: 147337

Committed r120234: &lt;http://trac.webkit.org/changeset/120234&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648352</commentid>
    <comment_count>22</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-13 12:21:40 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>146362</attachid>
            <date>2012-06-07 12:40:01 -0700</date>
            <delta_ts>2012-06-07 12:45:09 -0700</delta_ts>
            <desc>Don’t reach into subframeworks, just #include &lt;ApplicationServices/ApplicationServices.h&gt;</desc>
            <filename>webkit.88569.1.patch</filename>
            <type>text/plain</type>
            <size>4347</size>
            <attacher name="Mark Mentovai">mark</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n
CShyZXZpc2lvbiAxMTk3NDYpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA
QCAtMSwzICsxLDI0IEBACisyMDEyLTA2LTA3ICBNYXJrIE1lbnRvdmFpICA8bWFya0BjaHJvbWl1
bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9uJ3QgaW5jbHVkZSB0aGluZ3MgaW4g
c3ViZnJhbWV3b3JrcyBvZgorICAgICAgICBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yay4K
KworICAgICAgICBTdWJmcmFtZXdvcmtzIG1vdmUgYXJvdW5kIGZyb20gU0RLIHRvIFNESyBhbmQg
T1MgcmVsZWFzZSB0byBPUworICAgICAgICByZWxlYXNlLCBidXQganVzdCB1c2luZyB0aGUgdG9w
LWxldmVsIHVtYnJlbGxhIGZyYW1ld29yayBndWFyYW50ZWVzCisgICAgICAgIGZvcndhcmQgY29t
cGF0aWJpbGl0eS4gV2hlbiBidWlsZGluZyBmb3IgQ2hyb21pdW0gTWFjLCBqdXN0ICNpbmNsdWRl
CisgICAgICAgIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4gaW5z
dGVhZCBvZiByZWFjaGluZyBpbiB0bworICAgICAgICBzdWJmcmFtZXdvcmtzLgorCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODU2OQorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKwor
ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmg6CisgICAgICAgICogcGxh
dGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0Lm1tOgorICAg
ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6CisK
IDIwMTItMDYtMDcgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAg
ICAgW2Nocm9taXVtXSBGcmVlIHRleHR1cmUgZnJvbSBDQ0lPU3VyZmFjZUxheWVySW1wbCB3aGVu
IGl0IGlzIGRlc3Ryb3llZApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1
ZmZlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZm
ZXIuaAkocmV2aXNpb24gMTE5NTgxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlw
aEJ1ZmZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwxMSArMzUsMTEgQEAKICNpbmNsdWRlIDx3
dGYvVW51c2VkUGFyYW0uaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBVU0UoQ0cp
IHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUlVTSkKKyNpZiBVU0UoQ0cpCiAjaW5jbHVkZSA8Q29y
ZUdyYXBoaWNzL0NHR2VvbWV0cnkuaD4KICNlbmRpZgogCi0jaWYgUExBVEZPUk0oV1gpICYmIE9T
KERBUldJTikKKyNpZiAoUExBVEZPUk0oV1gpICYmIE9TKERBUldJTikpIHx8IFVTRShTS0lBX09O
X01BQ19DSFJPTUlVTSkKICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9u
U2VydmljZXMuaD4KICNlbmRpZgogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21h
Yy9Db21wbGV4VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbQko
cmV2aXNpb24gMTE5NTgxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxl
eFRleHRDb250cm9sbGVyQ29yZVRleHQubW0JKHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDcg
QEAKICNpbmNsdWRlICJUZXh0UnVuLmgiCiAjaW5jbHVkZSAiV2ViQ29yZVN5c3RlbUludGVyZmFj
ZS5oIgogCi0jaWYgUExBVEZPUk0oV1gpCisjaWYgUExBVEZPUk0oV1gpIHx8IFBMQVRGT1JNKENI
Uk9NSVVNKQogI2luY2x1ZGUgPEFwcGxpY2F0aW9uU2VydmljZXMvQXBwbGljYXRpb25TZXJ2aWNl
cy5oPgogI2Vsc2UKICNpbmNsdWRlIDxDb3JlVGV4dC9Db3JlVGV4dC5oPgpJbmRleDogV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lh
LmNwcAkocmV2aXNpb24gMTE5NTgxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh
L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw3ICs1Niw3IEBA
CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CiAKICNpZiBQTEFURk9STShDSFJPTUlVTSkg
JiYgT1MoREFSV0lOKQotI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0NvbG9yU3BhY2UuaD4KKyNp
bmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KICNlbmRp
ZgogCiB1c2luZyBuYW1lc3BhY2Ugc3RkOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv
Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTk3
NDYpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg
KzEsMTkgQEAKKzIwMTItMDYtMDcgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVtLm9yZz4K
KworICAgICAgICBbY2hyb21pdW0gbWFjXSBEb24ndCAjaW5jbHVkZSB0aGluZ3MgaW4gc3ViZnJh
bWV3b3JrcyBvZgorICAgICAgICBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yay4KKworICAg
ICAgICAjaW5jbHVkaW5nIHRoZSB1bWJyZWxsYSA8QXBwbGljYXRvblNlcnZpY2VzL0FwcGxpY2F0
aW9uU2VydmljZXMuaD4KKyAgICAgICAgZXhwb3NlZCBhbiBhbWJpZ3VvdXMgbmFtZSwgRm9udE1l
dHJpY3MsIHRoYXQgbmVlZHMgdG8gYmUgZnVsbHkKKyAgICAgICAgcXVhbGlmaWVkIGFzIFdlYkNv
cmU6OkZvbnRNZXRyaWNzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD04ODU2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgICogc3JjL1dlYkZvbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRm9u
dEltcGw6OmVzdGltYXRlVGV4dEJvdW5kcyk6CisKIDIwMTItMDYtMDcgIERhbmEgSmFuc2VucyAg
PGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBGcmVlIHRleHR1cmUg
ZnJvbSBDQ0lPU3VyZmFjZUxheWVySW1wbCB3aGVuIGl0IGlzIGRlc3Ryb3llZApJbmRleDogV2Vi
S2l0L2Nocm9taXVtL3NyYy9XZWJGb250SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No
cm9taXVtL3NyYy9XZWJGb250SW1wbC5jcHAJKHJldmlzaW9uIDExOTU4MSkKKysrIFdlYktpdC9j
aHJvbWl1bS9zcmMvV2ViRm9udEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDgsNyArMTQ4
LDcgQEAgV2ViUmVjdCBXZWJGb250SW1wbDo6ZXN0aW1hdGVUZXh0Qm91bmRzKAogewogICAgIEZv
bnRDYWNoZVB1cmdlUHJldmVudGVyIGZvbnRDYWNoZVB1cmdlUHJldmVudGVyOwogICAgIGludCB0
b3RhbFdpZHRoID0gbV9mb250LndpZHRoKHJ1biwgMCk7Ci0gICAgY29uc3QgRm9udE1ldHJpY3Mm
IGZvbnRNZXRyaWNzID0gbV9mb250LmZvbnRNZXRyaWNzKCk7CisgICAgY29uc3QgV2ViQ29yZTo6
Rm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzID0gbV9mb250LmZvbnRNZXRyaWNzKCk7CiAgICAgcmV0
dXJuIFdlYlJlY3QobGVmdEJhc2VsaW5lLnggLSAoZm9udE1ldHJpY3MuYXNjZW50KCkgKyBmb250
TWV0cmljcy5kZXNjZW50KCkpIC8gMiwKICAgICAgICAgICAgICAgICAgICBsZWZ0QmFzZWxpbmUu
eSAtIGZvbnRNZXRyaWNzLmFzY2VudCgpIC0gZm9udE1ldHJpY3MubGluZUdhcCgpLAogICAgICAg
ICAgICAgICAgICAgIHRvdGFsV2lkdGggKyBmb250TWV0cmljcy5hc2NlbnQoKSArIGZvbnRNZXRy
aWNzLmRlc2NlbnQoKSwK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>146363</attachid>
            <date>2012-06-07 12:45:09 -0700</date>
            <delta_ts>2012-06-12 09:22:18 -0700</delta_ts>
            <desc>Updated to current trunk (r119733)</desc>
            <filename>webkit.88569.2.patch</filename>
            <type>text/plain</type>
            <size>4325</size>
            <attacher name="Mark Mentovai">mark</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n
CShyZXZpc2lvbiAxMTk3MzMpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA
QCAtMSwzICsxLDI0IEBACisyMDEyLTA2LTA3ICBNYXJrIE1lbnRvdmFpICA8bWFya0BjaHJvbWl1
bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9uJ3QgaW5jbHVkZSB0aGluZ3MgaW4g
c3ViZnJhbWV3b3JrcyBvZgorICAgICAgICBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yay4K
KworICAgICAgICBTdWJmcmFtZXdvcmtzIG1vdmUgYXJvdW5kIGZyb20gU0RLIHRvIFNESyBhbmQg
T1MgcmVsZWFzZSB0byBPUworICAgICAgICByZWxlYXNlLCBidXQganVzdCB1c2luZyB0aGUgdG9w
LWxldmVsIHVtYnJlbGxhIGZyYW1ld29yayBndWFyYW50ZWVzCisgICAgICAgIGZvcndhcmQgY29t
cGF0aWJpbGl0eS4gV2hlbiBidWlsZGluZyBmb3IgQ2hyb21pdW0gTWFjLCBqdXN0ICNpbmNsdWRl
CisgICAgICAgIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4gaW5z
dGVhZCBvZiByZWFjaGluZyBpbiB0bworICAgICAgICBzdWJmcmFtZXdvcmtzLgorCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODU2OQorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKwor
ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmg6CisgICAgICAgICogcGxh
dGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0Lm1tOgorICAg
ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6CisK
IDIwMTItMDYtMDcgIFJheW1lcyBLaG91cnkgIDxyYXltZXNAY2hyb21pdW0ub3JnPgogCiAgICAg
ICAgIEluY29ycmVjdCByZWN0LWJhc2VkIGhpdC10ZXN0IHJlc3VsdCBmb3IgY3VsbGVkLWlubGlu
ZSBlbGVtZW50cwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5o
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAko
cmV2aXNpb24gMTE5NzMzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZl
ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwxMSArMzUsMTEgQEAKICNpbmNsdWRlIDx3dGYvVW51
c2VkUGFyYW0uaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBVU0UoQ0cpIHx8IFVT
RShTS0lBX09OX01BQ19DSFJPTUlVTSkKKyNpZiBVU0UoQ0cpCiAjaW5jbHVkZSA8Q29yZUdyYXBo
aWNzL0NHR2VvbWV0cnkuaD4KICNlbmRpZgogCi0jaWYgUExBVEZPUk0oV1gpICYmIE9TKERBUldJ
TikKKyNpZiAoUExBVEZPUk0oV1gpICYmIE9TKERBUldJTikpIHx8IFVTRShTS0lBX09OX01BQ19D
SFJPTUlVTSkKICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2Vydmlj
ZXMuaD4KICNlbmRpZgogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21w
bGV4VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbQkocmV2aXNp
b24gMTE5NzMzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRD
b250cm9sbGVyQ29yZVRleHQubW0JKHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDcgQEAKICNp
bmNsdWRlICJUZXh0UnVuLmgiCiAjaW5jbHVkZSAiV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIgog
Ci0jaWYgUExBVEZPUk0oV1gpCisjaWYgUExBVEZPUk0oV1gpIHx8IFBMQVRGT1JNKENIUk9NSVVN
KQogI2luY2x1ZGUgPEFwcGxpY2F0aW9uU2VydmljZXMvQXBwbGljYXRpb25TZXJ2aWNlcy5oPgog
I2Vsc2UKICNpbmNsdWRlIDxDb3JlVGV4dC9Db3JlVGV4dC5oPgpJbmRleDogV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAko
cmV2aXNpb24gMTE5NzMzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBo
aWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw3ICs1Niw3IEBACiAjaW5j
bHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CiAKICNpZiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1Mo
REFSV0lOKQotI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0NvbG9yU3BhY2UuaD4KKyNpbmNsdWRl
IDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KICNlbmRpZgogCiB1
c2luZyBuYW1lc3BhY2Ugc3RkOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTk3MzMpCisr
KyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkg
QEAKKzIwMTItMDYtMDcgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVtLm9yZz4KKworICAg
ICAgICBbY2hyb21pdW0gbWFjXSBEb24ndCAjaW5jbHVkZSB0aGluZ3MgaW4gc3ViZnJhbWV3b3Jr
cyBvZgorICAgICAgICBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yay4KKworICAgICAgICAj
aW5jbHVkaW5nIHRoZSB1bWJyZWxsYSA8QXBwbGljYXRvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2Vy
dmljZXMuaD4KKyAgICAgICAgZXhwb3NlZCBhbiBhbWJpZ3VvdXMgbmFtZSwgRm9udE1ldHJpY3Ms
IHRoYXQgbmVlZHMgdG8gYmUgZnVsbHkKKyAgICAgICAgcXVhbGlmaWVkIGFzIFdlYkNvcmU6OkZv
bnRNZXRyaWNzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD04ODU2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg
ICAgICogc3JjL1dlYkZvbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRm9udEltcGw6
OmVzdGltYXRlVGV4dEJvdW5kcyk6CisKIDIwMTItMDYtMDcgIERhbmllbCBFcmF0ICA8ZGVyYXRA
Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZCBzZXR0aW5nIHRvIGVuYWJsZSBzdWJwaXhlbC1w
b3NpdGlvbmVkIHRleHQgb24gTGludXguCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZv
bnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZvbnRJbXBs
LmNwcAkocmV2aXNpb24gMTE5NzMzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGb250SW1w
bC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0OCw3ICsxNDgsNyBAQCBXZWJSZWN0IFdlYkZvbnRJ
bXBsOjplc3RpbWF0ZVRleHRCb3VuZHMoCiB7CiAgICAgRm9udENhY2hlUHVyZ2VQcmV2ZW50ZXIg
Zm9udENhY2hlUHVyZ2VQcmV2ZW50ZXI7CiAgICAgaW50IHRvdGFsV2lkdGggPSBtX2ZvbnQud2lk
dGgocnVuLCAwKTsKLSAgICBjb25zdCBGb250TWV0cmljcyYgZm9udE1ldHJpY3MgPSBtX2ZvbnQu
Zm9udE1ldHJpY3MoKTsKKyAgICBjb25zdCBXZWJDb3JlOjpGb250TWV0cmljcyYgZm9udE1ldHJp
Y3MgPSBtX2ZvbnQuZm9udE1ldHJpY3MoKTsKICAgICByZXR1cm4gV2ViUmVjdChsZWZ0QmFzZWxp
bmUueCAtIChmb250TWV0cmljcy5hc2NlbnQoKSArIGZvbnRNZXRyaWNzLmRlc2NlbnQoKSkgLyAy
LAogICAgICAgICAgICAgICAgICAgIGxlZnRCYXNlbGluZS55IC0gZm9udE1ldHJpY3MuYXNjZW50
KCkgLSBmb250TWV0cmljcy5saW5lR2FwKCksCiAgICAgICAgICAgICAgICAgICAgdG90YWxXaWR0
aCArIGZvbnRNZXRyaWNzLmFzY2VudCgpICsgZm9udE1ldHJpY3MuZGVzY2VudCgpLAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>147097</attachid>
            <date>2012-06-12 09:22:18 -0700</date>
            <delta_ts>2012-06-12 12:25:53 -0700</delta_ts>
            <desc>Don’t use SKIA_ON_MAC_CHROMIUM</desc>
            <filename>webkit.88569.3.patch</filename>
            <type>text/plain</type>
            <size>5769</size>
            <attacher name="Mark Mentovai">mark</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n
CShyZXZpc2lvbiAxMjAwNjIpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA
QCAtMSwzICsxLDI0IEBACisyMDEyLTA2LTEyICBNYXJrIE1lbnRvdmFpICA8bWFya0BjaHJvbWl1
bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9uJ3QgaW5jbHVkZSB0aGluZ3MgaW4g
c3ViZnJhbWV3b3JrcyBvZgorICAgICAgICBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yay4K
KworICAgICAgICBTdWJmcmFtZXdvcmtzIG1vdmUgYXJvdW5kIGZyb20gU0RLIHRvIFNESyBhbmQg
T1MgcmVsZWFzZSB0byBPUworICAgICAgICByZWxlYXNlLCBidXQganVzdCB1c2luZyB0aGUgdG9w
LWxldmVsIHVtYnJlbGxhIGZyYW1ld29yayBndWFyYW50ZWVzCisgICAgICAgIGZvcndhcmQgY29t
cGF0aWJpbGl0eS4gV2hlbiBidWlsZGluZyBmb3IgQ2hyb21pdW0gTWFjLCBqdXN0ICNpbmNsdWRl
CisgICAgICAgIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4gaW5z
dGVhZCBvZiByZWFjaGluZyBpbiB0bworICAgICAgICBzdWJmcmFtZXdvcmtzLgorCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODU2OQorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKwor
ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmg6CisgICAgICAgICogcGxh
dGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0Lm1tOgorICAg
ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6CisK
IDIwMTItMDYtMTIgIFRha2FzaGkgU2FrYW1vdG8gIDx0YXNha0Bnb29nbGUuY29tPgogCiAgICAg
ICAgIFtTaGFkb3cgRE9NXSA8c3R5bGU+IGluc2lkZSBTaGFkb3cgc3VidHJlZSBzaG91bGQgYmUg
c2NvcGVkIGluc2lkZSB0aGUgc3VidHJlZS4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp
Y3MvR2x5cGhCdWZmZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L0dseXBoQnVmZmVyLmgJKHJldmlzaW9uIDEyMDA2MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvR2x5cGhCdWZmZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTEgKzM1LDExIEBACiAj
aW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCi0j
aWYgVVNFKENHKSB8fCBVU0UoU0tJQV9PTl9NQUNfQ0hST01JVU0pCisjaWYgVVNFKENHKQogI2lu
Y2x1ZGUgPENvcmVHcmFwaGljcy9DR0dlb21ldHJ5Lmg+CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JN
KFdYKSAmJiBPUyhEQVJXSU4pCisjaWYgT1MoREFSV0lOKSAmJiAoUExBVEZPUk0oV1gpIHx8IFBM
QVRGT1JNKENIUk9NSVVNKSkKICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0
aW9uU2VydmljZXMuaD4KICNlbmRpZgogCkBAIC02Miw3ICs2Miw3IEBAIHR5cGVkZWYgR2x5cGgg
R2x5cGhCdWZmZXJHbHlwaDsKIAogLy8gQ0cgdXNlcyBDR1NpemUgaW5zdGVhZCBvZiBGbG9hdFNp
emUgc28gdGhhdCB0aGUgcmVzdWx0IG9mIGFkdmFuY2VzKCkKIC8vIGNhbiBiZSBwYXNzZWQgZGly
ZWN0bHkgdG8gQ0dDb250ZXh0U2hvd0dseXBoc1dpdGhBZHZhbmNlcyBpbiBGb250TWFjLm1tCi0j
aWYgVVNFKENHKSB8fCAoUExBVEZPUk0oV1gpICYmIE9TKERBUldJTikpIHx8IFVTRShTS0lBX09O
X01BQ19DSFJPTUlVTSkKKyNpZiBVU0UoQ0cpIHx8IChPUyhEQVJXSU4pICYmIChQTEFURk9STShX
WCkgfHwgUExBVEZPUk0oQ0hST01JVU0pKSkKIHR5cGVkZWYgQ0dTaXplIEdseXBoQnVmZmVyQWR2
YW5jZTsKICNlbGlmIE9TKFdJTkNFKQogLy8gVGhlcmUgaXMgbm8gY3Jvc3MtcGxhdGZvcm0gY29k
ZSB0aGF0IHVzZXMgdGhlIGhlaWdodCBvZiBHbHlwaEJ1ZmZlckFkdmFuY2UsCkBAIC0xMjYsNyAr
MTI2LDcgQEAgcHVibGljOgogCiAgICAgZmxvYXQgYWR2YW5jZUF0KGludCBpbmRleCkgY29uc3QK
ICAgICB7Ci0jaWYgVVNFKENHKSB8fCAoUExBVEZPUk0oV1gpICYmIE9TKERBUldJTikpIHx8IFVT
RShTS0lBX09OX01BQ19DSFJPTUlVTSkKKyNpZiBVU0UoQ0cpIHx8IChPUyhEQVJXSU4pICYmIChQ
TEFURk9STShXWCkgfHwgUExBVEZPUk0oQ0hST01JVU0pKSkKICAgICAgICAgcmV0dXJuIG1fYWR2
YW5jZXNbaW5kZXhdLndpZHRoOwogI2VsaWYgT1MoV0lOQ0UpCiAgICAgICAgIHJldHVybiBtX2Fk
dmFuY2VzW2luZGV4XTsKQEAgLTE1Nyw3ICsxNTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fZ2x5
cGhzLmFwcGVuZChnbHlwaCk7CiAjZW5kaWYKIAotI2lmIFVTRShDRykgfHwgKFBMQVRGT1JNKFdY
KSAmJiBPUyhEQVJXSU4pKSB8fCBVU0UoU0tJQV9PTl9NQUNfQ0hST01JVU0pCisjaWYgVVNFKENH
KSB8fCAoT1MoREFSV0lOKSAmJiAoUExBVEZPUk0oV1gpIHx8IFBMQVRGT1JNKENIUk9NSVVNKSkp
CiAgICAgICAgIENHU2l6ZSBhZHZhbmNlID0geyB3aWR0aCwgMCB9OwogICAgICAgICBtX2FkdmFu
Y2VzLmFwcGVuZChhZHZhbmNlKTsKICNlbGlmIE9TKFdJTkNFKQpAQCAtMTk2LDcgKzE5Niw3IEBA
IHB1YmxpYzoKICAgICB7CiAgICAgICAgIEFTU0VSVCghaXNFbXB0eSgpKTsKICAgICAgICAgR2x5
cGhCdWZmZXJBZHZhbmNlJiBsYXN0QWR2YW5jZSA9IG1fYWR2YW5jZXMubGFzdCgpOwotI2lmIFVT
RShDRykgfHwgKFBMQVRGT1JNKFdYKSAmJiBPUyhEQVJXSU4pKSB8fCBVU0UoU0tJQV9PTl9NQUNf
Q0hST01JVU0pCisjaWYgVVNFKENHKSB8fCAoT1MoREFSV0lOKSAmJiAoUExBVEZPUk0oV1gpIHx8
IFBMQVRGT1JNKENIUk9NSVVNKSkpCiAgICAgICAgIGxhc3RBZHZhbmNlLndpZHRoICs9IHdpZHRo
OwogI2VsaWYgT1MoV0lOQ0UpCiAgICAgICAgIGxhc3RBZHZhbmNlICs9IHdpZHRoOwpJbmRleDog
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyQ29yZVRl
eHQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxl
eFRleHRDb250cm9sbGVyQ29yZVRleHQubW0JKHJldmlzaW9uIDEyMDA2MikKKysrIFdlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0Lm1tCSh3
b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw3IEBACiAjaW5jbHVkZSAiVGV4dFJ1bi5oIgogI2lu
Y2x1ZGUgIldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKIAotI2lmIFBMQVRGT1JNKFdYKQorI2lm
IFBMQVRGT1JNKFdYKSB8fCBQTEFURk9STShDSFJPTUlVTSkKICNpbmNsdWRlIDxBcHBsaWNhdGlv
blNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KICNlbHNlCiAjaW5jbHVkZSA8Q29yZVRl
eHQvQ29yZVRleHQuaD4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFw
aGljc0NvbnRleHRTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJKHJldmlzaW9uIDEyMDA2MikKKysrIFdl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAkod29y
a2luZyBjb3B5KQpAQCAtNTYsNyArNTYsNyBAQAogI2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5o
PgogCiAjaWYgUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikKLSNpbmNsdWRlIDxDb3Jl
R3JhcGhpY3MvQ0dDb2xvclNwYWNlLmg+CisjaW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2aWNlcy9B
cHBsaWNhdGlvblNlcnZpY2VzLmg+CiAjZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKSW5k
ZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t
aXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTIwMDYyKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA2LTEyICBNYXJrIE1l
bnRvdmFpICA8bWFya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9u
J3QgI2luY2x1ZGUgdGhpbmdzIGluIHN1YmZyYW1ld29ya3Mgb2YKKyAgICAgICAgQXBwbGljYXRp
b25TZXJ2aWNlcy5mcmFtZXdvcmsuCisKKyAgICAgICAgI2luY2x1ZGluZyB0aGUgdW1icmVsbGEg
PEFwcGxpY2F0b25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CisgICAgICAgIGV4cG9z
ZWQgYW4gYW1iaWd1b3VzIG5hbWUsIEZvbnRNZXRyaWNzLCB0aGF0IG5lZWRzIHRvIGJlIGZ1bGx5
CisgICAgICAgIHF1YWxpZmllZCBhcyBXZWJDb3JlOjpGb250TWV0cmljcy4KKworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg1NjkKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9XZWJGb250SW1wbC5j
cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZvbnRJbXBsOjplc3RpbWF0ZVRleHRCb3VuZHMpOgor
CiAyMDEyLTA2LTEyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4K
IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTIwMDUxLgpJbmRleDogV2ViS2l0
L2Nocm9taXVtL3NyYy9XZWJGb250SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t
aXVtL3NyYy9XZWJGb250SW1wbC5jcHAJKHJldmlzaW9uIDEyMDA2MikKKysrIFdlYktpdC9jaHJv
bWl1bS9zcmMvV2ViRm9udEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDgsNyArMTQ4LDcg
QEAgV2ViUmVjdCBXZWJGb250SW1wbDo6ZXN0aW1hdGVUZXh0Qm91bmRzKAogewogICAgIEZvbnRD
YWNoZVB1cmdlUHJldmVudGVyIGZvbnRDYWNoZVB1cmdlUHJldmVudGVyOwogICAgIGludCB0b3Rh
bFdpZHRoID0gbV9mb250LndpZHRoKHJ1biwgMCk7Ci0gICAgY29uc3QgRm9udE1ldHJpY3MmIGZv
bnRNZXRyaWNzID0gbV9mb250LmZvbnRNZXRyaWNzKCk7CisgICAgY29uc3QgV2ViQ29yZTo6Rm9u
dE1ldHJpY3MmIGZvbnRNZXRyaWNzID0gbV9mb250LmZvbnRNZXRyaWNzKCk7CiAgICAgcmV0dXJu
IFdlYlJlY3QobGVmdEJhc2VsaW5lLnggLSAoZm9udE1ldHJpY3MuYXNjZW50KCkgKyBmb250TWV0
cmljcy5kZXNjZW50KCkpIC8gMiwKICAgICAgICAgICAgICAgICAgICBsZWZ0QmFzZWxpbmUueSAt
IGZvbnRNZXRyaWNzLmFzY2VudCgpIC0gZm9udE1ldHJpY3MubGluZUdhcCgpLAogICAgICAgICAg
ICAgICAgICAgIHRvdGFsV2lkdGggKyBmb250TWV0cmljcy5hc2NlbnQoKSArIGZvbnRNZXRyaWNz
LmRlc2NlbnQoKSwK
</data>
<flag name="review"
          id="154523"
          type_id="1"
          status="-"
          setter="senorblanco"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>147134</attachid>
            <date>2012-06-12 12:25:53 -0700</date>
            <delta_ts>2012-06-12 14:39:31 -0700</delta_ts>
            <desc>Patch rooted above Source</desc>
            <filename>webkit.88569.4.patch</filename>
            <type>text/plain</type>
            <size>5895</size>
            <attacher name="Mark Mentovai">mark</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDA2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA2LTEyICBNYXJrIE1l
bnRvdmFpICA8bWFya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9u
J3QgaW5jbHVkZSB0aGluZ3MgaW4gc3ViZnJhbWV3b3JrcyBvZgorICAgICAgICBBcHBsaWNhdGlv
blNlcnZpY2VzLmZyYW1ld29yay4KKworICAgICAgICBTdWJmcmFtZXdvcmtzIG1vdmUgYXJvdW5k
IGZyb20gU0RLIHRvIFNESyBhbmQgT1MgcmVsZWFzZSB0byBPUworICAgICAgICByZWxlYXNlLCBi
dXQganVzdCB1c2luZyB0aGUgdG9wLWxldmVsIHVtYnJlbGxhIGZyYW1ld29yayBndWFyYW50ZWVz
CisgICAgICAgIGZvcndhcmQgY29tcGF0aWJpbGl0eS4gV2hlbiBidWlsZGluZyBmb3IgQ2hyb21p
dW0gTWFjLCBqdXN0ICNpbmNsdWRlCisgICAgICAgIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxp
Y2F0aW9uU2VydmljZXMuaD4gaW5zdGVhZCBvZiByZWFjaGluZyBpbiB0bworICAgICAgICBzdWJm
cmFtZXdvcmtzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD04ODU2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg
ICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVm
ZmVyLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJv
bGxlckNvcmVUZXh0Lm1tOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhp
Y3NDb250ZXh0U2tpYS5jcHA6CisKIDIwMTItMDYtMTIgIFRha2FzaGkgU2FrYW1vdG8gIDx0YXNh
a0Bnb29nbGUuY29tPgogCiAgICAgICAgIFtTaGFkb3cgRE9NXSA8c3R5bGU+IGluc2lkZSBTaGFk
b3cgc3VidHJlZSBzaG91bGQgYmUgc2NvcGVkIGluc2lkZSB0aGUgc3VidHJlZS4KSW5kZXg6IFNv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkocmV2aXNp
b24gMTIwMDYyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZm
ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTEgKzM1LDExIEBACiAjaW5jbHVkZSA8d3RmL1Vu
dXNlZFBhcmFtLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCi0jaWYgVVNFKENHKSB8fCBV
U0UoU0tJQV9PTl9NQUNfQ0hST01JVU0pCisjaWYgVVNFKENHKQogI2luY2x1ZGUgPENvcmVHcmFw
aGljcy9DR0dlb21ldHJ5Lmg+CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKFdYKSAmJiBPUyhEQVJX
SU4pCisjaWYgT1MoREFSV0lOKSAmJiAoUExBVEZPUk0oV1gpIHx8IFBMQVRGT1JNKENIUk9NSVVN
KSkKICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4K
ICNlbmRpZgogCkBAIC02Miw3ICs2Miw3IEBAIHR5cGVkZWYgR2x5cGggR2x5cGhCdWZmZXJHbHlw
aDsKIAogLy8gQ0cgdXNlcyBDR1NpemUgaW5zdGVhZCBvZiBGbG9hdFNpemUgc28gdGhhdCB0aGUg
cmVzdWx0IG9mIGFkdmFuY2VzKCkKIC8vIGNhbiBiZSBwYXNzZWQgZGlyZWN0bHkgdG8gQ0dDb250
ZXh0U2hvd0dseXBoc1dpdGhBZHZhbmNlcyBpbiBGb250TWFjLm1tCi0jaWYgVVNFKENHKSB8fCAo
UExBVEZPUk0oV1gpICYmIE9TKERBUldJTikpIHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUlVTSkK
KyNpZiBVU0UoQ0cpIHx8IChPUyhEQVJXSU4pICYmIChQTEFURk9STShXWCkgfHwgUExBVEZPUk0o
Q0hST01JVU0pKSkKIHR5cGVkZWYgQ0dTaXplIEdseXBoQnVmZmVyQWR2YW5jZTsKICNlbGlmIE9T
KFdJTkNFKQogLy8gVGhlcmUgaXMgbm8gY3Jvc3MtcGxhdGZvcm0gY29kZSB0aGF0IHVzZXMgdGhl
IGhlaWdodCBvZiBHbHlwaEJ1ZmZlckFkdmFuY2UsCkBAIC0xMjYsNyArMTI2LDcgQEAgcHVibGlj
OgogCiAgICAgZmxvYXQgYWR2YW5jZUF0KGludCBpbmRleCkgY29uc3QKICAgICB7Ci0jaWYgVVNF
KENHKSB8fCAoUExBVEZPUk0oV1gpICYmIE9TKERBUldJTikpIHx8IFVTRShTS0lBX09OX01BQ19D
SFJPTUlVTSkKKyNpZiBVU0UoQ0cpIHx8IChPUyhEQVJXSU4pICYmIChQTEFURk9STShXWCkgfHwg
UExBVEZPUk0oQ0hST01JVU0pKSkKICAgICAgICAgcmV0dXJuIG1fYWR2YW5jZXNbaW5kZXhdLndp
ZHRoOwogI2VsaWYgT1MoV0lOQ0UpCiAgICAgICAgIHJldHVybiBtX2FkdmFuY2VzW2luZGV4XTsK
QEAgLTE1Nyw3ICsxNTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fZ2x5cGhzLmFwcGVuZChnbHlw
aCk7CiAjZW5kaWYKIAotI2lmIFVTRShDRykgfHwgKFBMQVRGT1JNKFdYKSAmJiBPUyhEQVJXSU4p
KSB8fCBVU0UoU0tJQV9PTl9NQUNfQ0hST01JVU0pCisjaWYgVVNFKENHKSB8fCAoT1MoREFSV0lO
KSAmJiAoUExBVEZPUk0oV1gpIHx8IFBMQVRGT1JNKENIUk9NSVVNKSkpCiAgICAgICAgIENHU2l6
ZSBhZHZhbmNlID0geyB3aWR0aCwgMCB9OwogICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChhZHZh
bmNlKTsKICNlbGlmIE9TKFdJTkNFKQpAQCAtMTk2LDcgKzE5Niw3IEBAIHB1YmxpYzoKICAgICB7
CiAgICAgICAgIEFTU0VSVCghaXNFbXB0eSgpKTsKICAgICAgICAgR2x5cGhCdWZmZXJBZHZhbmNl
JiBsYXN0QWR2YW5jZSA9IG1fYWR2YW5jZXMubGFzdCgpOwotI2lmIFVTRShDRykgfHwgKFBMQVRG
T1JNKFdYKSAmJiBPUyhEQVJXSU4pKSB8fCBVU0UoU0tJQV9PTl9NQUNfQ0hST01JVU0pCisjaWYg
VVNFKENHKSB8fCAoT1MoREFSV0lOKSAmJiAoUExBVEZPUk0oV1gpIHx8IFBMQVRGT1JNKENIUk9N
SVVNKSkpCiAgICAgICAgIGxhc3RBZHZhbmNlLndpZHRoICs9IHdpZHRoOwogI2VsaWYgT1MoV0lO
Q0UpCiAgICAgICAgIGxhc3RBZHZhbmNlICs9IHdpZHRoOwpJbmRleDogU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0Lm1tCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4
VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbQkocmV2aXNpb24gMTIwMDYyKQorKysgU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0
Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw3IEBACiAjaW5jbHVkZSAiVGV4dFJ1bi5o
IgogI2luY2x1ZGUgIldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKIAotI2lmIFBMQVRGT1JNKFdY
KQorI2lmIFBMQVRGT1JNKFdYKSB8fCBQTEFURk9STShDSFJPTUlVTSkKICNpbmNsdWRlIDxBcHBs
aWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KICNlbHNlCiAjaW5jbHVkZSA8
Q29yZVRleHQvQ29yZVRleHQuaD4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAkocmV2
aXNpb24gMTIwMDYyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9H
cmFwaGljc0NvbnRleHRTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYsNyArNTYsNyBAQAog
I2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5oPgogCiAjaWYgUExBVEZPUk0oQ0hST01JVU0pICYm
IE9TKERBUldJTikKLSNpbmNsdWRlIDxDb3JlR3JhcGhpY3MvQ0dDb2xvclNwYWNlLmg+CisjaW5j
bHVkZSA8QXBwbGljYXRpb25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CiAjZW5kaWYK
IAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh
bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShy
ZXZpc2lvbiAxMjAwNjIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA2LTEyICBNYXJrIE1lbnRvdmFpICA8
bWFya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9uJ3QgI2luY2x1
ZGUgdGhpbmdzIGluIHN1YmZyYW1ld29ya3Mgb2YKKyAgICAgICAgQXBwbGljYXRpb25TZXJ2aWNl
cy5mcmFtZXdvcmsuCisKKyAgICAgICAgI2luY2x1ZGluZyB0aGUgdW1icmVsbGEgPEFwcGxpY2F0
b25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CisgICAgICAgIGV4cG9zZWQgYW4gYW1i
aWd1b3VzIG5hbWUsIEZvbnRNZXRyaWNzLCB0aGF0IG5lZWRzIHRvIGJlIGZ1bGx5CisgICAgICAg
IHF1YWxpZmllZCBhcyBXZWJDb3JlOjpGb250TWV0cmljcy4KKworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg1NjkKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9XZWJGb250SW1wbC5jcHA6CisgICAg
ICAgIChXZWJLaXQ6OldlYkZvbnRJbXBsOjplc3RpbWF0ZVRleHRCb3VuZHMpOgorCiAyMDEyLTA2
LTEyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg
ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTIwMDUxLgpJbmRleDogU291cmNlL1dlYktpdC9j
aHJvbWl1bS9zcmMvV2ViRm9udEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vc3JjL1dlYkZvbnRJbXBsLmNwcAkocmV2aXNpb24gMTIwMDYyKQorKysgU291cmNl
L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRm9udEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x
NDgsNyArMTQ4LDcgQEAgV2ViUmVjdCBXZWJGb250SW1wbDo6ZXN0aW1hdGVUZXh0Qm91bmRzKAog
ewogICAgIEZvbnRDYWNoZVB1cmdlUHJldmVudGVyIGZvbnRDYWNoZVB1cmdlUHJldmVudGVyOwog
ICAgIGludCB0b3RhbFdpZHRoID0gbV9mb250LndpZHRoKHJ1biwgMCk7Ci0gICAgY29uc3QgRm9u
dE1ldHJpY3MmIGZvbnRNZXRyaWNzID0gbV9mb250LmZvbnRNZXRyaWNzKCk7CisgICAgY29uc3Qg
V2ViQ29yZTo6Rm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzID0gbV9mb250LmZvbnRNZXRyaWNzKCk7
CiAgICAgcmV0dXJuIFdlYlJlY3QobGVmdEJhc2VsaW5lLnggLSAoZm9udE1ldHJpY3MuYXNjZW50
KCkgKyBmb250TWV0cmljcy5kZXNjZW50KCkpIC8gMiwKICAgICAgICAgICAgICAgICAgICBsZWZ0
QmFzZWxpbmUueSAtIGZvbnRNZXRyaWNzLmFzY2VudCgpIC0gZm9udE1ldHJpY3MubGluZUdhcCgp
LAogICAgICAgICAgICAgICAgICAgIHRvdGFsV2lkdGggKyBmb250TWV0cmljcy5hc2NlbnQoKSAr
IGZvbnRNZXRyaWNzLmRlc2NlbnQoKSwK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>147333</attachid>
            <date>2012-06-13 09:09:42 -0700</date>
            <delta_ts>2012-06-13 09:28:59 -0700</delta_ts>
            <desc>Fix new violation in platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp</desc>
            <filename>webkit.88569a.1.patch</filename>
            <type>text/plain</type>
            <size>1391</size>
            <attacher name="Mark Mentovai">mark</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDIxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA2LTEzICBNYXJrIE1l
bnRvdmFpICA8bWFya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9u
J3QgaW5jbHVkZSB0aGluZ3MgaW4gc3ViZnJhbWV3b3JrcyBvZgorICAgICAgICBBcHBsaWNhdGlv
blNlcnZpY2VzLmZyYW1ld29yay4KKworICAgICAgICBBIENvcmVUZXh0ICNpbmNsdWRlICh3aXRo
IHF1b3RlcyBpbnN0ZWFkIG9mIGJyYWNrZXRzLCBldmVuKSBzcHJ1bmcgdXAKKyAgICAgICAgaW4g
cjEyMDUwNiwgYnVnIDY5ODI2LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD04ODU2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz
L2hhcmZidXp6L25nL0hhcmZCdXp6RmFjZUNvcmVUZXh0LmNwcDoKKwogMjAxMi0wNi0wOSAgVnNl
dm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj
dG9yOiBFcnJvcnMgd2hlbiBwZW5kaW5nIGNvbnNvbGUgbWVzc2FnZXMgYXJlIGF0dGFjaGVkIHRv
IEphdmFTY3JpcHRTb3VyY2VGcmFtZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2hhcmZidXp6L25nL0hhcmZCdXp6RmFjZUNvcmVUZXh0LmNwcAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9uZy9IYXJmQnV6ekZh
Y2VDb3JlVGV4dC5jcHAJKHJldmlzaW9uIDEyMDE2MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL2hhcmZidXp6L25nL0hhcmZCdXp6RmFjZUNvcmVUZXh0LmNwcAkod29ya2lu
ZyBjb3B5KQpAQCAtMzEsNyArMzEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg
IkhhcmZCdXp6RmFjZS5oIgogCi0jaW5jbHVkZSAiQ29yZVRleHQvQ29yZVRleHQuaCIKKyNpbmNs
dWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KICNpbmNsdWRl
ICJGb250UGxhdGZvcm1EYXRhLmgiCiAjaW5jbHVkZSAiSGFyZkJ1enpTaGFwZXIuaCIKICNpbmNs
dWRlICJTaW1wbGVGb250RGF0YS5oIgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>147337</attachid>
            <date>2012-06-13 09:28:59 -0700</date>
            <delta_ts>2012-06-13 12:21:34 -0700</delta_ts>
            <desc>Style-conformant patch for HarfBuzzFaceCoreText.cpp</desc>
            <filename>webkit.88569a.2.patch</filename>
            <type>text/plain</type>
            <size>1437</size>
            <attacher name="Mark Mentovai">mark</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDIxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA2LTEzICBNYXJrIE1l
bnRvdmFpICA8bWFya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtIG1hY10gRG9u
J3QgaW5jbHVkZSB0aGluZ3MgaW4gc3ViZnJhbWV3b3JrcyBvZgorICAgICAgICBBcHBsaWNhdGlv
blNlcnZpY2VzLmZyYW1ld29yay4KKworICAgICAgICBBIENvcmVUZXh0ICNpbmNsdWRlICh3aXRo
IHF1b3RlcyBpbnN0ZWFkIG9mIGJyYWNrZXRzLCBldmVuKSBzcHJ1bmcgdXAKKyAgICAgICAgaW4g
cjEyMDUwNiwgYnVnIDY5ODI2LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD04ODU2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz
L2hhcmZidXp6L25nL0hhcmZCdXp6RmFjZUNvcmVUZXh0LmNwcDoKKwogMjAxMi0wNi0wOSAgVnNl
dm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj
dG9yOiBFcnJvcnMgd2hlbiBwZW5kaW5nIGNvbnNvbGUgbWVzc2FnZXMgYXJlIGF0dGFjaGVkIHRv
IEphdmFTY3JpcHRTb3VyY2VGcmFtZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2hhcmZidXp6L25nL0hhcmZCdXp6RmFjZUNvcmVUZXh0LmNwcAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9uZy9IYXJmQnV6ekZh
Y2VDb3JlVGV4dC5jcHAJKHJldmlzaW9uIDEyMDE2MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL2hhcmZidXp6L25nL0hhcmZCdXp6RmFjZUNvcmVUZXh0LmNwcAkod29ya2lu
ZyBjb3B5KQpAQCAtMzEsMTIgKzMxLDEyIEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVk
ZSAiSGFyZkJ1enpGYWNlLmgiCiAKLSNpbmNsdWRlICJDb3JlVGV4dC9Db3JlVGV4dC5oIgogI2lu
Y2x1ZGUgIkZvbnRQbGF0Zm9ybURhdGEuaCIKICNpbmNsdWRlICJIYXJmQnV6elNoYXBlci5oIgog
I2luY2x1ZGUgIlNpbXBsZUZvbnREYXRhLmgiCiAKICNpbmNsdWRlICJoYi5oIgorI2luY2x1ZGUg
PEFwcGxpY2F0aW9uU2VydmljZXMvQXBwbGljYXRpb25TZXJ2aWNlcy5oPgogCiBuYW1lc3BhY2Ug
V2ViQ29yZSB7CiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>