Title: [152244] branches/safari-537-branch/Source/WebKit2
- Revision
- 152244
- Author
- [email protected]
- Date
- 2013-07-01 13:34:40 -0700 (Mon, 01 Jul 2013)
Log Message
Merged r152177. <rdar://problem/14303613>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152243 => 152244)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-01 20:33:04 UTC (rev 152243)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-01 20:34:40 UTC (rev 152244)
@@ -1,3 +1,17 @@
+2013-07-01 Lucas Forschler <[email protected]>
+
+ Merge r152177
+
+ 2013-06-28 Tim Horton <[email protected]>
+
+ WARN_UNUSED_RESULT can't be used in API headers, but WKBundlePageExtendIncrementalRenderingSuppression tries to
+ https://bugs.webkit.org/show_bug.cgi?id=118196
+ <rdar://problem/14303613>
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+
2013-06-26 Lucas Forschler <[email protected]>
Merge r151952
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (152243 => 152244)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2013-07-01 20:33:04 UTC (rev 152243)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2013-07-01 20:34:40 UTC (rev 152244)
@@ -83,7 +83,7 @@
// This only works if the SuppressesIncrementalRendering preference is set as well.
typedef unsigned WKRenderingSuppressionToken;
-WK_EXPORT WKRenderingSuppressionToken WKBundlePageExtendIncrementalRenderingSuppression(WKBundlePageRef) WARN_UNUSED_RETURN;
+WK_EXPORT WKRenderingSuppressionToken WKBundlePageExtendIncrementalRenderingSuppression(WKBundlePageRef);
WK_EXPORT void WKBundlePageStopExtendingIncrementalRenderingSuppression(WKBundlePageRef, WKRenderingSuppressionToken);
#ifdef __cplusplus
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
