Title: [201251] branches/safari-602.1.32-branch/Source/WebCore
- Revision
- 201251
- Author
- [email protected]
- Date
- 2016-05-22 09:51:44 -0700 (Sun, 22 May 2016)
Log Message
Merge r201241. rdar://problem/26396532
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201250 => 201251)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-22 16:51:42 UTC (rev 201250)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-22 16:51:44 UTC (rev 201251)
@@ -1,5 +1,16 @@
2016-05-22 Babak Shafiei <[email protected]>
+ Merge r201241. rdar://problem/26396532
+
+ 2016-05-20 Dan Bernstein <[email protected]>
+
+ Fixed USE(APPLE_INTERNAL_SDK) builds.
+
+ * platform/cocoa/ThemeCocoa.mm:
+ (WebCore::fitContextToBox):
+
+2016-05-22 Babak Shafiei <[email protected]>
+
Merge r201229. rdar://problem/26396532
2016-05-20 Anders Carlsson <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/cocoa/ThemeCocoa.mm (201250 => 201251)
--- branches/safari-602.1.32-branch/Source/WebCore/platform/cocoa/ThemeCocoa.mm 2016-05-22 16:51:42 UTC (rev 201250)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/cocoa/ThemeCocoa.mm 2016-05-22 16:51:44 UTC (rev 201251)
@@ -28,6 +28,10 @@
#import "GraphicsContext.h"
+#if USE(APPLE_INTERNAL_SDK)
+#import <dlfcn.h>
+#endif
+
namespace WebCore {
static void fitContextToBox(GraphicsContext& context, const FloatSize& srcImageSize, const FloatSize& dstSize)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes