[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

mjs at apple.com mjs at apple.com
Thu Apr 8 01:58:42 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 633bc4d8bdd9a67211785876d66d9703f927960b
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 04:15:31 2010 +0000

    Unreviewed build fix.
    
    Fix gtk build.
    
    Include JSC headers as runtime/ instead of JavaScriptCore/
    
    * bindings/js/JSDOMWrapper.h:
    * bindings/js/ScriptWrappable.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e8b257a..c54556d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-02-24  Maciej Stachowiak  <mjs at apple.com>
 
+        Unreviewed build fix.
+
+        Fix gtk build.
+
+        Include JSC headers as runtime/ instead of JavaScriptCore/
+
+        * bindings/js/JSDOMWrapper.h:
+        * bindings/js/ScriptWrappable.h:
+
+2010-02-24  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Oliver Hunt.
 
         Cache JavaScript wrappers inline in DOM nodes
diff --git a/WebCore/bindings/js/JSDOMWrapper.h b/WebCore/bindings/js/JSDOMWrapper.h
index dfb6d8c..00594cf 100644
--- a/WebCore/bindings/js/JSDOMWrapper.h
+++ b/WebCore/bindings/js/JSDOMWrapper.h
@@ -22,7 +22,7 @@
 #ifndef JSDOMWrapper_h
 #define JSDOMWrapper_h
 
-#include <JavaScriptCore/JSObject.h>
+#include <runtime/JSObject.h>
 
 namespace WebCore {
 
diff --git a/WebCore/bindings/js/ScriptWrappable.h b/WebCore/bindings/js/ScriptWrappable.h
index eff6759..5e99c1c 100644
--- a/WebCore/bindings/js/ScriptWrappable.h
+++ b/WebCore/bindings/js/ScriptWrappable.h
@@ -32,7 +32,7 @@
 #define ScriptWrappable_h
 
 #include "JSDOMWrapper.h"
-#include <JavaScriptCore/WeakGCPtr.h>
+#include <runtime/WeakGCPtr.h>
 
 namespace WebCore {
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list