Skip to site navigation (Press enter)

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

lforschler Wed, 14 May 2014 00:44:19 -0700

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

Revision: 168802
Author: [email protected]
Date: 2014-05-14 00:43:47 -0700 (Wed, 14 May 2014)

Log Message

Merged r168557.


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 (168801 => 168802)


--- branches/safari-538.34-branch/Source/WebCore/ChangeLog	2014-05-14 07:41:46 UTC (rev 168801)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog	2014-05-14 07:43:47 UTC (rev 168802)
@@ -1,5 +1,15 @@
 2014-05-14  Lucas Forschler  <[email protected]>
 
+        Merge r168557
+
+    2014-05-09  Benjamin Poulain  <[email protected]>
+
+            Fix the export file after r168556
+
+            * WebCore.exp.in: I forgot to fix the export file before landing.
+
+2014-05-14  Lucas Forschler  <[email protected]>
+
         Merge r168556
 
     2014-05-09  Benjamin Poulain  <[email protected]>

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


--- branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in	2014-05-14 07:41:46 UTC (rev 168801)
+++ branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in	2014-05-14 07:43:47 UTC (rev 168802)
@@ -2444,7 +2444,6 @@
 _WebUIApplicationDidBecomeActiveNotification
 _WebUIApplicationWillEnterForegroundNotification
 _WebUIApplicationWillResignActiveNotification
-__ZN7WebCore9FrameView27setCustomSizeForResizeEventENS_7IntSizeE
 __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE
 __ZN7WebCore10ScrollView21setExposedContentRectERKNS_7IntRectE
 __ZN7WebCore10ScrollView24setUnobscuredContentRectERKNS_7IntRectE
@@ -2656,6 +2655,7 @@
 __ZN7WebCore9FrameView17setScrollVelocityEdddd
 __ZN7WebCore9FrameView20setWasScrolledByUserEb
 __ZN7WebCore9FrameView24renderedCharactersExceedEj
+__ZN7WebCore9FrameView27setCustomSizeForResizeEventENS_7IntSizeE
 __ZN7WebCore9FrameView30graphicsLayerForPlatformWidgetEP7WAKView
 __ZN7WebCore9FrameView32setCustomFixedPositionLayoutRectERKNS_7IntRectE
 __ZN7WebCore9FrameView33rectForViewportConstrainedObjectsERKNS_10LayoutRectERKNS_10LayoutSizeEfbNS_30ScrollBehaviorForFixedElementsE

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