[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Wed Apr 7 23:58:17 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7e391fb3c679a8559d2c5bf7f961ad246a87e74f
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 27 04:06:37 2009 +0000
2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Oliver Hunt.
Move GOwnPtr* from wtf to wtf/gtk
https://bugs.webkit.org/show_bug.cgi?id=31793
* GNUmakefile.am: Change the path for GOwnPtr.*.
* JavaScriptCore.gyp/JavaScriptCore.gyp: Remove
GOwnPtr.cpp from the exclude list.
* JavaScriptCore.gypi: Change the path for GOwnPtr.*.
* wscript: Remove GOwnPtr.cpp from the exclude list.
* wtf/GOwnPtr.cpp: Removed.
* wtf/GOwnPtr.h: Removed.
* wtf/Threading.h: Change the path for GOwnPtr.h.
* wtf/gtk/GOwnPtr.cpp: Copied from JavaScriptCore/wtf/GOwnPtr.cpp.
* wtf/gtk/GOwnPtr.h: Copied from JavaScriptCore/wtf/GOwnPtr.h.
* wtf/unicode/glib/UnicodeGLib.h: Change the path for GOwnPtr.h.
2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Oliver Hunt.
Move GOwnPtr* from wtf to wtf/gtk
https://bugs.webkit.org/show_bug.cgi?id=31793
* webkit/webkitwebview.cpp: Change the path for GOwnPtr.h.
2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Oliver Hunt.
Move GOwnPtr* from wtf to wtf/gtk
https://bugs.webkit.org/show_bug.cgi?id=31793
No new tests as there is no functional change.
* platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: Change the
path for GOwnPtr.h.
* platform/text/TextEncoding.cpp: Ditto.
* platform/text/gtk/TextCodecGtk.cpp: Ditto.
2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Oliver Hunt.
Move GOwnPtr* from wtf to wtf/gtk
https://bugs.webkit.org/show_bug.cgi?id=31793
* GNUmakefile.am: Add JavaScriptCore/wtf/gtk to
the include path.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51423 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 2db9fe1..864a51e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Oliver Hunt.
+
+ Move GOwnPtr* from wtf to wtf/gtk
+ https://bugs.webkit.org/show_bug.cgi?id=31793
+
+ * GNUmakefile.am: Add JavaScriptCore/wtf/gtk to
+ the include path.
+
2009-11-24 Dmitry Titov <dimich at chromium.org>
Reviewed by Eric Seidel.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index a080f95..2c32086 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -157,6 +157,7 @@ javascriptcore_cppflags += \
-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
-I$(srcdir)/JavaScriptCore/parser \
-I$(srcdir)/JavaScriptCore/wtf \
+ -I$(srcdir)/JavaScriptCore/wtf/gtk \
-I$(top_builddir)/DerivedSources
nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d5d506e..7c75aa4 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Oliver Hunt.
+
+ Move GOwnPtr* from wtf to wtf/gtk
+ https://bugs.webkit.org/show_bug.cgi?id=31793
+
+ * GNUmakefile.am: Change the path for GOwnPtr.*.
+ * JavaScriptCore.gyp/JavaScriptCore.gyp: Remove
+ GOwnPtr.cpp from the exclude list.
+ * JavaScriptCore.gypi: Change the path for GOwnPtr.*.
+ * wscript: Remove GOwnPtr.cpp from the exclude list.
+ * wtf/GOwnPtr.cpp: Removed.
+ * wtf/GOwnPtr.h: Removed.
+ * wtf/Threading.h: Change the path for GOwnPtr.h.
+ * wtf/gtk/GOwnPtr.cpp: Copied from JavaScriptCore/wtf/GOwnPtr.cpp.
+ * wtf/gtk/GOwnPtr.h: Copied from JavaScriptCore/wtf/GOwnPtr.h.
+ * wtf/unicode/glib/UnicodeGLib.h: Change the path for GOwnPtr.h.
+
2009-11-24 Dmitry Titov <dimich at chromium.org>
Reviewed by Eric Seidel.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index df9f09c..2132f77 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -236,8 +236,6 @@ javascriptcore_sources += \
JavaScriptCore/wtf/Deque.h \
JavaScriptCore/wtf/DisallowCType.h \
JavaScriptCore/wtf/Forward.h \
- JavaScriptCore/wtf/GOwnPtr.cpp \
- JavaScriptCore/wtf/GOwnPtr.h \
JavaScriptCore/wtf/GetPtr.h \
JavaScriptCore/wtf/HashCountedSet.h \
JavaScriptCore/wtf/HashFunctions.h \
@@ -288,6 +286,8 @@ javascriptcore_sources += \
JavaScriptCore/wtf/UnusedParam.h \
JavaScriptCore/wtf/Vector.h \
JavaScriptCore/wtf/VectorTraits.h \
+ JavaScriptCore/wtf/gtk/GOwnPtr.cpp \
+ JavaScriptCore/wtf/gtk/GOwnPtr.h \
JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
JavaScriptCore/wtf/unicode/Collator.h \
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
index 83bec5e..85fcebb 100644
--- a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -114,7 +114,7 @@
# ... Then include what we want.
['include', '../wtf/'],
# GLib/GTK, even though its name doesn't really indicate.
- ['exclude', '/(GOwnPtr|glib/.*)\\.(cpp|h)$'],
+ ['exclude', '/(glib/.*)\\.(cpp|h)$'],
['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx)\\.(cpp|mm)$'],
['exclude', 'wtf/CurrentTime\\.cpp$'],
['exclude', 'wtf/TC.*\\.(cpp|h)$'],
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index c0c363a..38097c9 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -370,8 +370,8 @@
'wtf/FastMalloc.h',
'wtf/Forward.h',
'wtf/GetPtr.h',
- 'wtf/GOwnPtr.cpp',
- 'wtf/GOwnPtr.h',
+ 'wtf/gtk/GOwnPtr.cpp',
+ 'wtf/gtk/GOwnPtr.h',
'wtf/gtk/MainThreadGtk.cpp',
'wtf/gtk/ThreadingGtk.cpp',
'wtf/HashCountedSet.h',
diff --git a/JavaScriptCore/wscript b/JavaScriptCore/wscript
index 7a5ba1b..356950f 100644
--- a/JavaScriptCore/wscript
+++ b/JavaScriptCore/wscript
@@ -29,7 +29,7 @@ import commands
from settings import *
-jscore_excludes = ['jsc.cpp', 'ucptable.cpp', 'GOwnPtr.cpp']
+jscore_excludes = ['jsc.cpp', 'ucptable.cpp']
jscore_excludes.extend(get_excludes(jscore_dir, ['*CF.cpp', '*Symbian.cpp']))
sources = []
diff --git a/JavaScriptCore/wtf/Threading.h b/JavaScriptCore/wtf/Threading.h
index b24e7c8..2a2e9c4 100644
--- a/JavaScriptCore/wtf/Threading.h
+++ b/JavaScriptCore/wtf/Threading.h
@@ -86,7 +86,7 @@
#if USE(PTHREADS)
#include <pthread.h>
#elif PLATFORM(GTK)
-#include <wtf/GOwnPtr.h>
+#include <wtf/gtk/GOwnPtr.h>
typedef struct _GMutex GMutex;
typedef struct _GCond GCond;
#endif
diff --git a/JavaScriptCore/wtf/GOwnPtr.cpp b/JavaScriptCore/wtf/gtk/GOwnPtr.cpp
similarity index 100%
rename from JavaScriptCore/wtf/GOwnPtr.cpp
rename to JavaScriptCore/wtf/gtk/GOwnPtr.cpp
diff --git a/JavaScriptCore/wtf/GOwnPtr.h b/JavaScriptCore/wtf/gtk/GOwnPtr.h
similarity index 100%
rename from JavaScriptCore/wtf/GOwnPtr.h
rename to JavaScriptCore/wtf/gtk/GOwnPtr.h
diff --git a/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h b/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h
index b5e70d4..d72e707 100644
--- a/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h
+++ b/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h
@@ -26,7 +26,7 @@
#define UnicodeGLib_h
#include "UnicodeMacrosFromICU.h"
-#include <wtf/GOwnPtr.h>
+#include <wtf/gtk/GOwnPtr.h>
#include <glib.h>
#include <pango/pango.h>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 983170b..a6f1402 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Oliver Hunt.
+
+ Move GOwnPtr* from wtf to wtf/gtk
+ https://bugs.webkit.org/show_bug.cgi?id=31793
+
+ No new tests as there is no functional change.
+
+ * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: Change the
+ path for GOwnPtr.h.
+ * platform/text/TextEncoding.cpp: Ditto.
+ * platform/text/gtk/TextCodecGtk.cpp: Ditto.
+
2009-11-26 Yury Semikhatsky <yurys at chromium.org>
Not reviewed. Build fix: revert r51421.
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
index c0242a1..92de392 100644
--- a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
@@ -46,7 +46,7 @@
#include <gst/video/video.h>
#include <limits>
#include <math.h>
-#include <wtf/GOwnPtr.h>
+#include <wtf/gtk/GOwnPtr.h>
using namespace std;
diff --git a/WebCore/platform/text/TextEncoding.cpp b/WebCore/platform/text/TextEncoding.cpp
index 0c07b11..ec9a8b0 100644
--- a/WebCore/platform/text/TextEncoding.cpp
+++ b/WebCore/platform/text/TextEncoding.cpp
@@ -38,7 +38,7 @@
#include <QString>
#elif USE(GLIB_UNICODE)
#include <glib.h>
-#include <wtf/GOwnPtr.h>
+#include <wtf/gtk/GOwnPtr.h>
#endif
#include <wtf/HashSet.h>
#include <wtf/OwnPtr.h>
diff --git a/WebCore/platform/text/gtk/TextCodecGtk.cpp b/WebCore/platform/text/gtk/TextCodecGtk.cpp
index eef421e..31da3b7 100644
--- a/WebCore/platform/text/gtk/TextCodecGtk.cpp
+++ b/WebCore/platform/text/gtk/TextCodecGtk.cpp
@@ -33,7 +33,7 @@
#include "PlatformString.h"
#include <wtf/Assertions.h>
#include <wtf/HashMap.h>
-#include <wtf/GOwnPtr.h>
+#include <wtf/gtk/GOwnPtr.h>
#include "Logging.h"
using std::min;
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 0dad90c..2f6adfb 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Oliver Hunt.
+
+ Move GOwnPtr* from wtf to wtf/gtk
+ https://bugs.webkit.org/show_bug.cgi?id=31793
+
+ * webkit/webkitwebview.cpp: Change the path for GOwnPtr.h.
+
2009-11-24 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index b8048e3..4da65aa 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -73,7 +73,7 @@
#include "RenderView.h"
#include "ScriptValue.h"
#include "Scrollbar.h"
-#include <wtf/GOwnPtr.h>
+#include <wtf/gtk/GOwnPtr.h>
#include <gdk/gdkkeysyms.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list