Title: [161712] trunk/Source/WebCore
- Revision
- 161712
- Author
- [email protected]
- Date
- 2014-01-10 18:16:22 -0800 (Fri, 10 Jan 2014)
Log Message
Fix iOS build
* Configurations/WebCore.xcconfig:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::ApplyPropertyLineHeightForIOSTextAutosizing::applyValue):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161711 => 161712)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 01:59:24 UTC (rev 161711)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 02:16:22 UTC (rev 161712)
@@ -1,5 +1,13 @@
2014-01-10 Simon Fraser <[email protected]>
+ Fix iOS build
+
+ * Configurations/WebCore.xcconfig:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyLineHeightForIOSTextAutosizing::applyValue):
+
+2014-01-10 Simon Fraser <[email protected]>
+
Fix iOS build.
* html/DateTimeLocalInputType.h:
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (161711 => 161712)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-01-11 01:59:24 UTC (rev 161711)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
@@ -112,6 +112,6 @@
_javascript_CORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/_javascript_Core.framework/PrivateHeaders;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ClipboardMac.mm ColorMac.mm Cursor.cpp CursorMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KeyEventMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollingStateScrollingNodeMac.mm ScrollingTreeScrollingNodeMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WheelEventMac.mm WidgetMac.mm mac/LayerPool.mm DisplayRefreshMonitorMac.mm;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ClipboardMac.mm ColorMac.mm Cursor.cpp CursorMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KeyEventMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollingStateScrollingNodeMac.mm ScrollingTreeScrollingNodeMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WheelEventMac.mm WidgetMac.mm mac/LayerPool.mm DisplayRefreshMonitorMac.cpp;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h;
Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (161711 => 161712)
--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-11 01:59:24 UTC (rev 161711)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-11 02:16:22 UTC (rev 161712)
@@ -1488,7 +1488,7 @@
CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
Length lineHeight;
- if (primitiveValue->getIdent() == CSSValueNormal)
+ if (primitiveValue->getValueID() == CSSValueNormal)
lineHeight = RenderStyle::initialLineHeight();
else if (primitiveValue->isLength()) {
double multiplier = styleResolver->style()->effectiveZoom();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
