<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161806] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161806">161806</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 08:09:49 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Upstream WebEventRegion.{h|mm} to fix the build
* WebCore.xcodeproj/project.pbxproj: Add to project.
* page/ios/WebEventRegion.h: Added.
* page/ios/WebEventRegion.mm: Added.
(-[WebEventRegion initWithPoints::::]):
(-[WebEventRegion copyWithZone:]):
(-[WebEventRegion description]):
(-[WebEventRegion hitTest:]):
(-[WebEventRegion isEqual:]):
(-[WebEventRegion quad]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepageiosWebEventRegionh">trunk/Source/WebCore/page/ios/WebEventRegion.h</a></li>
<li><a href="#trunkSourceWebCorepageiosWebEventRegionmm">trunk/Source/WebCore/page/ios/WebEventRegion.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161805 => 161806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-12 08:45:48 UTC (rev 161805)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 16:09:49 UTC (rev 161806)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-12 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] Upstream WebEventRegion.{h|mm} to fix the build
+
+ * WebCore.xcodeproj/project.pbxproj: Add to project.
+ * page/ios/WebEventRegion.h: Added.
+ * page/ios/WebEventRegion.mm: Added.
+ (-[WebEventRegion initWithPoints::::]):
+ (-[WebEventRegion copyWithZone:]):
+ (-[WebEventRegion description]):
+ (-[WebEventRegion hitTest:]):
+ (-[WebEventRegion isEqual:]):
+ (-[WebEventRegion quad]):
+
</ins><span class="cx"> 2014-01-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use std::call_once instead of AtomicallyInitializedStatic when creating a HTTP header set
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161805 => 161806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-12 08:45:48 UTC (rev 161805)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-12 16:09:49 UTC (rev 161806)
</span><span class="lines">@@ -927,6 +927,8 @@
</span><span class="cx"> 209B456B16796A7E00E54E4E /* JSCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */; };
</span><span class="cx"> 20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20D629241253690B00081543 /* InspectorInstrumentation.cpp */; };
</span><span class="cx"> 20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 20D629251253690B00081543 /* InspectorInstrumentation.h */; };
</span><ins>+ 225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 225A16B30D5C11E900090295 /* WebEventRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 225A16B60D5C11E900090295 /* WebEventRegion.mm in Sources */ = {isa = PBXBuildFile; fileRef = 225A16B40D5C11E900090295 /* WebEventRegion.mm */; };
</ins><span class="cx"> 227777601345DEA9008EA455 /* InspectorForwarding.h in Headers */ = {isa = PBXBuildFile; fileRef = 2277775F1345DEA9008EA455 /* InspectorForwarding.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 228C284510D82500009D0D0E /* ScriptWrappable.h in Headers */ = {isa = PBXBuildFile; fileRef = 228C284410D82500009D0D0E /* ScriptWrappable.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2292B27C1356669400CF11EF /* ImageBufferDataCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2292B27B1356669400CF11EF /* ImageBufferDataCG.cpp */; };
</span><span class="lines">@@ -7734,6 +7736,8 @@
</span><span class="cx"> 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 20D629241253690B00081543 /* InspectorInstrumentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInstrumentation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 20D629251253690B00081543 /* InspectorInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInstrumentation.h; sourceTree = "<group>"; };
</span><ins>+ 225A16B30D5C11E900090295 /* WebEventRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEventRegion.h; sourceTree = "<group>"; };
+ 225A16B40D5C11E900090295 /* WebEventRegion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEventRegion.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 2277775F1345DEA9008EA455 /* InspectorForwarding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorForwarding.h; sourceTree = "<group>"; };
</span><span class="cx"> 228C284410D82500009D0D0E /* ScriptWrappable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptWrappable.h; sourceTree = "<group>"; };
</span><span class="cx"> 2292B27B1356669400CF11EF /* ImageBufferDataCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageBufferDataCG.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14584,6 +14588,8 @@
</span><span class="cx"> children = (
</span><span class="cx"> FE6938B51045D67E008EABB6 /* EventHandlerIOS.mm */,
</span><span class="cx"> FED13D3B0CEA936A00D89466 /* FrameIOS.mm */,
</span><ins>+ 225A16B30D5C11E900090295 /* WebEventRegion.h */,
+ 225A16B40D5C11E900090295 /* WebEventRegion.mm */,
</ins><span class="cx"> );
</span><span class="cx"> path = ios;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -25896,6 +25902,7 @@
</span><span class="cx"> 93EB169709F880C00091F8FF /* WebCoreSystemInterface.h in Headers */,
</span><span class="cx"> 37F818FD0D657606005E1F05 /* WebCoreURLResponse.h in Headers */,
</span><span class="cx"> 93F199F008245E59001E9ABC /* WebCoreView.h in Headers */,
</span><ins>+ 225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */,
</ins><span class="cx"> BC6DADEF0A195FDF00E5CD14 /* WebFontCache.h in Headers */,
</span><span class="cx"> A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */,
</span><span class="cx"> 07C59B5717F4AC15000FBCBB /* VideoStreamTrack.h in Headers */,
</span><span class="lines">@@ -29106,6 +29113,7 @@
</span><span class="cx"> 93EB169509F880B00091F8FF /* WebCoreSystemInterface.mm in Sources */,
</span><span class="cx"> 37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */,
</span><span class="cx"> 93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */,
</span><ins>+ 225A16B60D5C11E900090295 /* WebEventRegion.mm in Sources */,
</ins><span class="cx"> BC6DADFA0A19602B00E5CD14 /* WebFontCache.mm in Sources */,
</span><span class="cx"> C5278B0C17F212EA003A2998 /* PlatformPasteboardIOS.mm in Sources */,
</span><span class="cx"> 49C7B9C81042D32F0009D447 /* WebGLBuffer.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosWebEventRegionh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/page/ios/WebEventRegion.h (0 => 161806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/WebEventRegion.h (rev 0)
+++ trunk/Source/WebCore/page/ios/WebEventRegion.h 2014-01-12 16:09:49 UTC (rev 161806)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebEventRegion_h
+#define WebEventRegion_h
+
+#if ENABLE(TOUCH_EVENTS)
+
+#import <CoreGraphics/CGGeometry.h>
+#import <Foundation/NSObject.h>
+
+@interface WebEventRegion : NSObject <NSCopying>
+{
+ CGPoint p1, p2, p3, p4;
+}
+- (id)initWithPoints:(CGPoint)inP1 :(CGPoint)inP2 :(CGPoint)inP3 :(CGPoint)inP4;
+- (BOOL)hitTest:(CGPoint)point;
+@end
+
+#endif // ENABLE(TOUCH_EVENTS)
+
+#endif // WebEventRegion_h
</ins></span></pre></div>
<a id="trunkSourceWebCorepageiosWebEventRegionmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/page/ios/WebEventRegion.mm (0 => 161806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/WebEventRegion.mm (rev 0)
+++ trunk/Source/WebCore/page/ios/WebEventRegion.mm 2014-01-12 16:09:49 UTC (rev 161806)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+/*
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WebEventRegion.h"
+
+#if ENABLE(TOUCH_EVENTS)
+
+#import "FloatQuad.h"
+
+using namespace WebCore;
+
+@interface WebEventRegion(Private)
+- (FloatQuad)quad;
+@end
+
+@implementation WebEventRegion
+
+- (id)initWithPoints:(CGPoint)inP1 :(CGPoint)inP2 :(CGPoint)inP3 :(CGPoint)inP4
+{
+ if (!(self = [super init]))
+ return nil;
+
+ p1 = inP1;
+ p2 = inP2;
+ p3 = inP3;
+ p4 = inP4;
+ return self;
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+ UNUSED_PARAM(zone);
+ return [self retain];
+}
+
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"p1:{%g, %g} p2:{%g, %g} p3:{%g, %g} p4:{%g, %g}", p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y];
+}
+
+- (BOOL)hitTest:(CGPoint)point
+{
+ return [self quad].containsPoint(point);
+}
+
+- (BOOL)isEqual:(id)other
+{
+ return CGPointEqualToPoint(p1, ((WebEventRegion *)other)->p1) &&
+ CGPointEqualToPoint(p2, ((WebEventRegion *)other)->p2) &&
+ CGPointEqualToPoint(p3, ((WebEventRegion *)other)->p3) &&
+ CGPointEqualToPoint(p4, ((WebEventRegion *)other)->p4);
+}
+
+- (FloatQuad)quad
+{
+ return FloatQuad(p1, p2, p3, p4);
+}
+
+@end
+
+#endif // ENABLE(TOUCH_EVENTS)
</ins></span></pre>
</div>
</div>
</body>
</html>