Title: [161035] trunk/Source
- Revision
- 161035
- Author
- [email protected]
- Date
- 2013-12-23 16:20:47 -0800 (Mon, 23 Dec 2013)
Log Message
Fix the iOS build after r161013 and r160672.
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
(WebKit::updateCustomAppearance):
* Shared/mac/RemoteLayerTreeTransaction.mm:
* WebCore.exp.in:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::updateCustomAppearance):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161034 => 161035)
--- trunk/Source/WebCore/ChangeLog 2013-12-24 00:12:51 UTC (rev 161034)
+++ trunk/Source/WebCore/ChangeLog 2013-12-24 00:20:47 UTC (rev 161035)
@@ -1,3 +1,11 @@
+2013-12-23 Tim Horton <[email protected]>
+
+ Fix the iOS build after r161013 and r160672.
+
+ * WebCore.exp.in:
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayerMac::updateCustomAppearance):
+
2013-12-23 Oliver Hunt <[email protected]>
Refactor PutPropertySlot to be aware of custom properties
Modified: trunk/Source/WebCore/WebCore.exp.in (161034 => 161035)
--- trunk/Source/WebCore/WebCore.exp.in 2013-12-24 00:12:51 UTC (rev 161034)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-12-24 00:20:47 UTC (rev 161035)
@@ -407,10 +407,6 @@
__ZN7WebCore14ScrollableAreaC2Ev
__ZN7WebCore14ScrollableAreaD2Ev
__ZN7WebCore14ScrollbarTheme5themeEv
-__ZN7WebCore17ScrollbarThemeMac28removeOverhangAreaBackgroundEP7CALayer
-__ZN7WebCore17ScrollbarThemeMac24removeOverhangAreaShadowEP7CALayer
-__ZN7WebCore17ScrollbarThemeMac27setUpOverhangAreaBackgroundEP7CALayerRKNS_5ColorE
-__ZN7WebCore17ScrollbarThemeMac23setUpOverhangAreaShadowEP7CALayer
__ZN7WebCore14SecurityOrigin16createFromStringERKN3WTF6StringE
__ZN7WebCore14SecurityOrigin28createFromDatabaseIdentifierERKN3WTF6StringE
__ZN7WebCore14SecurityOrigin6createERKN3WTF6StringES4_i
@@ -2008,6 +2004,10 @@
__ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
__ZN7WebCore16colorFromNSColorEP7NSColor
__ZN7WebCore16enclosingIntRectERK7_NSRect
+__ZN7WebCore17ScrollbarThemeMac28removeOverhangAreaBackgroundEP7CALayer
+__ZN7WebCore17ScrollbarThemeMac24removeOverhangAreaShadowEP7CALayer
+__ZN7WebCore17ScrollbarThemeMac27setUpOverhangAreaBackgroundEP7CALayerRKNS_5ColorE
+__ZN7WebCore17ScrollbarThemeMac23setUpOverhangAreaShadowEP7CALayer
__ZN7WebCore19applicationIsSafariEv
__ZN7WebCore20PlatformEventFactory24createPlatformMouseEventEP7NSEventP6NSView
__ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP7NSEvent
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (161034 => 161035)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-12-24 00:12:51 UTC (rev 161034)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-12-24 00:20:47 UTC (rev 161035)
@@ -738,6 +738,7 @@
{
m_customAppearance = appearance;
+#if ENABLE(RUBBER_BANDING)
switch (appearance) {
case GraphicsLayer::NoCustomAppearance:
ScrollbarThemeMac::removeOverhangAreaBackground(platformLayer());
@@ -750,6 +751,7 @@
ScrollbarThemeMac::setUpOverhangAreaShadow(platformLayer());
break;
}
+#endif
}
TiledBacking* PlatformCALayerMac::tiledBacking()
Modified: trunk/Source/WebKit2/ChangeLog (161034 => 161035)
--- trunk/Source/WebKit2/ChangeLog 2013-12-24 00:12:51 UTC (rev 161034)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-24 00:20:47 UTC (rev 161035)
@@ -1,3 +1,11 @@
+2013-12-23 Tim Horton <[email protected]>
+
+ Fix the iOS build after r161013 and r160672.
+
+ * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+ (WebKit::updateCustomAppearance):
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+
2013-12-23 Ryuan Choi <[email protected]>
Unreviewed build fix for EFL after r161007
Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (161034 => 161035)
--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2013-12-24 00:12:51 UTC (rev 161034)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2013-12-24 00:20:47 UTC (rev 161035)
@@ -61,6 +61,7 @@
static void updateCustomAppearance(CALayer *layer, GraphicsLayer::CustomAppearance customAppearance)
{
+#if ENABLE(RUBBER_BANDING)
switch (customAppearance) {
case GraphicsLayer::NoCustomAppearance:
ScrollbarThemeMac::removeOverhangAreaBackground(layer);
@@ -73,6 +74,9 @@
ScrollbarThemeMac::setUpOverhangAreaShadow(layer);
break;
}
+#else
+ UNUSED_PARAM(customAppearance);
+#endif
}
void RemoteLayerTreePropertyApplier::applyPropertiesToLayer(CALayer *layer, RemoteLayerTreeTransaction::LayerProperties properties, RelatedLayerMap relatedLayers)
Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (161034 => 161035)
--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2013-12-24 00:12:51 UTC (rev 161034)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2013-12-24 00:20:47 UTC (rev 161035)
@@ -31,6 +31,7 @@
#import "MessageEncoder.h"
#import "PlatformCALayerRemote.h"
#import "WebCoreArgumentCoders.h"
+#import <QuartzCore/QuartzCore.h>
#import <WebCore/TextStream.h>
#import <wtf/text/CString.h>
#import <wtf/text/StringBuilder.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
