<!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>[168401] branches/safari-537.60-branch/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/168401">168401</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 19:29:01 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/165753">r165753</a> & <a href="http://trac.webkit.org/projects/webkit/changeset/165832">r165832</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53760branchSourceWebCoreChangeLog">branches/safari-537.60-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebCorehtmlHTMLAttributeNamesin">branches/safari-537.60-branch/Source/WebCore/html/HTMLAttributeNames.in</a></li>
<li><a href="#branchessafari53760branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari53760branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#branchessafari53760branchSourceWebCorepageSettingsin">branches/safari-537.60-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreplatformgraphicsMediaPlayerh">branches/safari-537.60-branch/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationcfAVFoundationCFSoftLinkingh">branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#branchessafari53760branchSourceWebKitmacChangeLog">branches/safari-537.60-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh">branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKitmacWebViewWebPreferencesmm">branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#branchessafari53760branchSourceWebKitmacWebViewWebPreferencesPrivateh">branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKitmacWebViewWebViewmm">branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinChangeLog">branches/safari-537.60-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinInterfacesIWebPreferencesPrivateidl">branches/safari-537.60-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinWebPreferenceKeysPrivateh">branches/safari-537.60-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinWebPreferencescpp">branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinWebPreferencesh">branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinWebViewcpp">branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#branchessafari53760branchSourceWebKit2ChangeLog">branches/safari-537.60-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebKit2SharedWebPreferencesStoreh">branches/safari-537.60-branch/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKit2UIProcessAPICWKPreferencescpp">branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#branchessafari53760branchSourceWebKit2UIProcessAPICWKPreferencesPrivateh">branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-537.60-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53760branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-05-06 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165790 (165753)
+
+ 2014-03-16 Brent Fulgham <bfulgham@apple.com>
+
+ Provide preference to enable additional AVFoundation options
+ https://bugs.webkit.org/show_bug.cgi?id=130275
+
+ Reviewed by Eric Carlson.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::doesHaveAttribute): Added.
+ * html/HTMLMediaElement.h:
+ * page/Settings.in: Add new attribute.
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::doesHaveAttribute): Added stub to call private player object's
+ implementation of doesHaveAttribute.
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::doesHaveAttribute):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::AVFWrapper::createAssetForURL): Check the <media> object,
+ and notify AVFoundationCF to use URI option if relevant.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL): Check the <media> object,
+ and notify AVFoundation to use URI option if relevant.
+
</ins><span class="cx"> 2014-02-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r164660
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCorehtmlHTMLAttributeNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/html/HTMLAttributeNames.in (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/html/HTMLAttributeNames.in 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/html/HTMLAttributeNames.in 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -307,6 +307,7 @@
</span><span class="cx"> sortable
</span><span class="cx"> sortdirection
</span><span class="cx"> span
</span><ins>+x-itunes-inherit-uri-query-component
</ins><span class="cx"> x-webkit-speech
</span><span class="cx"> x-webkit-grammar
</span><span class="cx"> spellcheck
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.cpp (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -5125,5 +5125,28 @@
</span><span class="cx"> m_restrictions = NoRestrictions;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool HTMLMediaElement::doesHaveAttribute(const AtomicString& attribute) const
+{
+ QualifiedName attributeName(nullAtom, attribute, nullAtom);
+ if (!fastHasAttribute(attributeName))
+ return false;
+
+ if (Settings* settings = document()->settings()) {
+ if (attributeName == HTMLNames::x_itunes_inherit_uri_query_componentAttr)
+ return settings->enableInheritURIQueryComponent();
+ }
+
+ return true;
</ins><span class="cx"> }
</span><ins>+
+bool MediaPlayer::doesHaveAttribute(const AtomicString& attribute) const
+{
+ if (!m_mediaPlayerClient)
+ return false;
+
+ return m_mediaPlayerClient->doesHaveAttribute(attribute);
+}
+
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/html/HTMLMediaElement.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -118,6 +118,8 @@
</span><span class="cx"> virtual bool supportsSave() const;
</span><span class="cx"> virtual bool supportsScanning() const;
</span><span class="cx">
</span><ins>+ virtual bool doesHaveAttribute(const AtomicString&) const override;
+
</ins><span class="cx"> PlatformMedia platformMedia() const;
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> PlatformLayer* platformLayer() const;
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/page/Settings.in (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/page/Settings.in 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/page/Settings.in 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -206,3 +206,5 @@
</span><span class="cx">
</span><span class="cx"> selectionIncludesAltImageText initial=true
</span><span class="cx"> useLegacyBackgroundSizeShorthandBehavior initial=false
</span><ins>+
+enableInheritURIQueryComponent initial=false
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/MediaPlayer.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -218,6 +218,7 @@
</span><span class="cx"> virtual HostWindow* mediaPlayerHostWindow() { return 0; }
</span><span class="cx"> virtual IntRect mediaPlayerWindowClipRect() { return IntRect(); }
</span><span class="cx"> virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() { return 0; }
</span><ins>+ virtual bool doesHaveAttribute(const AtomicString&) const { return false; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual void mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate>) { }
</span><span class="lines">@@ -263,6 +264,7 @@
</span><span class="cx"> bool supportsSave() const;
</span><span class="cx"> bool supportsScanning() const;
</span><span class="cx"> bool requiresImmediateCompositing() const;
</span><ins>+ bool doesHaveAttribute(const AtomicString&) const;
</ins><span class="cx"> PlatformMedia platformMedia() const;
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> PlatformLayer* platformLayer() const;
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationcfAVFoundationCFSoftLinkingh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -384,4 +384,7 @@
</span><span class="cx"> SOFT_LINK_VARIABLE_DLL_IMPORT(AVFoundationCF, AVCFPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly, const CFStringRef);
</span><span class="cx"> #define AVCFPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly getAVCFPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly()
</span><span class="cx">
</span><ins>+SOFT_LINK_VARIABLE_DLL_IMPORT(AVFoundationCF, AVCFURLAssetInheritURIQueryComponentFromReferencingURIKey, const CFStringRef);
+#define AVCFURLAssetInheritURIQueryComponentFromReferencingURIKey getAVCFURLAssetInheritURIQueryComponentFromReferencingURIKey()
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> void destroyImageGenerator();
</span><span class="cx"> RetainPtr<CGImageRef> createImageForTimeInRect(float, const IntRect&);
</span><span class="cx">
</span><del>- void createAssetForURL(const String& url);
</del><ins>+ void createAssetForURL(const String& url, bool inheritURI);
</ins><span class="cx"> void setAsset(AVCFURLAssetRef);
</span><span class="cx">
</span><span class="cx"> void createPlayer(IDirect3DDevice9*);
</span><span class="lines">@@ -398,8 +398,10 @@
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><span class="cx">
</span><ins>+ bool inheritURI = player()->doesHaveAttribute("x-itunes-inherit-uri-query-component");
+
</ins><span class="cx"> m_avfWrapper = new AVFWrapper(this);
</span><del>- m_avfWrapper->createAssetForURL(url);
</del><ins>+ m_avfWrapper->createAssetForURL(url, inheritURI);
</ins><span class="cx"> setDelayCallbacks(false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1311,13 +1313,18 @@
</span><span class="cx"> dispatch_async_f(dispatch_get_main_queue(), context, destroyAVFWrapper);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AVFWrapper::createAssetForURL(const String& url)
</del><ins>+void AVFWrapper::createAssetForURL(const String& url, bool inheritURI)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!avAsset());
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFURLRef> urlRef = KURL(ParsedURLString, url).createCFURL();
</span><span class="cx">
</span><del>- AVCFURLAssetRef assetRef = AVCFURLAssetCreateWithURLAndOptions(kCFAllocatorDefault, urlRef.get(), 0, m_notificationQueue);
</del><ins>+ RetainPtr<CFMutableDictionaryRef> optionsRef = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+
+ if (inheritURI)
+ CFDictionarySetValue(optionsRef.get(), AVCFURLAssetInheritURIQueryComponentFromReferencingURIKey, kCFBooleanTrue);
+
+ AVCFURLAssetRef assetRef = AVCFURLAssetCreateWithURLAndOptions(kCFAllocatorDefault, urlRef.get(), optionsRef.get(), m_notificationQueue);
</ins><span class="cx"> m_avAsset = adoptCF(assetRef);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #import <wtf/Uint32Array.h>
</span><span class="cx"> #import <wtf/Uint8Array.h>
</span><span class="cx"> #import <wtf/text/CString.h>
</span><ins>+#import <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="cx"> #import <CoreMedia/CoreMedia.h>
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVPlayerItemDidPlayToEndTimeNotification, NSString *)
</span><ins>+SOFT_LINK_POINTER(AVFoundation, AVURLAssetInheritURIQueryComponentFromReferencingURIKey, NSString *)
</ins><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVAssetImageGeneratorApertureModeCleanAperture, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVURLAssetReferenceRestrictionsKey, NSString *)
</span><span class="cx">
</span><span class="lines">@@ -112,6 +114,7 @@
</span><span class="cx"> #define AVMediaTypeVideo getAVMediaTypeVideo()
</span><span class="cx"> #define AVMediaTypeAudio getAVMediaTypeAudio()
</span><span class="cx"> #define AVPlayerItemDidPlayToEndTimeNotification getAVPlayerItemDidPlayToEndTimeNotification()
</span><ins>+#define AVURLAssetInheritURIQueryComponentFromReferencingURIKey getAVURLAssetInheritURIQueryComponentFromReferencingURIKey()
</ins><span class="cx"> #define AVAssetImageGeneratorApertureModeCleanAperture getAVAssetImageGeneratorApertureModeCleanAperture()
</span><span class="cx"> #define AVURLAssetReferenceRestrictionsKey getAVURLAssetReferenceRestrictionsKey()
</span><span class="cx">
</span><span class="lines">@@ -417,6 +420,10 @@
</span><span class="cx">
</span><span class="cx"> if ([headerFields.get() count])
</span><span class="cx"> [options.get() setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
</span><ins>+
+ if (player()->doesHaveAttribute("x-itunes-inherit-uri-query-component"))
+ [options.get() setObject: [NSNumber numberWithBool: TRUE] forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NSURL *cocoaURL = KURL(ParsedURLString, url);
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/mac/ChangeLog (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/mac/ChangeLog 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/mac/ChangeLog 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-06 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165790 (165753)
+
+ 2014-03-16 Brent Fulgham <bfulgham@apple.com>
+
+ Provide preference to enable additional AVFoundation options
+ https://bugs.webkit.org/show_bug.cgi?id=130275
+
+ Reviewed by Eric Carlson.
+
+ * WebView/WebPreferenceKeysPrivate.h: Added new preference.
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Initialize preference to false.
+ (-[WebPreferences isInheritURIQueryComponentEnabled]): Added.
+ (-[WebPreferences setEnableInheritURIQueryComponent:]): Added.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Handle new preference.
+
</ins><span class="cx"> 2013-08-16 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r154114
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -159,3 +159,5 @@
</span><span class="cx"> #define WebKitPageCacheSizePreferenceKey @"WebKitPageCacheSizePreferenceKey"
</span><span class="cx"> #define WebKitObjectCacheSizePreferenceKey @"WebKitObjectCacheSizePreferenceKey"
</span><span class="cx"> #define WebKitDebugFullPageZoomPreferenceKey @"WebKitDebugFullPageZoomPreferenceKey"
</span><ins>+
+#define WebKitEnableInheritURIQueryComponentPreferenceKey @"WebKitEnableInheritURIQueryComponent"
</ins></span></pre></div>
<a id="branchessafari53760branchSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferences.mm (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006, 2007, 2011, 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2006, 2007, 2011, 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -419,6 +419,7 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:NO], WebKitEnableInheritURIQueryComponentPreferenceKey,
</ins><span class="cx"> nil];
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1596,6 +1597,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)isInheritURIQueryComponentEnabled
+{
+ return [self _boolValueForKey: WebKitEnableInheritURIQueryComponentPreferenceKey];
+}
+
+- (void)setEnableInheritURIQueryComponent:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey: WebKitEnableInheritURIQueryComponentPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)mediaPlaybackRequiresUserGesture
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitMediaPlaybackRequiresUserGesturePreferenceKey];
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -240,6 +240,9 @@
</span><span class="cx"> - (BOOL)seamlessIFramesEnabled;
</span><span class="cx"> - (void)setSeamlessIFramesEnabled:(BOOL)enabled;
</span><span class="cx">
</span><ins>+- (BOOL)isInheritURIQueryComponentEnabled;
+- (void)setEnableInheritURIQueryComponent:(BOOL)flag;
+
</ins><span class="cx"> // Other private methods
</span><span class="cx"> - (void)_postPreferencesChangedNotification;
</span><span class="cx"> - (void)_postPreferencesChangedAPINotification;
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebView.mm (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebView.mm 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/mac/WebView/WebView.mm 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1555,6 +1555,8 @@
</span><span class="cx"> settings->setDiagnosticLoggingEnabled([preferences diagnosticLoggingEnabled]);
</span><span class="cx"> settings->setLowPowerVideoAudioBufferSizeEnabled([preferences lowPowerVideoAudioBufferSizeEnabled]);
</span><span class="cx">
</span><ins>+ settings->setEnableInheritURIQueryComponent([preferences isInheritURIQueryComponentEnabled]);
+
</ins><span class="cx"> switch ([preferences storageBlockingPolicy]) {
</span><span class="cx"> case WebAllowAllStorage:
</span><span class="cx"> settings->setStorageBlockingPolicy(SecurityOrigin::AllowAllStorage);
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/win/ChangeLog (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-06 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165790 (165753)
+
+ 2014-03-17 Brent Fulgham <bfulgham@apple.com>
+
+ Provide preference to enable additional AVFoundation options
+ https://bugs.webkit.org/show_bug.cgi?id=130275
+
+ Reviewed by Eric Carlson.
+
+ * Interfaces/IWebPreferencesPrivate.idl: Added new preference.
+ * WebPreferenceKeysPrivate.h: Ditto.
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings): Initialize preference to false.
+ (WebPreferences::isInheritURIQueryComponentEnabled): Added.
+ (WebPreferences::setEnableInheritURIQueryComponent): Added.
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged): Handle new preference.
+
</ins><span class="cx"> 2014-02-06 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r163557
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinInterfacesIWebPreferencesPrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -142,4 +142,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT setRequestAnimationFrameEnabled([in] BOOL);
</span><span class="cx"> HRESULT requestAnimationFrameEnabled([out, retval] BOOL*);
</span><ins>+
+ HRESULT isInheritURIQueryComponentEnabled([out, retval] BOOL* enabled);
+ HRESULT setEnableInheritURIQueryComponent([in] BOOL enabled);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -165,3 +165,4 @@
</span><span class="cx">
</span><span class="cx"> #define WebKitRequestAnimationFrameEnabledPreferenceKey "WebKitRequestAnimationFrameEnabled"
</span><span class="cx">
</span><ins>+#define WebKitEnableInheritURIQueryComponentPreferenceKey "WebKitEnableInheritURIQueryComponent"
</ins></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.cpp (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.cpp 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.cpp 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -280,6 +280,8 @@
</span><span class="cx">
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitFullScreenEnabledPreferenceKey), kCFBooleanFalse);
</span><span class="cx">
</span><ins>+ CFDictionaryAddValue(defaults, CFSTR(WebKitRequestAnimationFrameEnabledPreferenceKey), kCFBooleanFalse);
+
</ins><span class="cx"> defaultSettings = defaults;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1766,3 +1768,14 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HRESULT WebPreferences::isInheritURIQueryComponentEnabled(BOOL* enabled)
+{
+ *enabled = boolValueForKey(CFSTR(WebKitEnableInheritURIQueryComponentPreferenceKey));
+ return S_OK;
+}
+
+HRESULT WebPreferences::setEnableInheritURIQueryComponent(BOOL enabled)
+{
+ setBoolValue(CFSTR(WebKitEnableInheritURIQueryComponentPreferenceKey), enabled);
+ return S_OK;
+}
</ins></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebPreferences.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -480,6 +480,9 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE requestAnimationFrameEnabled(BOOL*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setRequestAnimationFrameEnabled(BOOL);
</span><span class="cx">
</span><ins>+ virtual HRESULT STDMETHODCALLTYPE isInheritURIQueryComponentEnabled(BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setEnableInheritURIQueryComponent(BOOL);
+
</ins><span class="cx"> // WebPreferences
</span><span class="cx">
</span><span class="cx"> // This method accesses a different preference key than developerExtrasEnabled.
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -5035,6 +5035,11 @@
</span><span class="cx"> return hr;
</span><span class="cx"> settings->setRequestAnimationFrameEnabled(enabled);
</span><span class="cx">
</span><ins>+ hr = prefsPrivate->isInheritURIQueryComponentEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings->setEnableInheritURIQueryComponent(enabled);
+
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit2/ChangeLog (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit2/ChangeLog 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit2/ChangeLog 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-06 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165790 (165753)
+
+ 2014-03-17 Brent Fulgham <bfulgham@apple.com>
+
+ Provide preference to enable additional AVFoundation options
+ https://bugs.webkit.org/show_bug.cgi?id=130275
+
+ Reviewed by Eric Carlson.
+
+ * Shared/WebPreferencesStore.h: Added new preference.
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetEnableInheritURIQueryComponent): Added.
+ (WKPreferencesGetEnableInheritURIQueryComponent): Added.
+ * UIProcess/API/C/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Handle new preference.
+
</ins><span class="cx"> 2013-10-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r156302
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit2/Shared/WebPreferencesStore.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx"> macro(HiddenPageCSSAnimationSuspensionEnabled, hiddenPageCSSAnimationSuspensionEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED) \
</span><span class="cx"> macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
</span><span class="cx"> \
</span><ins>+ macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span><span class="cx"> macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1144,3 +1144,13 @@
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(preferencesRef)->incrementalRenderingSuppressionTimeout());
</span><span class="cx"> }
</span><ins>+
+void WKPreferencesSetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setEnableInheritURIQueryComponent(enabled);
+}
+
+bool WKPreferencesGetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->enableInheritURIQueryComponent();
+}
</ins></span></pre></div>
<a id="branchessafari53760branchSourceWebKit2UIProcessAPICWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -289,6 +289,10 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKPreferencesResetTestRunnerOverrides(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><ins>+// Default to false.
+WK_EXPORT void WKPreferencesSetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (168400 => 168401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-07 02:25:00 UTC (rev 168400)
+++ branches/safari-537.60-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-07 02:29:01 UTC (rev 168401)
</span><span class="lines">@@ -2605,6 +2605,8 @@
</span><span class="cx"> settings->setSelectTrailingWhitespaceEnabled(store.getBoolValueForKey(WebPreferencesKey::selectTrailingWhitespaceEnabledKey()));
</span><span class="cx"> settings->setShowsURLsInToolTips(store.getBoolValueForKey(WebPreferencesKey::showsURLsInToolTipsEnabledKey()));
</span><span class="cx">
</span><ins>+ settings->setEnableInheritURIQueryComponent(store.getBoolValueForKey(WebPreferencesKey::enableInheritURIQueryComponentKey()));
+
</ins><span class="cx"> #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
</span><span class="cx"> settings->setHiddenPageDOMTimerThrottlingEnabled(store.getBoolValueForKey(WebPreferencesKey::hiddenPageDOMTimerThrottlingEnabledKey()));
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>