Title: [105447] branches/safari-534.54-branch/Source/WebKit/win
Diff
Modified: branches/safari-534.54-branch/Source/WebKit/win/ChangeLog (105446 => 105447)
--- branches/safari-534.54-branch/Source/WebKit/win/ChangeLog 2012-01-19 22:07:23 UTC (rev 105446)
+++ branches/safari-534.54-branch/Source/WebKit/win/ChangeLog 2012-01-19 22:07:32 UTC (rev 105447)
@@ -1,3 +1,14 @@
+2011-01-18 Lucas Forschler <[email protected]>
+
+ Merge 92291
+
+ 2011-08-03 Adam Roben <[email protected]>
+
+ Windows nightly build fix after r91777
+
+ * Interfaces/IWebPreferences.idl: Moved [set]PictographFontFamily to the end of the
+ interface to maintain binary compatibility with Safari 5.1.
+
2012-01-17 Mark Rowe <[email protected]>
Merge r101808.
Modified: branches/safari-534.54-branch/Source/WebKit/win/Interfaces/IWebPreferences.idl (105446 => 105447)
--- branches/safari-534.54-branch/Source/WebKit/win/Interfaces/IWebPreferences.idl 2012-01-19 22:07:23 UTC (rev 105446)
+++ branches/safari-534.54-branch/Source/WebKit/win/Interfaces/IWebPreferences.idl 2012-01-19 22:07:32 UTC (rev 105447)
@@ -98,9 +98,6 @@
HRESULT fantasyFontFamily([out, retval] BSTR* family);
HRESULT setFantasyFontFamily([in] BSTR family);
- HRESULT pictographFontFamily([out, retval] BSTR* family);
- HRESULT setPictographFontFamily([in] BSTR family);
-
HRESULT defaultFontSize([out, retval] int* fontSize);
HRESULT setDefaultFontSize([in] int fontSize);
@@ -205,4 +202,7 @@
HRESULT setAVFoundationEnabled(BOOL avFoundationEnabled);
HRESULT avFoundationEnabled(BOOL *avFoundationEnabled);
+
+ HRESULT pictographFontFamily([out, retval] BSTR* family);
+ HRESULT setPictographFontFamily([in] BSTR family);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
