Title: [165832] branches/safari-537.75-branch/Source/WebKit/win
- Revision
- 165832
- Author
- [email protected]
- Date
- 2014-03-18 12:45:11 -0700 (Tue, 18 Mar 2014)
Log Message
Build correction after last merge.
* WebPreferences.cpp:
(WebPreferences::isInheritURIQueryComponentEnabled): Must use CFSTR wrappers
on key names in this code.
(WebPreferences::setEnableInheritURIQueryComponent): Ditto.
* WebView.cpp:
(WebView::notifyPreferencesChanged): This version of the code used pointers
for the preference instance.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WebKit/win/ChangeLog (165831 => 165832)
--- branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-03-18 19:39:18 UTC (rev 165831)
+++ branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-03-18 19:45:11 UTC (rev 165832)
@@ -1,3 +1,15 @@
+2014-03-18 Brent Fulgham <[email protected]>
+
+ Build correction after last merge.
+
+ * WebPreferences.cpp:
+ (WebPreferences::isInheritURIQueryComponentEnabled): Must use CFSTR wrappers
+ on key names in this code.
+ (WebPreferences::setEnableInheritURIQueryComponent): Ditto.
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged): This version of the code used pointers
+ for the preference instance.
+
2014-03-17 Matthew Hanson <[email protected]>
Merge r165753.
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.cpp (165831 => 165832)
--- branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.cpp 2014-03-18 19:39:18 UTC (rev 165831)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebPreferences.cpp 2014-03-18 19:45:11 UTC (rev 165832)
@@ -1770,12 +1770,12 @@
HRESULT WebPreferences::isInheritURIQueryComponentEnabled(BOOL* enabled)
{
- *enabled = boolValueForKey(WebKitEnableInheritURIQueryComponentPreferenceKey);
+ *enabled = boolValueForKey(CFSTR(WebKitEnableInheritURIQueryComponentPreferenceKey));
return S_OK;
}
HRESULT WebPreferences::setEnableInheritURIQueryComponent(BOOL enabled)
{
- setBoolValue(WebKitEnableInheritURIQueryComponentPreferenceKey, enabled);
+ setBoolValue(CFSTR(WebKitEnableInheritURIQueryComponentPreferenceKey), enabled);
return S_OK;
}
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp (165831 => 165832)
--- branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp 2014-03-18 19:39:18 UTC (rev 165831)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp 2014-03-18 19:45:11 UTC (rev 165832)
@@ -5038,7 +5038,7 @@
hr = prefsPrivate->isInheritURIQueryComponentEnabled(&enabled);
if (FAILED(hr))
return hr;
- settings.setEnableInheritURIQueryComponent(enabled);
+ settings->setEnableInheritURIQueryComponent(enabled);
return S_OK;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
