Title: [181738] tags/Safari-601.1.23.3/Source/WebCore
- Revision
- 181738
- Author
- [email protected]
- Date
- 2015-03-19 01:51:42 -0700 (Thu, 19 Mar 2015)
Log Message
Merged r181616. rdar://problem/20184456
Modified Paths
Diff
Modified: tags/Safari-601.1.23.3/Source/WebCore/ChangeLog (181737 => 181738)
--- tags/Safari-601.1.23.3/Source/WebCore/ChangeLog 2015-03-19 08:49:43 UTC (rev 181737)
+++ tags/Safari-601.1.23.3/Source/WebCore/ChangeLog 2015-03-19 08:51:42 UTC (rev 181738)
@@ -1,5 +1,15 @@
2015-03-19 Babak Shafiei <[email protected]>
+ Merge r181616.
+
+ 2015-03-16 Jon Lee <[email protected]>
+
+ Unreviewed fix for crash after r181608.
+
+ * WebCore.xcodeproj/project.pbxproj: Include it in the WebCore framework.
+
+2015-03-19 Babak Shafiei <[email protected]>
+
Merge r181608.
2015-03-16 Jer Noble <[email protected]>
Modified: tags/Safari-601.1.23.3/Source/WebCore/WebCore.xcodeproj/project.pbxproj (181737 => 181738)
--- tags/Safari-601.1.23.3/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-19 08:49:43 UTC (rev 181737)
+++ tags/Safari-601.1.23.3/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-19 08:51:42 UTC (rev 181738)
@@ -1264,6 +1264,7 @@
316FE1190E6E1DA700BF6088 /* KeyframeAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE10F0E6E1DA700BF6088 /* KeyframeAnimation.cpp */; };
316FE11A0E6E1DA700BF6088 /* KeyframeAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE1100E6E1DA700BF6088 /* KeyframeAnimation.h */; };
31741AAD16636609008A5B7E /* SimulatedClickOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 31741AAB16635E45008A5B7E /* SimulatedClickOptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 318891611AB7EEA100EA627B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CDF419991AB0DA14004E64E1 /* [email protected] */; };
31955A86160D199000858025 /* RenderSnapshottedPlugIn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31E8D8BA160BC94B004CE8F5 /* RenderSnapshottedPlugIn.cpp */; };
31955A88160D199200858025 /* RenderSnapshottedPlugIn.h in Headers */ = {isa = PBXBuildFile; fileRef = 31E8D8BB160BC94C004CE8F5 /* RenderSnapshottedPlugIn.h */; settings = {ATTRIBUTES = (Private, ); }; };
319848011A1D817B00A13318 /* AnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 319847FF1A1D816700A13318 /* AnimationEvent.h */; };
@@ -27166,6 +27167,7 @@
D02B64B314089E56006EFA21 /* [email protected] in Resources */,
7CC7E3D717208C0F003C5277 /* IDNScriptWhiteList.txt in Resources */,
2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */,
+ 318891611AB7EEA100EA627B /* [email protected] in Resources */,
BCAD180A131C7A0D00990406 /* Localizable.strings in Resources */,
311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
