Skip to site navigation (Press enter)

[webkit-changes] [169071] branches/safari-538.34-branch/Source/WebCore

matthew_hanson Mon, 19 May 2014 14:47:29 -0700

Title: [169071] branches/safari-538.34-branch/Source/WebCore

Revision: 169071
Author: [email protected]
Date: 2014-05-19 14:46:37 -0700 (Mon, 19 May 2014)

Log Message

Merge r169015.


Modified Paths

branches/safari-538.34-branch/Source/WebCore/ChangeLog
branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in

Diff

Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (169070 => 169071)


--- branches/safari-538.34-branch/Source/WebCore/ChangeLog	2014-05-19 21:45:08 UTC (rev 169070)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog	2014-05-19 21:46:37 UTC (rev 169071)
@@ -1,5 +1,16 @@
 2014-05-19  Matthew Hanson  <[email protected]>
 
+        Merge r169015.
+
+    2014-05-18  Anders Carlsson  <[email protected]>
+    
+            Fix iOS build.
+    
+            * WebCore.exp.in:
+            Move UserContentController symbols to the right place.
+    
+2014-05-19  Matthew Hanson  <[email protected]>
+
         Merge r168994.
 
     2014-05-16  Anders Carlsson  <[email protected]>

Modified: branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in (169070 => 169071)


--- branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in	2014-05-19 21:45:08 UTC (rev 169070)
+++ branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in	2014-05-19 21:46:37 UTC (rev 169071)
@@ -892,6 +892,10 @@
 __ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore21SerializedScriptValueD1Ev
 __ZN7WebCore21URLByRemovingUserInfoEP5NSURL
+__ZN7WebCore21UserContentController13addUserScriptERNS_15DOMWrapperWorldENSt3__110unique_ptrINS_10UserScriptENS3_14default_deleteIS5_EEEE
+__ZN7WebCore21UserContentController17removeUserScriptsERNS_15DOMWrapperWorldE
+__ZN7WebCore21UserContentController6createEv
+__ZN7WebCore21UserContentControllerD1Ev
 __ZN7WebCore21UserContentURLPattern5parseERKN3WTF6StringE
 __ZN7WebCore21ViewportConfiguration15setContentsSizeERKNS_7IntSizeE
 __ZN7WebCore21ViewportConfiguration17webpageParametersEv
@@ -2183,10 +2187,6 @@
 __ZN7WebCore20applicationIsHRBlockEv
 __ZN7WebCore20builtInPDFPluginNameEv
 __ZN7WebCore21DeviceOrientationData6createEbdbdbdbb
-__ZN7WebCore21UserContentController13addUserScriptERNS_15DOMWrapperWorldENSt3__110unique_ptrINS_10UserScriptENS3_14default_deleteIS5_EEEE
-__ZN7WebCore21UserContentController17removeUserScriptsERNS_15DOMWrapperWorldE
-__ZN7WebCore21UserContentController6createEv
-__ZN7WebCore21UserContentControllerD1Ev
 __ZN7WebCore21applicationIsApertureEv
 __ZN7WebCore21applicationIsVersionsEv
 __ZN7WebCore21reportThreadViolationEPKcNS_20ThreadViolationRoundE

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes