<!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>[176910] 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/176910">176910</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-06 13:04:35 -0800 (Sat, 06 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix build with newer versions of clang.
rdar://problem/18978689
Disable the "inconsistent missing override" warning due to our use of macros in SVG where it's hard to
know whether we can add an override or not.
Also, cast return values of +alloc to the right type, and add some casts for vector iterator arithmetic.
* Configurations/Base.xcconfig:
* Modules/webdatabase/DatabaseBackendBase.cpp:
(WebCore::guidForOriginAndName):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _stringForRange:attributed:]):
* editing/cocoa/HTMLConverter.mm:
(_shadowForShadowStyle):
(HTMLConverter::_addTableForElement):
* platform/graphics/SVGGlyph.cpp:
(WebCore::isCompatibleArabicForm):
* platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
(WebCore::AudioSourceProviderAVFObjC::createMix):
* platform/graphics/mac/FontMac.mm:
(WebCore::showLetterpressedGlyphsWithAdvances):
* platform/ios/PlatformSpeechSynthesizerIOS.mm:
(-[WebSpeechSynthesisWrapper speakUtterance:]):
* platform/ios/WebCoreMotionManager.mm:
(-[WebCoreMotionManager initializeOnMainThread]):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::spannedRows):
(WebCore::RenderTableSection::spannedColumns):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsBasexcconfig">trunk/Source/WebCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSVGGlyphcpp">trunk/Source/WebCore/platform/graphics/SVGGlyph.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontMacmm">trunk/Source/WebCore/platform/graphics/mac/FontMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm">trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreMotionManagermm">trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/ChangeLog 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-12-06 Anders Carlsson <andersca@apple.com>
+
+ Fix build with newer versions of clang.
+ rdar://problem/18978689
+
+ Disable the "inconsistent missing override" warning due to our use of macros in SVG where it's hard to
+ know whether we can add an override or not.
+
+ Also, cast return values of +alloc to the right type, and add some casts for vector iterator arithmetic.
+
+ * Configurations/Base.xcconfig:
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ (WebCore::guidForOriginAndName):
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper _stringForRange:attributed:]):
+ * editing/cocoa/HTMLConverter.mm:
+ (_shadowForShadowStyle):
+ (HTMLConverter::_addTableForElement):
+ * platform/graphics/SVGGlyph.cpp:
+ (WebCore::isCompatibleArabicForm):
+ * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
+ (WebCore::AudioSourceProviderAVFObjC::createMix):
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::showLetterpressedGlyphsWithAdvances):
+ * platform/ios/PlatformSpeechSynthesizerIOS.mm:
+ (-[WebSpeechSynthesisWrapper speakUtterance:]):
+ * platform/ios/WebCoreMotionManager.mm:
+ (-[WebCoreMotionManager initializeOnMainThread]):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::spannedRows):
+ (WebCore::RenderTableSection::spannedColumns):
+
</ins><span class="cx"> 2014-12-06 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Compile error, missing guard.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><span class="cx"> LINKER_DISPLAYS_MANGLED_NAMES = YES;
</span><span class="cx"> PREBINDING = NO;
</span><del>-WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</del><ins>+WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-inconsistent-missing-override;
</ins><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -182,7 +182,6 @@
</span><span class="cx"> {
</span><span class="cx"> String stringID = origin + "/" + name;
</span><span class="cx">
</span><del>- typedef HashMap<String, int> IDGuidMap;
</del><span class="cx"> static NeverDestroyed<HashMap<String, int>> map;
</span><span class="cx"> DatabaseGuid guid = map.get().get(stringID);
</span><span class="cx"> if (!guid) {
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -2040,7 +2040,7 @@
</span><span class="cx">
</span><span class="cx"> NSArray* array = [self arrayOfTextForTextMarkers:[NSArray arrayWithObjects:startMarker, endMarker, nil] attributed:attributed];
</span><span class="cx"> Class returnClass = attributed ? [NSMutableAttributedString class] : [NSMutableString class];
</span><del>- id returnValue = [[[returnClass alloc] init] autorelease];
</del><ins>+ id returnValue = [[(NSString *)[returnClass alloc] init] autorelease];
</ins><span class="cx">
</span><span class="cx"> NSInteger count = [array count];
</span><span class="cx"> for (NSInteger k = 0; k < count; ++k) {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> - (void)setHyphenationFactor:(float)aFactor;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface NSShadow
</del><ins>+@interface NSShadow : NSObject
</ins><span class="cx"> - (void)setShadowOffset:(CGSize)size;
</span><span class="cx"> - (void)setShadowBlurRadius:(CGFloat)radius;
</span><span class="cx"> - (void)setShadowColor:(UIColor *)color;
</span><span class="lines">@@ -1001,7 +1001,7 @@
</span><span class="cx"> if (!spaceRange.length)
</span><span class="cx"> spaceRange = NSMakeRange(0, 0);
</span><span class="cx"> shadowBlurRadius = [[shadowStyle substringWithRange:NSMakeRange(NSMaxRange(spaceRange), thirdRange.location - NSMaxRange(spaceRange))] floatValue];
</span><del>- shadow = [[[PlatformNSShadow alloc] init] autorelease];
</del><ins>+ shadow = [[(NSShadow *)[PlatformNSShadow alloc] init] autorelease];
</ins><span class="cx"> [shadow setShadowColor:shadowColor];
</span><span class="cx"> [shadow setShadowOffset:shadowOffset];
</span><span class="cx"> [shadow setShadowBlurRadius:shadowBlurRadius];
</span><span class="lines">@@ -1830,7 +1830,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLConverter::_addTableForElement(Element *tableElement)
</span><span class="cx"> {
</span><del>- RetainPtr<NSTextTable> table = adoptNS([[PlatformNSTextTable alloc] init]);
</del><ins>+ RetainPtr<NSTextTable> table = adoptNS([(NSTextTable *)[PlatformNSTextTable alloc] init]);
</ins><span class="cx"> CGFloat cellSpacingVal = 1;
</span><span class="cx"> CGFloat cellPaddingVal = 1;
</span><span class="cx"> [table setNumberOfColumns:1];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSVGGlyphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SVGGlyph.cpp (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SVGGlyph.cpp 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/platform/graphics/SVGGlyph.cpp 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> Vector<SVGGlyph::ArabicForm>::const_iterator realEnd = chars.end();
</span><del>- Vector<SVGGlyph::ArabicForm>::const_iterator it = chars.begin() + startPosition;
</del><ins>+ Vector<SVGGlyph::ArabicForm>::const_iterator it = chars.begin() + static_cast<int>(startPosition);
</ins><span class="cx"> if (it >= realEnd)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- Vector<SVGGlyph::ArabicForm>::const_iterator end = chars.begin() + endPosition;
</del><ins>+ Vector<SVGGlyph::ArabicForm>::const_iterator end = chars.begin() + static_cast<int>(endPosition);
</ins><span class="cx"> if (end >= realEnd)
</span><span class="cx"> end = realEnd;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> ASSERT(m_avPlayerItem);
</span><span class="cx"> ASSERT(m_client);
</span><span class="cx">
</span><del>- m_avAudioMix = adoptNS([[getAVMutableAudioMixClass() alloc] init]);
</del><ins>+ m_avAudioMix = adoptNS([(AVMutableAudioMix *)[getAVMutableAudioMixClass() alloc] init]);
</ins><span class="cx">
</span><span class="cx"> MTAudioProcessingTapCallbacks callbacks = {
</span><span class="cx"> 0,
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> ASSERT(tap);
</span><span class="cx"> ASSERT(m_tap == tap);
</span><span class="cx">
</span><del>- RetainPtr<AVMutableAudioMixInputParameters> parameters = adoptNS([[getAVMutableAudioMixInputParametersClass() alloc] init]);
</del><ins>+ RetainPtr<AVMutableAudioMixInputParameters> parameters = adoptNS([(AVMutableAudioMixInputParameters *)[getAVMutableAudioMixInputParametersClass() alloc] init]);
</ins><span class="cx"> [parameters setAudioTapProcessor:m_tap.get()];
</span><span class="cx">
</span><span class="cx"> CMPersistentTrackID firstEnabledAudioTrackID = kCMPersistentTrackID_Invalid;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> static CUIStyleEffectConfiguration *styleConfiguration;
</span><span class="cx"> if (!styleConfiguration) {
</span><del>- styleConfiguration = [[getCUIStyleEffectConfigurationClass() alloc] init];
</del><ins>+ styleConfiguration = [(CUIStyleEffectConfiguration *)[getCUIStyleEffectConfigurationClass() alloc] init];
</ins><span class="cx"> styleConfiguration.useSimplifiedEffect = YES;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_synthesizer) {
</span><del>- m_synthesizer = adoptNS([[AVSpeechSynthesizerClass alloc] init]);
</del><ins>+ m_synthesizer = adoptNS([(AVSpeechSynthesizer *)[AVSpeechSynthesizerClass alloc] init]);
</ins><span class="cx"> [m_synthesizer setDelegate:self];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreMotionManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -138,9 +138,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!WebThreadIsCurrent());
</span><span class="cx">
</span><del>-#define CMMotionManager getCMMotionManagerClass()
- m_motionManager = [[CMMotionManager alloc] init];
-#undef CMMotionManager
</del><ins>+ m_motionManager = [(CMMotionManager *)[getCMMotionManagerClass() alloc] init];
</ins><span class="cx">
</span><span class="cx"> m_gyroAvailable = m_motionManager.deviceMotionAvailable;
</span><span class="cx">
</span><span class="lines">@@ -149,10 +147,8 @@
</span><span class="cx"> else
</span><span class="cx"> m_motionManager.accelerometerUpdateInterval = kMotionUpdateInterval;
</span><span class="cx">
</span><del>-#define CLLocationManager getCLLocationManagerClass()
- m_locationManager = [[CLLocationManager alloc] init];
- m_headingAvailable = [CLLocationManager headingAvailable];
-#undef CLLocationManager
</del><ins>+ m_locationManager = [(CLLocationManager *)[getCLLocationManagerClass() alloc] init];
+ m_headingAvailable = [getCLLocationManagerClass() headingAvailable];
</ins><span class="cx">
</span><span class="cx"> [self checkClientStatus];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (176909 => 176910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2014-12-06 21:04:31 UTC (rev 176909)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2014-12-06 21:04:35 UTC (rev 176910)
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx"> if (m_rowPos[nextRow] >= flippedRect.maxY())
</span><span class="cx"> endRow = nextRow;
</span><span class="cx"> else {
</span><del>- endRow = std::upper_bound(m_rowPos.begin() + nextRow, m_rowPos.end(), flippedRect.maxY()) - m_rowPos.begin();
</del><ins>+ endRow = std::upper_bound(m_rowPos.begin() + static_cast<int32_t>(nextRow), m_rowPos.end(), flippedRect.maxY()) - m_rowPos.begin();
</ins><span class="cx"> if (endRow == m_rowPos.size())
</span><span class="cx"> endRow = m_rowPos.size() - 1;
</span><span class="cx"> }
</span><span class="lines">@@ -1114,7 +1114,7 @@
</span><span class="cx"> if (columnPos[nextColumn] >= flippedRect.maxX())
</span><span class="cx"> endColumn = nextColumn;
</span><span class="cx"> else {
</span><del>- endColumn = std::upper_bound(columnPos.begin() + nextColumn, columnPos.end(), flippedRect.maxX()) - columnPos.begin();
</del><ins>+ endColumn = std::upper_bound(columnPos.begin() + static_cast<int32_t>(nextColumn), columnPos.end(), flippedRect.maxX()) - columnPos.begin();
</ins><span class="cx"> if (endColumn == columnPos.size())
</span><span class="cx"> endColumn = columnPos.size() - 1;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>