Title: [241347] branches/safari-608.1.5.1-branch/Source/WebCore
- Revision
- 241347
- Author
- [email protected]
- Date
- 2019-02-12 22:43:02 -0800 (Tue, 12 Feb 2019)
Log Message
Cherry-pick r240738. rdar://problem/47686640
Ensure ENABLE_MEDIA_SOURCE is defined inside DerivedSources.make
https://bugs.webkit.org/show_bug.cgi?id=194063
Reviewed by Jon Lee.
* DerivedSources.make:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240738 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1.5.1-branch/Source/WebCore/ChangeLog (241346 => 241347)
--- branches/safari-608.1.5.1-branch/Source/WebCore/ChangeLog 2019-02-13 06:36:06 UTC (rev 241346)
+++ branches/safari-608.1.5.1-branch/Source/WebCore/ChangeLog 2019-02-13 06:43:02 UTC (rev 241347)
@@ -1,5 +1,27 @@
2019-02-12 Babak Shafiei <[email protected]>
+ Cherry-pick r240738. rdar://problem/47686640
+
+ Ensure ENABLE_MEDIA_SOURCE is defined inside DerivedSources.make
+ https://bugs.webkit.org/show_bug.cgi?id=194063
+
+ Reviewed by Jon Lee.
+
+ * DerivedSources.make:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240738 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-30 Jer Noble <[email protected]>
+
+ Ensure ENABLE_MEDIA_SOURCE is defined inside DerivedSources.make
+ https://bugs.webkit.org/show_bug.cgi?id=194063
+
+ Reviewed by Jon Lee.
+
+ * DerivedSources.make:
+
+2019-02-12 Babak Shafiei <[email protected]>
+
Cherry-pick r241015. rdar://problem/47830193
REGRESSION (r240909): Release assert in FrameLoader::loadURL when navigating with a non-existent target name
Modified: branches/safari-608.1.5.1-branch/Source/WebCore/DerivedSources.make (241346 => 241347)
--- branches/safari-608.1.5.1-branch/Source/WebCore/DerivedSources.make 2019-02-13 06:36:06 UTC (rev 241346)
+++ branches/safari-608.1.5.1-branch/Source/WebCore/DerivedSources.make 2019-02-13 06:43:02 UTC (rev 241347)
@@ -1137,6 +1137,10 @@
ENABLE_ORIENTATION_EVENTS = 1
endif
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
+ ENABLE_MEDIA_SOURCE = 1
+endif
+
ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1)
FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_IOS_FAMILY
else ifeq ($(WTF_PLATFORM_MAC), 1)
@@ -1264,6 +1268,10 @@
ENABLE_ORIENTATION_EVENTS = 0
endif
+ifndef ENABLE_MEDIA_SOURCE
+ ENABLE_MEDIA_SOURCE = 0
+endif
+
ifeq ($(ENABLE_ORIENTATION_EVENTS), 1)
ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
endif
@@ -1272,6 +1280,10 @@
ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) USE_APPLE_INTERNAL_SDK
endif
+ifeq ($(ENABLE_MEDIA_SOURCE), 1)
+ ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_MEDIA_SOURCE
+endif
+
# CSS property names and value keywords
WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSProperties.json
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
