2010-02-23 Leandro Pereira <leandro@profusion.mobi>

Reviewed by Gustavo Noronha Silva. Changes references of GOwnPtr to reflect their new place. http://webkit.org/b/35084 Canonical link: https://commits.webkit.org/46460@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@55158 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Feb 23, 2010 · 89fe03e · 89fe03e
1 parent 948b3bc
commit 89fe03e
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-23  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Changes references of GOwnPtr to reflect their new place.
+        http://webkit.org/b/35084
+
+        * JavaScriptCore/JavaScriptCore.gypi:
+        * JavaScriptCore/wtf/Threading.h:
+        * JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h:
+
 2010-02-23  Leandro Pereira  <leandro@profusion.mobi>
 
         Reviewed by Gustavo Noronha Silva.

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-23  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Changes references of GOwnPtr to reflect their new place.
+        http://webkit.org/b/35084
+
+        * JavaScriptCore/JavaScriptCore.gypi:
+        * JavaScriptCore/wtf/Threading.h:
+        * JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h:
+
 2010-02-23  Leandro Pereira  <leandro@profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.

diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
@@ -368,8 +368,8 @@
             'wtf/FastMalloc.h',
             'wtf/Forward.h',
             'wtf/GetPtr.h',
-            'wtf/gtk/GOwnPtr.cpp',
-            'wtf/gtk/GOwnPtr.h',
+            'wtf/gobject/GOwnPtr.cpp',
+            'wtf/gobject/GOwnPtr.h',
             'wtf/gtk/MainThreadGtk.cpp',
             'wtf/gtk/ThreadingGtk.cpp',
             'wtf/HashCountedSet.h',

diff --git 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/gtk/GOwnPtr.h>
+#include "GOwnPtr.h"
 typedef struct _GMutex GMutex;
 typedef struct _GCond GCond;
 #endif

diff --git 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/gtk/GOwnPtr.h>
+#include "GOwnPtr.h"
 
 #include <glib.h>
 #include <pango/pango.h>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-23  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Changes references of GOwnPtr to reflect their new place.
+        http://webkit.org/b/35084
+
+        * WebCore/platform/KURL.cpp
+        * WebCore/platform/TextEncoding.cpp:
+        * WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp: 
+        * WebCore/platform/text/gtk/TextCodecGtk.cpp:
+
 2010-02-23  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Alexey Proskuryakov.

diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp
@@ -41,7 +41,7 @@
 #include <QUrl>
 #elif USE(GLIB_UNICODE)
 #include <glib.h>
-#include <wtf/gtk/GOwnPtr.h>
+#include "GOwnPtr.h"
 #endif
 
 #include <stdio.h>

diff --git 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/gtk/GOwnPtr.h>
+#include "GOwnPtr.h"
 #endif
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>

diff --git a/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp b/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "config.h"
+#include "GOwnPtr.h"
 #include "TextBreakIterator.h"
 
 #include <pango/pango.h>
-#include <wtf/gtk/GOwnPtr.h>
 
 namespace WebCore {
 

diff --git a/WebCore/platform/text/gtk/TextCodecGtk.cpp b/WebCore/platform/text/gtk/TextCodecGtk.cpp
@@ -30,11 +30,11 @@
 #include "TextCodecGtk.h"
 
 #include "CString.h"
+#include "GOwnPtr.h"
+#include "Logging.h"
 #include "PlatformString.h"
 #include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
-#include <wtf/gtk/GOwnPtr.h>
-#include "Logging.h"
 
 using std::min;