Changeset 54606 in webkit
- Timestamp:
- Feb 10, 2010 10:11:38 AM (14 years ago)
- Location:
- trunk/WebKit/win
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/win/ChangeLog
r54604 r54606 1 2010-02-10 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 Support frameset flattening 6 https://bugs.webkit.org/show_bug.cgi?id=32717 7 8 Add support for enabling/disabling FrameSet Flattening on the Windows port. 9 10 * Interfaces/IWebPreferencesPrivate.idl: 11 * WebPreferenceKeysPrivate.h: 12 * WebPreferences.cpp: 13 (WebPreferences::initializeDefaultSettings): 14 (WebPreferences::isFrameSetFlatteningEnabled): 15 (WebPreferences::setFrameSetFlatteningEnabled): 16 * WebPreferences.h: 17 * WebView.cpp: 18 (WebView::notifyPreferencesChanged): 19 1 20 2010-02-10 Adam Roben <aroben@apple.com> 2 21 -
trunk/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
r54090 r54606 80 80 HRESULT setXSSAuditorEnabled([in] BOOL enabled); 81 81 82 HRESULT isFrameSetFlatteningEnabled([out, retval] BOOL *enabled); 83 HRESULT setFrameSetFlatteningEnabled([in] BOOL enabled); 84 82 85 HRESULT experimentalNotificationsEnabled([out, retval] BOOL *enabled); 83 86 HRESULT setExperimentalNotificationsEnabled([in] BOOL enabled); -
trunk/WebKit/win/WebPreferenceKeysPrivate.h
r54083 r54606 131 131 #define WebKitPluginAllowedRunTimePreferenceKey "WebKitPluginAllowedRunTime" 132 132 133 #define WebKitFrameSetFlatteningEnabledPreferenceKey "WebKitFrameSetFlatteningEnabled" 134 133 135 #define WebKitAcceleratedCompositingEnabledPreferenceKey "WebKitAcceleratedCompositingEnabled" 134 136 -
trunk/WebKit/win/WebPreferences.cpp
r54604 r54606 207 207 CFDictionaryAddValue(defaults, CFSTR(WebKitAllowUniversalAccessFromFileURLsPreferenceKey), kCFBooleanFalse); 208 208 CFDictionaryAddValue(defaults, CFSTR(WebKitXSSAuditorEnabledPreferenceKey), kCFBooleanTrue); 209 CFDictionaryAddValue(defaults, CFSTR(WebKitFrameSetFlatteningEnabledPreferenceKey), kCFBooleanFalse); 209 210 CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey), kCFBooleanTrue); 210 211 CFDictionaryAddValue(defaults, CFSTR(WebKitPluginsEnabledPreferenceKey), kCFBooleanTrue); … … 806 807 } 807 808 809 HRESULT STDMETHODCALLTYPE WebPreferences::isFrameSetFlatteningEnabled( 810 /* [retval][out] */ BOOL* enabled) 811 { 812 *enabled = boolValueForKey(CFSTR(WebKitFrameSetFlatteningEnabledPreferenceKey)); 813 return S_OK; 814 } 815 816 HRESULT STDMETHODCALLTYPE WebPreferences::setFrameSetFlatteningEnabled( 817 /* [in] */ BOOL enabled) 818 { 819 setBoolValue(CFSTR(WebKitFrameSetFlatteningEnabledPreferenceKey), enabled); 820 return S_OK; 821 } 822 808 823 HRESULT STDMETHODCALLTYPE WebPreferences::javaScriptCanOpenWindowsAutomatically( 809 824 /* [retval][out] */ BOOL* enabled) -
trunk/WebKit/win/WebPreferences.h
r54083 r54606 381 381 /* [retval][out] */ UINT* allowedRunTime); 382 382 383 virtual HRESULT STDMETHODCALLTYPE isFrameSetFlatteningEnabled( 384 /* [retval][out] */ BOOL* enabled); 385 386 virtual HRESULT STDMETHODCALLTYPE setFrameSetFlatteningEnabled( 387 /* [in] */ BOOL enabled); 388 383 389 virtual HRESULT STDMETHODCALLTYPE setPreferenceForTest( 384 390 /* [in] */ BSTR key, -
trunk/WebKit/win/WebView.cpp
r54519 r54606 4646 4646 settings->setPluginAllowedRunTime(runTime); 4647 4647 4648 hr = prefsPrivate->isFrameSetFlatteningEnabled(&enabled); 4649 if (FAILED(hr)) 4650 return hr; 4651 settings->setFrameSetFlatteningEnabled(enabled); 4652 4648 4653 #if USE(ACCELERATED_COMPOSITING) 4649 4654 hr = prefsPrivate->acceleratedCompositingEnabled(&enabled);
Note: See TracChangeset
for help on using the changeset viewer.