Diff
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1,3 +1,30 @@
+2014-03-17 Matthew Hanson <[email protected]>
+
+ Merge r165753.
+
+ 2014-03-16 Brent Fulgham <[email protected]>
+
+ 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.
+
2014-03-17 Joseph Pecoraro <[email protected]>
Merge r165583.
Modified: branches/safari-537.75-branch/Source/WebCore/html/HTMLAttributeNames.in (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/html/HTMLAttributeNames.in 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/html/HTMLAttributeNames.in 2014-03-18 02:30:59 UTC (rev 165790)
@@ -307,6 +307,7 @@
sortable
sortdirection
span
+x-itunes-inherit-uri-query-component
x-webkit-speech
x-webkit-grammar
spellcheck
Modified: branches/safari-537.75-branch/Source/WebCore/html/HTMLMediaElement.cpp (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-18 02:30:59 UTC (rev 165790)
@@ -5135,5 +5135,28 @@
m_restrictions = NoRestrictions;
}
+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;
}
+
+bool MediaPlayer::doesHaveAttribute(const AtomicString& attribute) const
+{
+ if (!m_mediaPlayerClient)
+ return false;
+
+ return m_mediaPlayerClient->doesHaveAttribute(attribute);
+}
+
+}
+
#endif
Modified: branches/safari-537.75-branch/Source/WebCore/html/HTMLMediaElement.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/html/HTMLMediaElement.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/html/HTMLMediaElement.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -118,6 +118,8 @@
virtual bool supportsSave() const;
virtual bool supportsScanning() const;
+ virtual bool doesHaveAttribute(const AtomicString&) const override;
+
PlatformMedia platformMedia() const;
#if USE(ACCELERATED_COMPOSITING)
PlatformLayer* platformLayer() const;
Modified: branches/safari-537.75-branch/Source/WebCore/page/Settings.in (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/page/Settings.in 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/page/Settings.in 2014-03-18 02:30:59 UTC (rev 165790)
@@ -207,3 +207,5 @@
selectionIncludesAltImageText initial=true
useLegacyBackgroundSizeShorthandBehavior initial=false
+
+enableInheritURIQueryComponent initial=false
\ No newline at end of file
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/MediaPlayer.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -218,6 +218,7 @@
virtual HostWindow* mediaPlayerHostWindow() { return 0; }
virtual IntRect mediaPlayerWindowClipRect() { return IntRect(); }
virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() { return 0; }
+ virtual bool doesHaveAttribute(const AtomicString&) const { return false; }
#if ENABLE(VIDEO_TRACK)
virtual void mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate>) { }
@@ -263,6 +264,7 @@
bool supportsSave() const;
bool supportsScanning() const;
bool requiresImmediateCompositing() const;
+ bool doesHaveAttribute(const AtomicString&) const;
PlatformMedia platformMedia() const;
#if USE(ACCELERATED_COMPOSITING)
PlatformLayer* platformLayer() const;
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -384,4 +384,7 @@
SOFT_LINK_VARIABLE_DLL_IMPORT(AVFoundationCF, AVCFPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly, const CFStringRef);
#define AVCFPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly getAVCFPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly()
+SOFT_LINK_VARIABLE_DLL_IMPORT(AVFoundationCF, AVCFURLAssetInheritURIQueryComponentFromReferencingURIKey, const CFStringRef);
+#define AVCFURLAssetInheritURIQueryComponentFromReferencingURIKey getAVCFURLAssetInheritURIQueryComponentFromReferencingURIKey()
+
#endif
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -92,7 +92,7 @@
void destroyImageGenerator();
RetainPtr<CGImageRef> createImageForTimeInRect(float, const IntRect&);
- void createAssetForURL(const String& url);
+ void createAssetForURL(const String& url, bool inheritURI);
void setAsset(AVCFURLAssetRef);
void createPlayer(IDirect3DDevice9*);
@@ -398,8 +398,10 @@
setDelayCallbacks(true);
+ bool inheritURI = player()->doesHaveAttribute("x-itunes-inherit-uri-query-component");
+
m_avfWrapper = new AVFWrapper(this);
- m_avfWrapper->createAssetForURL(url);
+ m_avfWrapper->createAssetForURL(url, inheritURI);
setDelayCallbacks(false);
}
@@ -1311,13 +1313,18 @@
dispatch_async_f(dispatch_get_main_queue(), context, destroyAVFWrapper);
}
-void AVFWrapper::createAssetForURL(const String& url)
+void AVFWrapper::createAssetForURL(const String& url, bool inheritURI)
{
ASSERT(!avAsset());
RetainPtr<CFURLRef> urlRef = KURL(ParsedURLString, url).createCFURL();
- AVCFURLAssetRef assetRef = AVCFURLAssetCreateWithURLAndOptions(kCFAllocatorDefault, urlRef.get(), 0, m_notificationQueue);
+ 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);
m_avAsset = adoptCF(assetRef);
}
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-18 02:30:59 UTC (rev 165790)
@@ -52,6 +52,7 @@
#import <wtf/Uint32Array.h>
#import <wtf/Uint8Array.h>
#import <wtf/text/CString.h>
+#import <wtf/text/StringBuilder.h>
#import <AVFoundation/AVFoundation.h>
#import <CoreMedia/CoreMedia.h>
@@ -94,6 +95,7 @@
SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVPlayerItemDidPlayToEndTimeNotification, NSString *)
+SOFT_LINK_POINTER(AVFoundation, AVURLAssetInheritURIQueryComponentFromReferencingURIKey, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVAssetImageGeneratorApertureModeCleanAperture, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVURLAssetReferenceRestrictionsKey, NSString *)
@@ -112,6 +114,7 @@
#define AVMediaTypeVideo getAVMediaTypeVideo()
#define AVMediaTypeAudio getAVMediaTypeAudio()
#define AVPlayerItemDidPlayToEndTimeNotification getAVPlayerItemDidPlayToEndTimeNotification()
+#define AVURLAssetInheritURIQueryComponentFromReferencingURIKey getAVURLAssetInheritURIQueryComponentFromReferencingURIKey()
#define AVAssetImageGeneratorApertureModeCleanAperture getAVAssetImageGeneratorApertureModeCleanAperture()
#define AVURLAssetReferenceRestrictionsKey getAVURLAssetReferenceRestrictionsKey()
@@ -417,6 +420,10 @@
if ([headerFields.get() count])
[options.get() setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
+
+ if (player()->doesHaveAttribute("x-itunes-inherit-uri-query-component"))
+ [options.get() setObject: [NSNumber numberWithBool: TRUE] forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
+
#endif
NSURL *cocoaURL = KURL(ParsedURLString, url);
Modified: branches/safari-537.75-branch/Source/WebKit/mac/ChangeLog (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/mac/ChangeLog 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/mac/ChangeLog 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1,3 +1,23 @@
+2014-03-17 Matthew Hanson <[email protected]>
+
+ Merge r165753.
+
+ 2014-03-16 Brent Fulgham <[email protected]>
+
+ 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.
+
2014-02-12 Matthew Hanson <[email protected]>
Merge r162679.
Modified: branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -160,3 +160,5 @@
#define WebKitPageCacheSizePreferenceKey @"WebKitPageCacheSizePreferenceKey"
#define WebKitObjectCacheSizePreferenceKey @"WebKitObjectCacheSizePreferenceKey"
#define WebKitDebugFullPageZoomPreferenceKey @"WebKitDebugFullPageZoomPreferenceKey"
+
+#define WebKitEnableInheritURIQueryComponentPreferenceKey @"WebKitEnableInheritURIQueryComponent"
\ No newline at end of file
Modified: branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferences.mm (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, 2006, 2007, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2011, 2012, 2014 Apple Inc. All rights reserved.
* (C) 2006 Graham Dennis ([email protected])
*
* Redistribution and use in source and binary forms, with or without
@@ -421,7 +421,7 @@
[NSNumber numberWithBool:NO], WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey,
-
+ [NSNumber numberWithBool:NO], WebKitEnableInheritURIQueryComponentPreferenceKey,
nil];
@@ -1599,6 +1599,16 @@
return false;
}
+- (BOOL)isInheritURIQueryComponentEnabled
+{
+ return [self _boolValueForKey: WebKitEnableInheritURIQueryComponentPreferenceKey];
+}
+
+- (void)setEnableInheritURIQueryComponent:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey: WebKitEnableInheritURIQueryComponentPreferenceKey];
+}
+
- (BOOL)mediaPlaybackRequiresUserGesture
{
return [self _boolValueForKey:WebKitMediaPlaybackRequiresUserGesturePreferenceKey];
Modified: branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -240,6 +240,9 @@
- (BOOL)seamlessIFramesEnabled;
- (void)setSeamlessIFramesEnabled:(BOOL)enabled;
+- (BOOL)isInheritURIQueryComponentEnabled;
+- (void)setEnableInheritURIQueryComponent:(BOOL)flag;
+
// Other private methods
- (void)_postPreferencesChangedNotification;
- (void)_postPreferencesChangedAPINotification;
Modified: branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebView.mm (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebView.mm 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/mac/WebView/WebView.mm 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1558,6 +1558,8 @@
settings->setUseLegacyTextAlignPositionedElementBehavior([preferences useLegacyTextAlignPositionedElementBehavior]);
+ settings->setEnableInheritURIQueryComponent([preferences isInheritURIQueryComponentEnabled]);
+
switch ([preferences storageBlockingPolicy]) {
case WebAllowAllStorage:
settings->setStorageBlockingPolicy(SecurityOrigin::AllowAllStorage);
Modified: branches/safari-537.75-branch/Source/WebKit/win/ChangeLog (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1,3 +1,24 @@
+2014-03-17 Matthew Hanson <[email protected]>
+
+ Merge r165753.
+
+ 2014-03-17 Brent Fulgham <[email protected]>
+
+ 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.
+
2014-02-06 Brent Fulgham <[email protected]>
Merge r163557.
Modified: branches/safari-537.75-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2014-03-18 02:30:59 UTC (rev 165790)
@@ -142,4 +142,7 @@
HRESULT setRequestAnimationFrameEnabled([in] BOOL);
HRESULT requestAnimationFrameEnabled([out, retval] BOOL*);
+
+ HRESULT isInheritURIQueryComponentEnabled([out, retval] BOOL* enabled);
+ HRESULT setEnableInheritURIQueryComponent([in] BOOL enabled);
}
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -165,3 +165,4 @@
#define WebKitRequestAnimationFrameEnabledPreferenceKey "WebKitRequestAnimationFrameEnabled"
+#define WebKitEnableInheritURIQueryComponentPreferenceKey "WebKitEnableInheritURIQueryComponent"
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.cpp (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.cpp 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.cpp 2014-03-18 02:30:59 UTC (rev 165790)
@@ -280,6 +280,8 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitFullScreenEnabledPreferenceKey), kCFBooleanFalse);
+ CFDictionaryAddValue(defaults, CFSTR(WebKitRequestAnimationFrameEnabledPreferenceKey), kCFBooleanFalse);
+
defaultSettings = defaults;
}
@@ -1766,3 +1768,14 @@
return S_OK;
}
+HRESULT WebPreferences::isInheritURIQueryComponentEnabled(BOOL* enabled)
+{
+ *enabled = boolValueForKey(WebKitEnableInheritURIQueryComponentPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setEnableInheritURIQueryComponent(BOOL enabled)
+{
+ setBoolValue(WebKitEnableInheritURIQueryComponentPreferenceKey, enabled);
+ return S_OK;
+}
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -480,6 +480,9 @@
virtual HRESULT STDMETHODCALLTYPE requestAnimationFrameEnabled(BOOL*);
virtual HRESULT STDMETHODCALLTYPE setRequestAnimationFrameEnabled(BOOL);
+ virtual HRESULT STDMETHODCALLTYPE isInheritURIQueryComponentEnabled(BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setEnableInheritURIQueryComponent(BOOL);
+
// WebPreferences
// This method accesses a different preference key than developerExtrasEnabled.
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp 2014-03-18 02:30:59 UTC (rev 165790)
@@ -5035,6 +5035,11 @@
return hr;
settings->setRequestAnimationFrameEnabled(enabled);
+ hr = prefsPrivate->isInheritURIQueryComponentEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings.setEnableInheritURIQueryComponent(enabled);
+
return S_OK;
}
Modified: branches/safari-537.75-branch/Source/WebKit2/ChangeLog (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit2/ChangeLog 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit2/ChangeLog 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1,5 +1,24 @@
2014-03-17 Matthew Hanson <[email protected]>
+ Merge r165753.
+
+ 2014-03-17 Brent Fulgham <[email protected]>
+
+ 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.
+
+2014-03-17 Matthew Hanson <[email protected]>
+
Merge r165657.
2014-03-14 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-537.75-branch/Source/WebKit2/Shared/WebPreferencesStore.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -163,6 +163,7 @@
macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false) \
\
+ macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
Modified: branches/safari-537.75-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1154,3 +1154,13 @@
{
return toAPI(toImpl(preferencesRef)->incrementalRenderingSuppressionTimeout());
}
+
+void WKPreferencesSetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setEnableInheritURIQueryComponent(enabled);
+}
+
+bool WKPreferencesGetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->enableInheritURIQueryComponent();
+}
\ No newline at end of file
Modified: branches/safari-537.75-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2014-03-18 02:30:59 UTC (rev 165790)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -293,6 +293,10 @@
WK_EXPORT void WKPreferencesSetUseLegacyTextAlignPositionedElementBehavior(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesUseLegacyTextAlignPositionedElementBehavior(WKPreferencesRef preferencesRef);
+// Default to false.
+WK_EXPORT void WKPreferencesSetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetEnableInheritURIQueryComponent(WKPreferencesRef preferencesRef);
+
#ifdef __cplusplus
}
#endif
Modified: branches/safari-537.75-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (165789 => 165790)
--- branches/safari-537.75-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-18 01:52:15 UTC (rev 165789)
+++ branches/safari-537.75-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-18 02:30:59 UTC (rev 165790)
@@ -2608,6 +2608,8 @@
settings->setSelectTrailingWhitespaceEnabled(store.getBoolValueForKey(WebPreferencesKey::selectTrailingWhitespaceEnabledKey()));
settings->setShowsURLsInToolTips(store.getBoolValueForKey(WebPreferencesKey::showsURLsInToolTipsEnabledKey()));
+ settings->setEnableInheritURIQueryComponent(store.getBoolValueForKey(WebPreferencesKey::enableInheritURIQueryComponentKey()));
+
#if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
settings->setHiddenPageDOMTimerThrottlingEnabled(store.getBoolValueForKey(WebPreferencesKey::hiddenPageDOMTimerThrottlingEnabledKey()));
#endif
