Fix the iOS build after r161013 and r160672.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Dec 2013 00:20:47 +0000 (00:20 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Dec 2013 00:20:47 +0000 (00:20 +0000)
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
(WebKit::updateCustomAppearance):
* Shared/mac/RemoteLayerTreeTransaction.mm:
* WebCore.exp.in:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::updateCustomAppearance):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm
Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm

index af98d66..21e7321 100644 (file)
@@ -1,3 +1,11 @@
+2013-12-23  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the iOS build after r161013 and r160672.
+
+        * WebCore.exp.in:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayerMac::updateCustomAppearance):
+
 2013-12-23  Oliver Hunt  <oliver@apple.com>
 
         Refactor PutPropertySlot to be aware of custom properties
index 46159a4..c8678b5 100644 (file)
@@ -407,10 +407,6 @@ __ZN7WebCore14ScrollableArea6scrollENS_15ScrollDirectionENS_17ScrollGranularityE
 __ZN7WebCore14ScrollableAreaC2Ev
 __ZN7WebCore14ScrollableAreaD2Ev
 __ZN7WebCore14ScrollbarTheme5themeEv
-__ZN7WebCore17ScrollbarThemeMac28removeOverhangAreaBackgroundEP7CALayer
-__ZN7WebCore17ScrollbarThemeMac24removeOverhangAreaShadowEP7CALayer
-__ZN7WebCore17ScrollbarThemeMac27setUpOverhangAreaBackgroundEP7CALayerRKNS_5ColorE
-__ZN7WebCore17ScrollbarThemeMac23setUpOverhangAreaShadowEP7CALayer
 __ZN7WebCore14SecurityOrigin16createFromStringERKN3WTF6StringE
 __ZN7WebCore14SecurityOrigin28createFromDatabaseIdentifierERKN3WTF6StringE
 __ZN7WebCore14SecurityOrigin6createERKN3WTF6StringES4_i
@@ -2008,6 +2004,10 @@ __ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_16FontWidth
 __ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
 __ZN7WebCore16colorFromNSColorEP7NSColor
 __ZN7WebCore16enclosingIntRectERK7_NSRect
+__ZN7WebCore17ScrollbarThemeMac28removeOverhangAreaBackgroundEP7CALayer
+__ZN7WebCore17ScrollbarThemeMac24removeOverhangAreaShadowEP7CALayer
+__ZN7WebCore17ScrollbarThemeMac27setUpOverhangAreaBackgroundEP7CALayerRKNS_5ColorE
+__ZN7WebCore17ScrollbarThemeMac23setUpOverhangAreaShadowEP7CALayer
 __ZN7WebCore19applicationIsSafariEv
 __ZN7WebCore20PlatformEventFactory24createPlatformMouseEventEP7NSEventP6NSView
 __ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP7NSEvent
index 3e13c33..e363a00 100644 (file)
@@ -738,6 +738,7 @@ void PlatformCALayerMac::updateCustomAppearance(GraphicsLayer::CustomAppearance
 {
     m_customAppearance = appearance;
 
+#if ENABLE(RUBBER_BANDING)
     switch (appearance) {
     case GraphicsLayer::NoCustomAppearance:
         ScrollbarThemeMac::removeOverhangAreaBackground(platformLayer());
@@ -750,6 +751,7 @@ void PlatformCALayerMac::updateCustomAppearance(GraphicsLayer::CustomAppearance
         ScrollbarThemeMac::setUpOverhangAreaShadow(platformLayer());
         break;
     }
+#endif
 }
 
 TiledBacking* PlatformCALayerMac::tiledBacking()
index 4295363..2639a0e 100644 (file)
@@ -1,3 +1,11 @@
+2013-12-23  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the iOS build after r161013 and r160672.
+
+        * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+        (WebKit::updateCustomAppearance):
+        * Shared/mac/RemoteLayerTreeTransaction.mm:
+
 2013-12-23  Ryuan Choi  <ryuan.choi@samsung.com>
 
         Unreviewed build fix for EFL after r161007
index 5d637e5..48f31fa 100644 (file)
@@ -61,6 +61,7 @@ static NSString *toCAFilterType(PlatformCALayer::FilterType type)
 
 static void updateCustomAppearance(CALayer *layer, GraphicsLayer::CustomAppearance customAppearance)
 {
+#if ENABLE(RUBBER_BANDING)
     switch (customAppearance) {
     case GraphicsLayer::NoCustomAppearance:
         ScrollbarThemeMac::removeOverhangAreaBackground(layer);
@@ -73,6 +74,9 @@ static void updateCustomAppearance(CALayer *layer, GraphicsLayer::CustomAppearan
         ScrollbarThemeMac::setUpOverhangAreaShadow(layer);
         break;
     }
+#else
+    UNUSED_PARAM(customAppearance);
+#endif
 }
 
 void RemoteLayerTreePropertyApplier::applyPropertiesToLayer(CALayer *layer, RemoteLayerTreeTransaction::LayerProperties properties, RelatedLayerMap relatedLayers)
index 51b93a2..bfbd35d 100644 (file)
@@ -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>