<!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>[165953] trunk/Source</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/165953">165953</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 01:28:32 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre> Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/165944">r165944</a>. Build break.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHTMLConvertermm">trunk/Source/WebCore/platform/mac/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextiosLocalizedDateCachemm">trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformtextmacLocaleMacmm">trunk/Source/WebCore/platform/text/mac/LocaleMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistorymm">trunk/Source/WebKit/mac/History/WebHistory.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginControllerh">trunk/Source/WebKit/mac/Plugins/WebPluginController.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginControllermm">trunk/Source/WebKit/mac/Plugins/WebPluginController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -3234,6 +3234,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && PLATFORM(IOS)
</span><ins>+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit11setDurationEd
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenEv
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14setCurrentTimeEdd
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit15enterFullscreenER7CALayer
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit18setVideoDimensionsEbff
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit26setWebVideoFullscreenModelEPNS_23WebVideoFullscreenModelE
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit7setRateEbf
+__ZN7WebCore32WebVideoFullscreenInterfaceAVKitC2Ev
</ins><span class="cx"> __ZN7WebCore35WebVideoFullscreenModelMediaElement10seekToTimeEd
</span><span class="cx"> __ZN7WebCore35WebVideoFullscreenModelMediaElement11handleEventEPNS_22ScriptExecutionContextEPNS_5EventE
</span><span class="cx"> __ZN7WebCore35WebVideoFullscreenModelMediaElement15setMediaElementEPNS_16HTMLMediaElementE
</span><span class="lines">@@ -3248,23 +3257,11 @@
</span><span class="cx"> __ZN7WebCore35WebVideoFullscreenModelMediaElementD2Ev
</span><span class="cx"> __ZNK7WebCore16HTMLVideoElement10videoWidthEv
</span><span class="cx"> __ZNK7WebCore16HTMLVideoElement11videoHeightEv
</span><ins>+__ZTVN7WebCore32WebVideoFullscreenInterfaceAVKitE
</ins><span class="cx"> __ZTVN7WebCore35WebVideoFullscreenModelMediaElementE
</span><span class="cx"> __ZThn?_N7WebCore35WebVideoFullscreenModelMediaElement11handleEventEPNS_22ScriptExecutionContextEPNS_5EventE
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit11setDurationEd
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenEv
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14setCurrentTimeEdd
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit15enterFullscreenER7CALayer
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit18setVideoDimensionsEbff
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit26setWebVideoFullscreenModelEPNS_23WebVideoFullscreenModelE
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit7setRateEbf
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKitC2Ev
-__ZTVN7WebCore32WebVideoFullscreenInterfaceAVKitE
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> __ZN7WebCore9PageGroup18captionPreferencesEv
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -37,31 +37,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-
-@implementation WebVideoFullscreenController
-- (void)setMediaElement:(WebCore::HTMLMediaElement*)mediaElement
-{
- UNUSED_PARAM(mediaElement);
-}
-
-- (WebCore::HTMLMediaElement*)mediaElement
-{
- return nullptr;
-}
-
-- (void)enterFullscreen:(UIScreen *)screen
-{
- UNUSED_PARAM(screen);
-}
-
-- (void)exitFullscreen
-{
-}
-@end
-
-#else
-
</del><span class="cx"> @interface WebVideoFullscreenController (FullscreenObservation)
</span><span class="cx"> - (void)didEnterFullscreen;
</span><span class="cx"> - (void)didExitFullscreen;
</span><span class="lines">@@ -152,6 +127,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-
-#endif // PLATFORM(IOS)
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef WebVideoFullscreenInterfaceAVKit_h
</span><span class="cx"> #define WebVideoFullscreenInterfaceAVKit_h
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/EventListener.h>
</span><span class="cx"> #include <WebCore/HTMLMediaElement.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #import "WebVideoFullscreenInterfaceAVKit.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HTMLConverter.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -1566,7 +1566,7 @@
</span><span class="cx"> return nil;
</span><span class="cx"> [dateComponents setSecond:component];
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> NSString *calendarIdentifier = NSCalendarIdentifierGregorian;
</span><span class="cx"> #else
</span><span class="cx"> NSString *calendarIdentifier = NSGregorianCalendar;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
</del><ins>+#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
</ins><span class="cx"> enum {
</span><span class="cx"> CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
</span><span class="cx"> };
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool secure = url.protocolIs("https");
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100)
</ins><span class="cx"> return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
</span><span class="cx"> #else
</span><span class="cx"> // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextiosLocalizedDateCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -156,11 +156,7 @@
</span><span class="cx"> // typically all equally wide. Force UTC timezone for the test date below so the
</span><span class="cx"> // date doesn't adjust for the current timezone. This is an arbitrary date
</span><span class="cx"> // (x-27-2007) and time (10:45 PM).
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</del><span class="cx"> RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]);
</span><del>-#else
- RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]);
-#endif
</del><span class="cx"> [gregorian.get() setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
</span><span class="cx"> RetainPtr<NSDateComponents> components = adoptNS([[NSDateComponents alloc] init]);
</span><span class="cx"> [components.get() setDay:27];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextmacLocaleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/mac/LocaleMac.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/mac/LocaleMac.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebCore/platform/text/mac/LocaleMac.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> LocaleMac::LocaleMac(NSLocale* locale)
</span><span class="cx"> : m_locale(locale)
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]))
</span><span class="cx"> #else
</span><span class="cx"> , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]))
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-03-20 Lucas Forschler <lforschler@apple.com>
+
+ Rollout r165944. Build break.
+
</ins><span class="cx"> 2014-03-19 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Get code to compile on older iOS versions
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> static void getDayBoundaries(NSTimeInterval interval, NSTimeInterval& beginningOfDay, NSTimeInterval& beginningOfNextDay)
</span><span class="cx"> {
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> NSDate *date = [NSDate dateWithTimeIntervalSinceReferenceDate:interval];
</span><span class="cx">
</span><span class="cx"> NSCalendar *calendar = [NSCalendar calendarWithIdentifier:NSCalendarIdentifierGregorian];
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.h (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -50,11 +50,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-+ (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
-#else
</del><span class="cx"> - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
</span><del>-#endif
</del><span class="cx"> + (BOOL)isPlugInView:(NSView *)view;
</span><span class="cx">
</span><span class="cx"> - (id)initWithDocumentView:(NSView *)view;
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -140,23 +140,6 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebPluginController
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-+ (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
-{
- initializeAudioSession();
- [pluginPackage load];
- Class viewFactory = [pluginPackage viewFactory];
-
- id view = nil;
-
- if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
- JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
- view = [viewFactory plugInViewWithArguments:arguments];
- }
-
- return view;
-}
-#else
</del><span class="cx"> - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -195,7 +178,6 @@
</span><span class="cx">
</span><span class="cx"> return view;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> + (void)addPlugInView:(NSView *)view
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -1780,10 +1780,6 @@
</span><span class="cx"> LOG(Plugins, "arguments:\n%@", arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
- view = [WebPluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
- [attributes release];
-#else
</del><span class="cx"> view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
</span><span class="cx"> [attributes release];
</span><span class="cx">
</span><span class="lines">@@ -1795,8 +1791,6 @@
</span><span class="cx"> if (node->hasTagName(HTMLNames::videoTag) || node->hasTagName(HTMLNames::audioTag))
</span><span class="cx"> [pluginController mediaPlugInProxyViewCreated:view];
</span><span class="cx"> #endif
</span><del>-#endif
-
</del><span class="cx"> return view;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -1168,12 +1168,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-- (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag
-{
-}
-#endif
-
</del><span class="cx"> - (BOOL)isDNSPrefetchingEnabled
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitDNSPrefetchingEnabledPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (165952 => 165953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-03-20 07:56:38 UTC (rev 165952)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-03-20 08:28:32 UTC (rev 165953)
</span><span class="lines">@@ -441,8 +441,4 @@
</span><span class="cx"> - (void)setImageControlsEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)imageControlsEnabled;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-- (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;
-#endif
-
</del><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>