Changeset 181738 in webkit

Timestamp:

Mar 19, 2015, 1:51:42 AM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r181616. rdar://problem/20184456

Location:

tags/Safari-601.1.23.3/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)

tags/Safari-601.1.23.3/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181616.
+
+    2015-03-16  Jon Lee  <jonlee@apple.com>
+
+            Unreviewed fix for crash after r181608.
+
+            * WebCore.xcodeproj/project.pbxproj: Include it in the WebCore framework.
+
 2015-03-19  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-601.1.23.3/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1265 +1265 @@
                 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 /* missingImage@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = CDF419991AB0DA14004E64E1 /* missingImage@3x.png */; };
                 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, ); }; };
@@ -27167 +27168 @@
                                 7CC7E3D717208C0F003C5277 /* IDNScriptWhiteList.txt in Resources */,
                                 2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */,
+                                318891611AB7EEA100EA627B /* missingImage@3x.png in Resources */,
                                 BCAD180A131C7A0D00990406 /* Localizable.strings in Resources */,
                                 311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,