Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (161815 => 161816)
--- trunk/Source/_javascript_Core/ChangeLog 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-01-12 19:15:54 UTC (rev 161816)
@@ -1,3 +1,12 @@
+2014-01-12 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * GNUmakefile.am: Add inline-and-minify-stylesheets-and-scripts.py
+ to EXTRA_DIST and fix InjectedScriptSource.h generation rule.
+ * GNUmakefile.list.am: Move InjectedScriptSource.h to
+ built_nosources to make sure it's not disted.
+
2014-01-11 Anders Carlsson <[email protected]>
Try again to fix the build.
Modified: trunk/Source/_javascript_Core/GNUmakefile.am (161815 => 161816)
--- trunk/Source/_javascript_Core/GNUmakefile.am 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/_javascript_Core/GNUmakefile.am 2014-01-12 19:15:54 UTC (rev 161816)
@@ -198,6 +198,7 @@
Source/_javascript_Core/inspector/scripts/CodeGeneratorInspectorStrings.py \
Source/_javascript_Core/inspector/scripts/cssmin.py \
Source/_javascript_Core/inspector/scripts/generate-combined-inspector-json.py \
+ Source/_javascript_Core/inspector/scripts/inline-and-minify-stylesheets-and-scripts.py \
Source/_javascript_Core/inspector/scripts/jsmin.py \
Source/_javascript_Core/inspector/scripts/xxd.pl \
Source/_javascript_Core/KeywordLookupGenerator.py \
@@ -252,6 +253,7 @@
DerivedSources/_javascript_Core/InspectorJSBackendCommands.js: DerivedSources/_javascript_Core/InspectorJSBackendDispatchers.h
DerivedSources/_javascript_Core/InspectorJSBackendDispatchers.h: DerivedSources/_javascript_Core/InspectorJSBackendDispatchers.cpp
-DerivedSources/_javascript_Core/InjectedScriptSource.h: $(_javascript_Core)/inspector/InjectedScriptSource.js
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py <$(_javascript_Core)/inspector/InjectedScriptSource.js > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
- $(AM_V_GEN)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.h
+DerivedSources/_javascript_Core/InjectedScriptSource.h: $(_javascript_Core)/inspector/InjectedScriptSource.js $(INSPECTOR_SCRIPTS_DIR)/xxd.pl $(INSPECTOR_SCRIPTS_DIR)/jsmin.py
+ $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py < $< > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
+ $(AM_V_at)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $@
+ $(AM_V_at)rm -rf $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (161815 => 161816)
--- trunk/Source/_javascript_Core/GNUmakefile.list.am 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2014-01-12 19:15:54 UTC (rev 161816)
@@ -8,6 +8,7 @@
Source/_javascript_Core/API/WebKitAvailability.h
_javascript_core_built_nosources += \
+ DerivedSources/_javascript_Core/InjectedScriptSource.h \
DerivedSources/_javascript_Core/KeywordLookup.h \
DerivedSources/_javascript_Core/Lexer.lut.h \
DerivedSources/_javascript_Core/RegExpJitTables.h \
@@ -1209,7 +1210,6 @@
Source/_javascript_Core/yarr/YarrPattern.h \
Source/_javascript_Core/yarr/YarrSyntaxChecker.cpp \
Source/_javascript_Core/yarr/YarrSyntaxChecker.h \
- DerivedSources/_javascript_Core/InjectedScriptSource.h \
DerivedSources/_javascript_Core/InspectorJSBackendDispatchers.cpp \
DerivedSources/_javascript_Core/InspectorJSBackendDispatchers.h \
DerivedSources/_javascript_Core/InspectorJSFrontendDispatchers.cpp \
Modified: trunk/Source/WebCore/ChangeLog (161815 => 161816)
--- trunk/Source/WebCore/ChangeLog 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 19:15:54 UTC (rev 161816)
@@ -1,3 +1,9 @@
+2014-01-12 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * GNUmakefile.list.am: Add missing files.
+
2014-01-12 Simon Fraser <[email protected]>
Fix some CoreVideo linker errors on iOS by softlinking with more CoreVideo
Modified: trunk/Source/WebCore/GNUmakefile.list.am (161815 => 161816)
--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-12 19:15:54 UTC (rev 161816)
@@ -4249,6 +4249,7 @@
Source/WebCore/page/UserStyleSheet.h \
Source/WebCore/page/UserStyleSheetTypes.h \
Source/WebCore/page/ValidationMessageClient.h \
+ Source/WebCore/page/ViewState.h \
Source/WebCore/page/WebCoreKeyboardUIMode.h \
Source/WebCore/page/WebKitPoint.h \
Source/WebCore/page/WindowFeatures.cpp \
@@ -4343,7 +4344,7 @@
Source/WebCore/rendering/RenderAncestorIterator.h \
Source/WebCore/rendering/RenderBlock.cpp \
Source/WebCore/rendering/RenderBlock.h \
- Source/WebCore/rendering/RenderBlockFlow.cpp \
+ Source/WebCore/rendering/RenderBlockFlow.cpp \
Source/WebCore/rendering/RenderBlockFlow.h \
Source/WebCore/rendering/RenderBlockLineLayout.cpp \
Source/WebCore/rendering/RenderBox.cpp \
@@ -4440,8 +4441,8 @@
Source/WebCore/rendering/RenderMultiColumnFlowThread.h \
Source/WebCore/rendering/RenderMultiColumnSet.cpp \
Source/WebCore/rendering/RenderMultiColumnSet.h \
- Source/WebCore/rendering/RenderNamedFlowFragment.cpp \
- Source/WebCore/rendering/RenderNamedFlowFragment.h \
+ Source/WebCore/rendering/RenderNamedFlowFragment.cpp \
+ Source/WebCore/rendering/RenderNamedFlowFragment.h \
Source/WebCore/rendering/RenderNamedFlowThread.cpp \
Source/WebCore/rendering/RenderNamedFlowThread.h \
Source/WebCore/rendering/RenderObject.cpp \
@@ -4449,6 +4450,7 @@
Source/WebCore/rendering/RenderOverflow.h \
Source/WebCore/rendering/RenderProgress.cpp \
Source/WebCore/rendering/RenderProgress.h \
+ Source/WebCore/rendering/RenderPtr.h \
Source/WebCore/rendering/RenderQuote.cpp \
Source/WebCore/rendering/RenderQuote.h \
Source/WebCore/rendering/RenderRegion.cpp \
@@ -5559,6 +5561,9 @@
Source/WebCore/platform/audio/AudioResampler.h \
Source/WebCore/platform/audio/AudioResamplerKernel.cpp \
Source/WebCore/platform/audio/AudioResamplerKernel.h \
+ Source/WebCore/platform/audio/AudioSession.cpp \
+ Source/WebCore/platform/audio/AudioSession.h \
+ Source/WebCore/platform/audio/AudioSessionListener.h \
Source/WebCore/platform/audio/AudioSourceProvider.h \
Source/WebCore/platform/audio/AudioSourceProviderClient.h \
Source/WebCore/platform/audio/AudioUtilities.cpp \
Modified: trunk/Source/WebKit/gtk/ChangeLog (161815 => 161816)
--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-12 19:15:54 UTC (rev 161816)
@@ -1,3 +1,9 @@
+2014-01-12 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * GNUmakefile.am: Add enum types template files to EXTRA_DIST.
+
2014-01-12 Tobias Mueller <[email protected]>
--disable-dependency-tracking causes build failure due to missing directories
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (161815 => 161816)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2014-01-12 19:15:54 UTC (rev 161816)
@@ -389,6 +389,8 @@
$(WebKit)/docs/webkitenvironment.xml \
$(WebKit)/docs/webkitgtk-overrides.txt \
$(WebKit)/webkitmarshal.list \
+ $(WebKit)/webkit/webkitenumtypes.cpp.template \
+ $(WebKit)/webkit/webkitenumtypes.h.template \
$(WebKit)/resources/*
# extra resource files
Modified: trunk/Source/WebKit2/ChangeLog (161815 => 161816)
--- trunk/Source/WebKit2/ChangeLog 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-12 19:15:54 UTC (rev 161816)
@@ -1,5 +1,16 @@
2014-01-12 Carlos Garcia Campos <[email protected]>
+ Unreviewed. Fix make distcheck.
+
+ * GNUmakefile.am: Add WebKit2InspectorGResourceBundle.xml to
+ EXTRA_DIST.
+ * GNUmakefile.list.am: Removed deleted files and add missing ones.
+ * NetworkProcess/unix/NetworkProcessMainUnix.cpp: Move
+ ProxyResolverSoup.h to EFL platform ifdef, because GTK port doesn't
+ build the proxy resolver.
+
+2014-01-12 Carlos Garcia Campos <[email protected]>
+
[GTK] Fix return value of WebKitDownload::created-destination
https://bugs.webkit.org/show_bug.cgi?id=126741
Modified: trunk/Source/WebKit2/GNUmakefile.am (161815 => 161816)
--- trunk/Source/WebKit2/GNUmakefile.am 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebKit2/GNUmakefile.am 2014-01-12 19:15:54 UTC (rev 161816)
@@ -815,6 +815,7 @@
$(WebKit2)/UIProcess/API/gtk/webkit2marshal.list \
$(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template \
$(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template \
+ $(WebKit2)/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml \
$(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html \
$(WebKit2)/Scripts/generate-forwarding-headers.pl \
$(shell ls $(WebKit2)/NetworkProcess/*.in) \
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (161815 => 161816)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-12 19:15:54 UTC (rev 161816)
@@ -256,7 +256,6 @@
Source/WebKit2/Shared/FontInfo.h \
Source/WebKit2/Shared/HTTPCookieAcceptPolicy.h \
Source/WebKit2/Shared/ResourceCachesToClear.h \
- Source/WebKit2/Shared/ViewState.h \
Source/WebKit2/Shared/WebMemorySampler.h \
Source/WebKit2/Shared/APIArray.cpp \
Source/WebKit2/Shared/APIArray.h \
@@ -377,7 +376,6 @@
Source/WebKit2/Shared/EditorState.h \
Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp \
Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h \
- Source/WebKit2/Shared/FilterIterator.h \
Source/WebKit2/Shared/FontSmoothingLevel.h \
Source/WebKit2/Shared/ProcessExecutablePath.h \
Source/WebKit2/Shared/UserData.cpp \
@@ -396,7 +394,6 @@
Source/WebKit2/Shared/ImageOptions.h \
Source/WebKit2/Shared/ImmutableDictionary.cpp \
Source/WebKit2/Shared/ImmutableDictionary.h \
- Source/WebKit2/Shared/IteratorPair.h \
Source/WebKit2/Shared/LayerTreeContext.h \
Source/WebKit2/Shared/MutableDictionary.cpp \
Source/WebKit2/Shared/MutableDictionary.h \
@@ -622,6 +619,8 @@
Source/WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h \
Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h \
Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp \
+ Source/WebKit2/UIProcess/API/C/WKSessionRef.h \
+ Source/WebKit2/UIProcess/API/C/WKSessionRef.cpp \
Source/WebKit2/UIProcess/API/C/WKTextChecker.h \
Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp \
Source/WebKit2/UIProcess/API/C/WKVibration.cpp \
@@ -788,6 +787,8 @@
Source/WebKit2/UIProcess/AutoCorrectionCallback.h \
Source/WebKit2/UIProcess/APINavigationData.cpp \
Source/WebKit2/UIProcess/APINavigationData.h \
+ Source/WebKit2/UIProcess/APISession.cpp \
+ Source/WebKit2/UIProcess/APISession.h \
Source/WebKit2/UIProcess/BackingStore.cpp \
Source/WebKit2/UIProcess/BackingStore.h \
Source/WebKit2/UIProcess/DefaultUndoController.cpp \
Modified: trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp (161815 => 161816)
--- trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp 2014-01-12 19:15:54 UTC (rev 161816)
@@ -29,7 +29,6 @@
#if ENABLE(NETWORK_PROCESS)
-#include "ProxyResolverSoup.h"
#include "WKBase.h"
#include "WebKit2Initialize.h"
#include <WebCore/ResourceHandle.h>
@@ -42,6 +41,7 @@
#include <wtf/gobject/GRefPtr.h>
#if PLATFORM(EFL)
+#include "ProxyResolverSoup.h"
#include <Ecore.h>
#endif
Modified: trunk/Tools/ChangeLog (161815 => 161816)
--- trunk/Tools/ChangeLog 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Tools/ChangeLog 2014-01-12 19:15:54 UTC (rev 161816)
@@ -1,3 +1,10 @@
+2014-01-12 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * gtk/GNUmakefile.am: Add generate-inspector-gresource-manifest.py
+ to EXTRA_DIST.
+
2014-01-12 Tobias Mueller <[email protected]>
--disable-dependency-tracking causes build failure due to missing directories
Modified: trunk/Tools/gtk/GNUmakefile.am (161815 => 161816)
--- trunk/Tools/gtk/GNUmakefile.am 2014-01-12 19:01:30 UTC (rev 161815)
+++ trunk/Tools/gtk/GNUmakefile.am 2014-01-12 19:15:54 UTC (rev 161816)
@@ -2,6 +2,7 @@
Tools/gtk/common.py \
Tools/gtk/generate-feature-defines-files \
Tools/gtk/generate-gtkdoc \
+ Tools/gtk/generate-inspector-gresource-manifest.py \
Tools/gtk/generate-webkitdom-doc-files \
Tools/gtk/gtkdoc.py
