<!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>[161728] 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/161728">161728</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 20:41:31 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix iOS build.
Generated DOMTouch* and DOMGesture* files need to be in the project.
Exclude them on Mac via EXCLUDED_SOURCE_FILE_NAMES_macosx.
Use TARGET_OS_IPHONE instead of TARGET_OS_EMBEDDED in DOMPrivate.h
* Configurations/WebCore.xcconfig:
* WebCore.xcodeproj/project.pbxproj:
* bindings/objc/DOMPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMPrivateh">trunk/Source/WebCore/bindings/objc/DOMPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161727 => 161728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 04:39:03 UTC (rev 161727)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 04:41:31 UTC (rev 161728)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-10 Simon Fraser <simon.fraser@apple.com>
+
+ Fix iOS build.
+
+ Generated DOMTouch* and DOMGesture* files need to be in the project.
+ Exclude them on Mac via EXCLUDED_SOURCE_FILE_NAMES_macosx.
+
+ Use TARGET_OS_IPHONE instead of TARGET_OS_EMBEDDED in DOMPrivate.h
+
+ * Configurations/WebCore.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/objc/DOMPrivate.h:
+
</ins><span class="cx"> 2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix RenderThemeIOS.o for iOS. Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (161727 => 161728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-01-11 04:39:03 UTC (rev 161727)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-01-11 04:41:31 UTC (rev 161728)
</span><span class="lines">@@ -114,4 +114,4 @@
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ClipboardMac.mm ColorMac.mm Cursor.cpp CursorMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KeyEventMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollingStateScrollingNodeMac.mm ScrollingTreeScrollingNodeMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WheelEventMac.mm WidgetMac.mm mac/LayerPool.mm DisplayRefreshMonitorMac.cpp;
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm DOMGestureEvent.mm DOMTouch.mm DOMTouchEvent.mm DOMTouchList.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h;
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161727 => 161728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-11 04:39:03 UTC (rev 161727)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-11 04:41:31 UTC (rev 161728)
</span><span class="lines">@@ -464,6 +464,17 @@
</span><span class="cx"> 0F3F0E59157030C3006DA57F /* RenderGeometryMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F3F0E57157030C3006DA57F /* RenderGeometryMap.cpp */; };
</span><span class="cx"> 0F3F0E5A157030C3006DA57F /* RenderGeometryMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F3F0E58157030C3006DA57F /* RenderGeometryMap.h */; };
</span><span class="cx"> 0F4E57171313276200CF85AF /* RenderSVGAllInOne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F4E57161313276200CF85AF /* RenderSVGAllInOne.cpp */; };
</span><ins>+ 0F54DCD51880F867003EEDBB /* DOMTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCCD1880F867003EEDBB /* DOMTouch.h */; };
+ 0F54DCD61880F867003EEDBB /* DOMTouch.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCCE1880F867003EEDBB /* DOMTouch.mm */; };
+ 0F54DCD71880F867003EEDBB /* DOMTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCCF1880F867003EEDBB /* DOMTouchEvent.h */; };
+ 0F54DCD81880F867003EEDBB /* DOMTouchEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCD01880F867003EEDBB /* DOMTouchEvent.mm */; };
+ 0F54DCD91880F867003EEDBB /* DOMTouchEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCD11880F867003EEDBB /* DOMTouchEventInternal.h */; };
+ 0F54DCDA1880F867003EEDBB /* DOMTouchInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCD21880F867003EEDBB /* DOMTouchInternal.h */; };
+ 0F54DCDB1880F867003EEDBB /* DOMTouchList.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCD31880F867003EEDBB /* DOMTouchList.h */; };
+ 0F54DCDC1880F867003EEDBB /* DOMTouchList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCD41880F867003EEDBB /* DOMTouchList.mm */; };
+ 0F54DCE01880F901003EEDBB /* DOMGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDD1880F901003EEDBB /* DOMGestureEvent.h */; };
+ 0F54DCE11880F901003EEDBB /* DOMGestureEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCDE1880F901003EEDBB /* DOMGestureEvent.mm */; };
+ 0F54DCE21880F901003EEDBB /* DOMGestureEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDF1880F901003EEDBB /* DOMGestureEventInternal.h */; };
</ins><span class="cx"> 0F56028F0E4B76580065B038 /* RenderMarquee.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F56028D0E4B76580065B038 /* RenderMarquee.h */; };
</span><span class="cx"> 0F5602900E4B76580065B038 /* RenderMarquee.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F56028E0E4B76580065B038 /* RenderMarquee.cpp */; };
</span><span class="cx"> 0F580B0C0F12A2690051D689 /* GraphicsLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F580B090F12A2690051D689 /* GraphicsLayer.cpp */; };
</span><span class="lines">@@ -7218,6 +7229,17 @@
</span><span class="cx"> 0F3F0E58157030C3006DA57F /* RenderGeometryMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderGeometryMap.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F4E57161313276200CF85AF /* RenderSVGAllInOne.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGAllInOne.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F54DCCC1880C6AB003EEDBB /* ios-encodings.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "ios-encodings.txt"; sourceTree = "<group>"; };
</span><ins>+ 0F54DCCD1880F867003EEDBB /* DOMTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTouch.h; sourceTree = "<group>"; };
+ 0F54DCCE1880F867003EEDBB /* DOMTouch.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMTouch.mm; sourceTree = "<group>"; };
+ 0F54DCCF1880F867003EEDBB /* DOMTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTouchEvent.h; sourceTree = "<group>"; };
+ 0F54DCD01880F867003EEDBB /* DOMTouchEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMTouchEvent.mm; sourceTree = "<group>"; };
+ 0F54DCD11880F867003EEDBB /* DOMTouchEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTouchEventInternal.h; sourceTree = "<group>"; };
+ 0F54DCD21880F867003EEDBB /* DOMTouchInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTouchInternal.h; sourceTree = "<group>"; };
+ 0F54DCD31880F867003EEDBB /* DOMTouchList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTouchList.h; sourceTree = "<group>"; };
+ 0F54DCD41880F867003EEDBB /* DOMTouchList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMTouchList.mm; sourceTree = "<group>"; };
+ 0F54DCDD1880F901003EEDBB /* DOMGestureEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMGestureEvent.h; path = "DOMGestureEvent.h"; sourceTree = "<group>"; };
+ 0F54DCDE1880F901003EEDBB /* DOMGestureEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DOMGestureEvent.mm; path = "DOMGestureEvent.mm"; sourceTree = "<group>"; };
+ 0F54DCDF1880F901003EEDBB /* DOMGestureEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMGestureEventInternal.h; path = "DOMGestureEventInternal.h"; sourceTree = "<group>"; };
</ins><span class="cx"> 0F56028D0E4B76580065B038 /* RenderMarquee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMarquee.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F56028E0E4B76580065B038 /* RenderMarquee.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMarquee.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F580B090F12A2690051D689 /* GraphicsLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayer.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16466,6 +16488,9 @@
</span><span class="cx"> 85AFA8210AAF528A00E84305 /* DOMEvent.mm */,
</span><span class="cx"> 85D2AD670AB1A40A00C313EA /* DOMEventListener.h */,
</span><span class="cx"> 8540751F0AD6C5FB00620C57 /* DOMEventTarget.h */,
</span><ins>+ 0F54DCDD1880F901003EEDBB /* DOMGestureEvent.h */,
+ 0F54DCDE1880F901003EEDBB /* DOMGestureEvent.mm */,
+ 0F54DCDF1880F901003EEDBB /* DOMGestureEventInternal.h */,
</ins><span class="cx"> 85FF31580AAFBFCB00374F38 /* DOMKeyboardEvent.h */,
</span><span class="cx"> 85FF31590AAFBFCB00374F38 /* DOMKeyboardEvent.mm */,
</span><span class="cx"> 75793ED00D0CE85B007FC0AC /* DOMMessageEvent.h */,
</span><span class="lines">@@ -16484,6 +16509,14 @@
</span><span class="cx"> BCC573340D695BBE006EF517 /* DOMProgressEvent.mm */,
</span><span class="cx"> 933A14750B7D1BAF00A53FFD /* DOMTextEvent.h */,
</span><span class="cx"> 933A14A90B7D1D0900A53FFD /* DOMTextEvent.mm */,
</span><ins>+ 0F54DCCD1880F867003EEDBB /* DOMTouch.h */,
+ 0F54DCCE1880F867003EEDBB /* DOMTouch.mm */,
+ 0F54DCCF1880F867003EEDBB /* DOMTouchEvent.h */,
+ 0F54DCD01880F867003EEDBB /* DOMTouchEvent.mm */,
+ 0F54DCD11880F867003EEDBB /* DOMTouchEventInternal.h */,
+ 0F54DCD21880F867003EEDBB /* DOMTouchInternal.h */,
+ 0F54DCD31880F867003EEDBB /* DOMTouchList.h */,
+ 0F54DCD41880F867003EEDBB /* DOMTouchList.mm */,
</ins><span class="cx"> E145349416A9BB6A000F6FD2 /* DOMTransitionEvent.h */,
</span><span class="cx"> E145349516A9BB6A000F6FD2 /* DOMTransitionEvent.mm */,
</span><span class="cx"> E145349616A9BB6A000F6FD2 /* DOMTransitionEventInternal.h */,
</span><span class="lines">@@ -23032,6 +23065,7 @@
</span><span class="cx"> A80E73520A199C77007FB8C5 /* CSSSelector.h in Headers */,
</span><span class="cx"> 26B999971804D54200D01121 /* SelectorCompiler.h in Headers */,
</span><span class="cx"> E4C1789B0EE6903800824D69 /* CSSSelectorList.h in Headers */,
</span><ins>+ 0F54DCD51880F867003EEDBB /* DOMTouch.h in Headers */,
</ins><span class="cx"> A80E6CE80A1989CA007FB8C5 /* CSSShadowValue.h in Headers */,
</span><span class="cx"> A80E6E0F0A19911C007FB8C5 /* CSSStyleDeclaration.h in Headers */,
</span><span class="cx"> A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */,
</span><span class="lines">@@ -23134,6 +23168,7 @@
</span><span class="cx"> 31FB1A5B120A5D0600DC02A0 /* DeviceMotionData.h in Headers */,
</span><span class="cx"> 31FB1A5D120A5D0600DC02A0 /* DeviceMotionEvent.h in Headers */,
</span><span class="cx"> A14832C3187F65DF00DA63A6 /* WKUtilities.h in Headers */,
</span><ins>+ 0F54DCDB1880F867003EEDBB /* DOMTouchList.h in Headers */,
</ins><span class="cx"> E1C6571F1816E50300256CDD /* CryptoAlgorithmHmacParams.h in Headers */,
</span><span class="cx"> 59A8F1D811A69520001AC34A /* DeviceOrientationClient.h in Headers */,
</span><span class="cx"> 59309A1311F4AE6A00250603 /* DeviceOrientationClientMock.h in Headers */,
</span><span class="lines">@@ -23453,6 +23488,7 @@
</span><span class="cx"> BC53DA601143141A000D817E /* DOMObjectHashTableMap.h in Headers */,
</span><span class="cx"> FED13D2A0CEA91DF00D89466 /* DOMUIKitExtensions.h in Headers */,
</span><span class="cx"> 85C7F5D00AAFB8D9004014DD /* DOMOverflowEvent.h in Headers */,
</span><ins>+ 0F54DCE21880F901003EEDBB /* DOMGestureEventInternal.h in Headers */,
</ins><span class="cx"> 85989DCF0ACC8BBD00A0BC51 /* DOMOverflowEventInternal.h in Headers */,
</span><span class="cx"> E1284BD61044A01E00EAEB52 /* DOMPageTransitionEvent.h in Headers */,
</span><span class="cx"> 1ACE53E80A8D18E70022947D /* DOMParser.h in Headers */,
</span><span class="lines">@@ -24230,6 +24266,7 @@
</span><span class="cx"> E1AD14231295EA7F00ACA989 /* JSHTMLInputElementCustom.h in Headers */,
</span><span class="cx"> A6148A7912E41E3B0044A784 /* JSHTMLKeygenElement.h in Headers */,
</span><span class="cx"> 1AE2AB220A1CE63B00B42B25 /* JSHTMLLabelElement.h in Headers */,
</span><ins>+ 0F54DCD91880F867003EEDBB /* DOMTouchEventInternal.h in Headers */,
</ins><span class="cx"> 1C21E57D183ED1FF001C289D /* ImageBufferBackingStoreCache.h in Headers */,
</span><span class="cx"> 1AE2AB240A1CE63B00B42B25 /* JSHTMLLegendElement.h in Headers */,
</span><span class="cx"> 1AE2AB260A1CE63B00B42B25 /* JSHTMLLIElement.h in Headers */,
</span><span class="lines">@@ -24534,6 +24571,7 @@
</span><span class="cx"> B2FA3E090AB75A6F000E5AC4 /* JSSVGTitleElement.h in Headers */,
</span><span class="cx"> B2FA3E0B0AB75A6F000E5AC4 /* JSSVGTransform.h in Headers */,
</span><span class="cx"> 070363D7181A146500C074A5 /* MediaStreamSourceStates.h in Headers */,
</span><ins>+ 0F54DCDA1880F867003EEDBB /* DOMTouchInternal.h in Headers */,
</ins><span class="cx"> B2FA3E0D0AB75A6F000E5AC4 /* JSSVGTransformList.h in Headers */,
</span><span class="cx"> 07277E4F17D018CC0015534D /* JSMediaStreamAudioDestinationNode.h in Headers */,
</span><span class="cx"> B2FA3E0F0AB75A6F000E5AC4 /* JSSVGTRefElement.h in Headers */,
</span><span class="lines">@@ -25700,6 +25738,7 @@
</span><span class="cx"> 93309E18099E64920056E581 /* TextGranularity.h in Headers */,
</span><span class="cx"> F55B3DDA1251F12D003EF269 /* TextInputType.h in Headers */,
</span><span class="cx"> CECADFCE1537791D00E37068 /* TextInsertionBaseCommand.h in Headers */,
</span><ins>+ 0F54DCE01880F901003EEDBB /* DOMGestureEvent.h in Headers */,
</ins><span class="cx"> 93309E1C099E64920056E581 /* TextIterator.h in Headers */,
</span><span class="cx"> BCEF45E90E687767001C1287 /* TextMetrics.h in Headers */,
</span><span class="cx"> 930FC68A1072B9280045293E /* TextRenderingMode.h in Headers */,
</span><span class="lines">@@ -26001,6 +26040,7 @@
</span><span class="cx"> 07C59B7217F79C7C000FBCBB /* JSMediaSourceStates.h in Headers */,
</span><span class="cx"> 83C1D42B178D5AB400141E68 /* SVGPathSegCurvetoQuadraticAbs.h in Headers */,
</span><span class="cx"> 83C1D42C178D5AB500141E68 /* SVGPathSegCurvetoQuadraticRel.h in Headers */,
</span><ins>+ 0F54DCD71880F867003EEDBB /* DOMTouchEvent.h in Headers */,
</ins><span class="cx"> 83C1D42D178D5AB500141E68 /* SVGPathSegCurvetoQuadraticSmoothAbs.h in Headers */,
</span><span class="cx"> 83C1D42E178D5AB500141E68 /* SVGPathSegCurvetoQuadraticSmoothRel.h in Headers */,
</span><span class="cx"> 83C1D42F178D5AB500141E68 /* SVGPathSegLinetoAbs.h in Headers */,
</span><span class="lines">@@ -26388,6 +26428,7 @@
</span><span class="cx"> FD629EA4154B47160006D026 /* AudioBasicInspectorNode.cpp in Sources */,
</span><span class="cx"> FD315FF612B0267600C1A359 /* AudioBasicProcessorNode.cpp in Sources */,
</span><span class="cx"> FD315FF812B0267600C1A359 /* AudioBuffer.cpp in Sources */,
</span><ins>+ 0F54DCD61880F867003EEDBB /* DOMTouch.mm in Sources */,
</ins><span class="cx"> FD315FFB12B0267600C1A359 /* AudioBufferSourceNode.cpp in Sources */,
</span><span class="cx"> FD31607B12B026F700C1A359 /* AudioBus.cpp in Sources */,
</span><span class="cx"> FD3160BB12B0272A00C1A359 /* AudioBusMac.mm in Sources */,
</span><span class="lines">@@ -26703,6 +26744,7 @@
</span><span class="cx"> 59D1C10411EB5DCF00B638C8 /* DeviceOrientationData.cpp in Sources */,
</span><span class="cx"> 59A85EA2119D68D900DEF1EF /* DeviceOrientationEvent.cpp in Sources */,
</span><span class="cx"> CD37B39815C1B971006DC898 /* DiagnosticLoggingKeys.cpp in Sources */,
</span><ins>+ 0F54DCDC1880F867003EEDBB /* DOMTouchList.mm in Sources */,
</ins><span class="cx"> CECADFC6153778FF00E37068 /* DictationAlternative.cpp in Sources */,
</span><span class="cx"> CECADFC8153778FF00E37068 /* DictationCommand.cpp in Sources */,
</span><span class="cx"> 312D67B11535691F00563D0D /* Dictionary.cpp in Sources */,
</span><span class="lines">@@ -28260,6 +28302,7 @@
</span><span class="cx"> B27535640B053814002CE64F /* PDFDocumentImage.cpp in Sources */,
</span><span class="cx"> 8A7CC97012076F8A001D4588 /* PendingScript.cpp in Sources */,
</span><span class="cx"> E526AF3F1727F8F200E41781 /* Performance.cpp in Sources */,
</span><ins>+ 0F54DCD81880F867003EEDBB /* DOMTouchEvent.mm in Sources */,
</ins><span class="cx"> 07DC5FD417D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp in Sources */,
</span><span class="cx"> 86BE340315058CB200CE0FD8 /* PerformanceEntryList.cpp in Sources */,
</span><span class="cx"> 8AF4E55511DC5A36000ED3DE /* PerformanceNavigation.cpp in Sources */,
</span><span class="lines">@@ -28558,6 +28601,7 @@
</span><span class="cx"> E1C2F24A1533A2120083F974 /* SettingsMac.mm in Sources */,
</span><span class="cx"> E1233F0C185A3E3B008DFAF5 /* CryptoAlgorithmRSAES_PKCS1_v1_5.cpp in Sources */,
</span><span class="cx"> 0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */,
</span><ins>+ 0F54DCE11880F901003EEDBB /* DOMGestureEvent.mm in Sources */,
</ins><span class="cx"> BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,
</span><span class="cx"> A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,
</span><span class="cx"> FD45A953175D3FB800C21EC8 /* Shape.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMPrivate.h (161727 => 161728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMPrivate.h 2014-01-11 04:39:03 UTC (rev 161727)
+++ trunk/Source/WebCore/bindings/objc/DOMPrivate.h 2014-01-11 04:41:31 UTC (rev 161728)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx">
</span><span class="cx"> #import <WebCore/DOM.h>
</span><span class="cx">
</span><del>-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
</del><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> #import <WebCore/WebAutocapitalize.h>
</span><span class="cx"> #import <CoreText/CoreText.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface DOMNode (DOMNodeExtensionsPendingPublic)
</span><del>-#if !defined(TARGET_OS_EMBEDDED) || !TARGET_OS_EMBEDDED
</del><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSImage *)renderedImage;
</span><span class="cx"> #endif
</span><span class="cx"> - (NSArray *)textRects;
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> // FIXME: this should be removed as soon as all internal Apple uses of it have been replaced with
</span><span class="cx"> // calls to the public method - (NSColor *)color.
</span><span class="cx"> @interface DOMRGBColor (WebPrivate)
</span><del>-#if !defined(TARGET_OS_EMBEDDED) || !TARGET_OS_EMBEDDED
</del><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSColor *)_color;
</span><span class="cx"> #endif
</span><span class="cx"> @end
</span><span class="lines">@@ -57,12 +57,12 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMRange (DOMRangeExtensions)
</span><del>-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
</del><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> - (CGRect)boundingBox;
</span><span class="cx"> #else
</span><span class="cx"> - (NSRect)boundingBox;
</span><span class="cx"> #endif
</span><del>-#if !defined(TARGET_OS_EMBEDDED) || !TARGET_OS_EMBEDDED
</del><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSImage *)renderedImageForcingBlackText:(BOOL)forceBlackText;
</span><span class="cx"> #else
</span><span class="cx"> - (CGImageRef)renderedImageForcingBlackText:(BOOL)forceBlackText;
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMElement (WebPrivate)
</span><del>-#if !defined(TARGET_OS_EMBEDDED) || !TARGET_OS_EMBEDDED
</del><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSFont *)_font;
</span><span class="cx"> - (NSData *)_imageTIFFRepresentation;
</span><span class="cx"> #else
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> @interface DOMHTMLInputElement (FormAutoFillTransition)
</span><span class="cx"> - (BOOL)_isAutofilled;
</span><span class="cx"> - (BOOL)_isTextField;
</span><del>-#if !defined(TARGET_OS_EMBEDDED) || !TARGET_OS_EMBEDDED
</del><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSRect)_rectOnScreen; // bounding box of the text field, in screen coordinates
</span><span class="cx"> #endif
</span><span class="cx"> - (void)_replaceCharactersInRange:(NSRange)targetRange withString:(NSString *)replacementString selectingFromIndex:(int)index;
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> - (void)_activateItemAtIndex:(int)index allowMultipleSelection:(BOOL)allowMultipleSelection;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
</del><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> enum { WebMediaQueryOrientationCurrent, WebMediaQueryOrientationPortrait, WebMediaQueryOrientationLandscape };
</span><span class="cx"> @interface DOMHTMLLinkElement (WebPrivate)
</span><span class="cx"> - (BOOL)_mediaQueryMatchesForOrientation:(int)orientation;
</span></span></pre>
</div>
</div>
</body>
</html>