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

eric at webkit.org eric at webkit.org
Wed Apr 7 23:03:05 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit a2885d899654093d29d5178fe19a9240ede0aa7f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 22:40:33 2009 +0000

    2009-10-23  Steve Block  <steveblock at google.com>
    
            Reviewed by Eric Seidel.
    
            Fixes style problems in Android-specific files.
            https://bugs.webkit.org/show_bug.cgi?id=30717
    
            Style changes only, no new tests possible.
    
            * page/android/EventHandlerAndroid.cpp: Modified.
            (WebCore::EventHandler::passMouseDownEventToWidget): Fixes whitespace in method signature.
            (WebCore::EventHandler::passSubframeEventToSubframe): Fixes whitespace in method signature.
            (WebCore::EventHandler::passWheelEventToWidget): Fixes whitespace in method signature.
            (WebCore::EventHandler::passMouseMoveEventToSubframe): Fixes whitespace in method signature.
            * platform/android/ClipboardAndroid.h: Modified. Fixes header include order and indenting.
            * platform/android/CursorAndroid.cpp: Modified.
            (WebCore::grabCursor): Fixes function braces.
            (WebCore::grabbingCursor): Fixes function braces.
            * platform/android/FileChooserAndroid.cpp: Modified.
            (WebCore::FileChooser::basenameForWidth): Fixes braces on while statement, and updates String::copy to String::threadsafeCopy.
            * platform/android/FileSystemAndroid.cpp: Modified. Fixes header include order.
            (WebCore::unloadModule): Fixes zero test.
            (WebCore::writeToFile): Fixes if statement structure.
            * platform/android/KeyEventAndroid.cpp: Modified.
            (WebCore::windowsKeyCodeForKeyEvent): Fixes switch statement indenting.
            (WebCore::keyIdentifierForAndroidKeyCode): Fixes switch statement indenting.
            * platform/android/ScreenAndroid.cpp: Modified. Fixes header include order and switch statement indenting.
            * platform/android/TemporaryLinkStubs.cpp: Modified. Fixes header include order.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ee89fe3..d2d2ee9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2009-10-23  Steve Block  <steveblock at google.com>
+
+        Reviewed by Eric Seidel.
+
+        Fixes style problems in Android-specific files.
+        https://bugs.webkit.org/show_bug.cgi?id=30717
+
+        Style changes only, no new tests possible.
+
+        * page/android/EventHandlerAndroid.cpp: Modified.
+        (WebCore::EventHandler::passMouseDownEventToWidget): Fixes whitespace in method signature.
+        (WebCore::EventHandler::passSubframeEventToSubframe): Fixes whitespace in method signature.
+        (WebCore::EventHandler::passWheelEventToWidget): Fixes whitespace in method signature.
+        (WebCore::EventHandler::passMouseMoveEventToSubframe): Fixes whitespace in method signature.
+        * platform/android/ClipboardAndroid.h: Modified. Fixes header include order and indenting.
+        * platform/android/CursorAndroid.cpp: Modified. 
+        (WebCore::grabCursor): Fixes function braces.
+        (WebCore::grabbingCursor): Fixes function braces.
+        * platform/android/FileChooserAndroid.cpp: Modified.
+        (WebCore::FileChooser::basenameForWidth): Fixes braces on while statement, and updates String::copy to String::threadsafeCopy.
+        * platform/android/FileSystemAndroid.cpp: Modified. Fixes header include order.
+        (WebCore::unloadModule): Fixes zero test.
+        (WebCore::writeToFile): Fixes if statement structure.
+        * platform/android/KeyEventAndroid.cpp: Modified.
+        (WebCore::windowsKeyCodeForKeyEvent): Fixes switch statement indenting.
+        (WebCore::keyIdentifierForAndroidKeyCode): Fixes switch statement indenting.
+        * platform/android/ScreenAndroid.cpp: Modified. Fixes header include order and switch statement indenting.
+        * platform/android/TemporaryLinkStubs.cpp: Modified. Fixes header include order.
+
 2009-10-23  Sam Weinig  <sam at webkit.org>
 
         Another shot at a fixed build.
diff --git a/WebCore/page/android/EventHandlerAndroid.cpp b/WebCore/page/android/EventHandlerAndroid.cpp
index dcd25f2..cf2acfb 100644
--- a/WebCore/page/android/EventHandlerAndroid.cpp
+++ b/WebCore/page/android/EventHandlerAndroid.cpp
@@ -68,7 +68,7 @@ bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget)
 
 // This function is used to route the mouse down event to the native widgets, it seems like a
 // work around for the Mac platform which does not support double clicks, but browsers do.
-bool EventHandler::passMouseDownEventToWidget(Widget* )
+bool EventHandler::passMouseDownEventToWidget(Widget*)
 {
     // return false so the normal propogation handles the event
     return false;
@@ -84,7 +84,7 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const
 // It is used to ensure that events are sync'ed correctly between frames. For example
 // if the user presses down in one frame and up in another frame, this function will
 // returns true, and pass the event to the correct frame.
-bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& , Frame* , HitTestResult* )
+bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame*, HitTestResult*)
 {
     notImplemented();
     return false;
@@ -93,7 +93,7 @@ bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& , F
 // This is called to route wheel events to child widgets when they are RenderWidget
 // as the parent usually gets wheel event. Don't have a mouse with a wheel to confirm
 // the operation of this function.
-bool EventHandler::passWheelEventToWidget(PlatformWheelEvent& , Widget* )
+bool EventHandler::passWheelEventToWidget(PlatformWheelEvent&, Widget*)
 {
     notImplemented();
     return false;
@@ -105,7 +105,7 @@ bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& m
 }
 
 bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, 
-    Frame* subframe, HitTestResult* )
+    Frame* subframe, HitTestResult*)
 {
     return passSubframeEventToSubframe(mev, subframe);
 }
diff --git a/WebCore/platform/android/ClipboardAndroid.h b/WebCore/platform/android/ClipboardAndroid.h
index 7761704..8c9d9fa 100644
--- a/WebCore/platform/android/ClipboardAndroid.h
+++ b/WebCore/platform/android/ClipboardAndroid.h
@@ -33,31 +33,31 @@
 
 namespace WebCore {
 
-    class CachedImage;
+class CachedImage;
 
-    class ClipboardAndroid : public Clipboard, public CachedResourceClient {
-    public:
-        ClipboardAndroid(ClipboardAccessPolicy policy, bool isForDragging);
-        ~ClipboardAndroid();
-    
-        void clearData(const String&);
-        void clearAllData();
-        String getData(const String&, bool& success) const;
-        bool setData(const String&, const String&);
-    
-        // extensions beyond IE's API
-        HashSet<String> types() const;
+class ClipboardAndroid : public Clipboard, public CachedResourceClient {
+public:
+    ClipboardAndroid(ClipboardAccessPolicy policy, bool isForDragging);
+    ~ClipboardAndroid();
+
+    void clearData(const String&);
+    void clearAllData();
+    String getData(const String&, bool& success) const;
+    bool setData(const String&, const String&);
+
+    // extensions beyond IE's API
+    HashSet<String> types() const;
+
+    void setDragImage(CachedImage*, const IntPoint&);
+    void setDragImageElement(Node*, const IntPoint&);
     
-        void setDragImage(CachedImage*, const IntPoint&);
-        void setDragImageElement(Node*, const IntPoint&);
-        
-        virtual DragImageRef createDragImage(IntPoint&) const;
-        virtual void declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*);
-        virtual void writeURL(const KURL&, const String&, Frame*);
-        virtual void writeRange(Range*, Frame*);
+    virtual DragImageRef createDragImage(IntPoint&) const;
+    virtual void declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*);
+    virtual void writeURL(const KURL&, const String&, Frame*);
+    virtual void writeRange(Range*, Frame*);
 
-        virtual bool hasData();
-    };
+    virtual bool hasData();
+};
 
 } // namespace WebCore
 
diff --git a/WebCore/platform/android/CursorAndroid.cpp b/WebCore/platform/android/CursorAndroid.cpp
index 5c6e473..beef3b2 100644
--- a/WebCore/platform/android/CursorAndroid.cpp
+++ b/WebCore/platform/android/CursorAndroid.cpp
@@ -23,6 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
+
 #define LOG_TAG "WebCore"
 
 #include "config.h"
@@ -282,12 +283,14 @@ const Cursor& westPanningCursor()
     return c;
 }
 
-const Cursor& grabCursor() {
+const Cursor& grabCursor()
+{
     notImplemented();
     return c;
 }
 
-const Cursor& grabbingCursor() {
+const Cursor& grabbingCursor()
+{
     notImplemented();
     return c;
 }
diff --git a/WebCore/platform/android/FileChooserAndroid.cpp b/WebCore/platform/android/FileChooserAndroid.cpp
index ec1b758..caedc7a 100644
--- a/WebCore/platform/android/FileChooserAndroid.cpp
+++ b/WebCore/platform/android/FileChooserAndroid.cpp
@@ -36,10 +36,9 @@ String FileChooser::basenameForWidth(const Font& font, int width) const
         return String();
     // FIXME: This could be a lot faster, but assuming the data will not
     // often be much longer than the provided width, this may be fast enough.
-    String output = m_filenames[0].copy();
-    while (font.width(TextRun(output.impl())) > width && output.length() > 4) {
+    String output = m_filenames[0].threadsafeCopy();
+    while (font.width(TextRun(output.impl())) > width && output.length() > 4)
         output = output.replace(output.length() - 4, 4, String("..."));
-    }
     return output;
 }
 
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp
index f2665a2..46c1297 100644
--- a/WebCore/platform/android/FileSystemAndroid.cpp
+++ b/WebCore/platform/android/FileSystemAndroid.cpp
@@ -30,12 +30,12 @@
 
 #include "CString.h"
 #include "StringBuilder.h"
-#include <fnmatch.h>
-#include <dlfcn.h>
+#include "cutils/log.h"
 #include <dirent.h>
+#include <dlfcn.h>
 #include <errno.h>
+#include <fnmatch.h>
 #include <sys/stat.h>
-#include "cutils/log.h"
 
 namespace WebCore {
 
@@ -72,7 +72,7 @@ CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle)
 
 bool unloadModule(PlatformModule module)
 {
-    return dlclose(module) == 0;
+    return !dlclose(module);
 }
 
 void closeFile(PlatformFileHandle& handle)
@@ -90,7 +90,7 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length)
         int bytesWritten = write(handle, data, (size_t)(length - totalBytesWritten));
         if (bytesWritten < 0 && errno != EINTR)
             return -1;
-        else if (bytesWritten > 0)
+        if (bytesWritten > 0)
             totalBytesWritten += bytesWritten;
     }
 
diff --git a/WebCore/platform/android/KeyEventAndroid.cpp b/WebCore/platform/android/KeyEventAndroid.cpp
index ab848bd..d3c48f5 100644
--- a/WebCore/platform/android/KeyEventAndroid.cpp
+++ b/WebCore/platform/android/KeyEventAndroid.cpp
@@ -41,128 +41,128 @@ namespace WebCore {
 static int windowsKeyCodeForKeyEvent(unsigned int keyCode)
 {
     // Does not provide all key codes, and does not handle all keys.
-    switch(keyCode) {
-        case kKeyCodeDel:
-            return VK_BACK;
-        case kKeyCodeTab:
-            return VK_TAB;
-        case kKeyCodeClear:
-            return VK_CLEAR;
-        case kKeyCodeDpadCenter:
-        case kKeyCodeNewline:
-            return VK_RETURN;
-        case kKeyCodeShiftLeft:
-        case kKeyCodeShiftRight:
-            return VK_SHIFT;
-        // back will serve as escape, although we probably do not have access to it
-        case kKeyCodeBack:
-            return VK_ESCAPE;
-        case kKeyCodeSpace:
-            return VK_SPACE;
-        case kKeyCodeHome:
-            return VK_HOME;
-        case kKeyCodeDpadLeft:
-            return VK_LEFT;
-        case kKeyCodeDpadUp:
-            return VK_UP;
-        case kKeyCodeDpadRight:
-            return VK_RIGHT;
-        case kKeyCodeDpadDown:
-            return VK_DOWN;
-        case kKeyCode0:
-            return VK_0;
-        case kKeyCode1:
-            return VK_1;
-        case kKeyCode2:
-            return VK_2;
-        case kKeyCode3:
-            return VK_3;
-        case kKeyCode4:
-            return VK_4;
-        case kKeyCode5:
-            return VK_5;
-        case kKeyCode6:
-            return VK_6;
-        case kKeyCode7:
-            return VK_7;
-        case kKeyCode8:
-            return VK_8;
-        case kKeyCode9:
-            return VK_9;
-        case kKeyCodeA:
-            return VK_A;
-        case kKeyCodeB:
-            return VK_B;
-        case kKeyCodeC:
-            return VK_C;
-        case kKeyCodeD:
-            return VK_D;
-        case kKeyCodeE:
-            return VK_E;
-        case kKeyCodeF:
-            return VK_F;
-        case kKeyCodeG:
-            return VK_G;
-        case kKeyCodeH:
-            return VK_H;
-        case kKeyCodeI:
-            return VK_I;
-        case kKeyCodeJ:
-            return VK_J;
-        case kKeyCodeK:
-            return VK_K;
-        case kKeyCodeL:
-            return VK_L;
-        case kKeyCodeM:
-            return VK_M;
-        case kKeyCodeN:
-            return VK_N;
-        case kKeyCodeO:
-            return VK_O;
-        case kKeyCodeP:
-            return VK_P;
-        case kKeyCodeQ:
-            return VK_Q;
-        case kKeyCodeR:
-            return VK_R;
-        case kKeyCodeS:
-            return VK_S;
-        case kKeyCodeT:
-            return VK_T;
-        case kKeyCodeU:
-            return VK_U;
-        case kKeyCodeV:
-            return VK_V;
-        case kKeyCodeW:
-            return VK_W;
-        case kKeyCodeX:
-            return VK_X;
-        case kKeyCodeY:
-            return VK_Y;
-        case kKeyCodeZ:
-            return VK_Z;
-        // colon
-        case kKeyCodeSemicolon:
-            return VK_OEM_1;
-        case kKeyCodeComma:
-            return VK_OEM_COMMA;
-        case kKeyCodeMinus:
-            return VK_OEM_MINUS;
-        case kKeyCodeEquals:
-            return VK_OEM_PLUS;
-        case kKeyCodePeriod:
-            return VK_OEM_PERIOD;
-        case kKeyCodeSlash:
-            return VK_OEM_2;
-        // maybe not the right choice
-        case kKeyCodeLeftBracket:
-            return VK_OEM_4;
-        case kKeyCodeBackslash:
-            return VK_OEM_5;
-        case kKeyCodeRightBracket:
-            return VK_OEM_6;
-        default:
-            return 0;
+    switch (keyCode) {
+    case kKeyCodeDel:
+        return VK_BACK;
+    case kKeyCodeTab:
+        return VK_TAB;
+    case kKeyCodeClear:
+        return VK_CLEAR;
+    case kKeyCodeDpadCenter:
+    case kKeyCodeNewline:
+        return VK_RETURN;
+    case kKeyCodeShiftLeft:
+    case kKeyCodeShiftRight:
+        return VK_SHIFT;
+    // back will serve as escape, although we probably do not have access to it
+    case kKeyCodeBack:
+        return VK_ESCAPE;
+    case kKeyCodeSpace:
+        return VK_SPACE;
+    case kKeyCodeHome:
+        return VK_HOME;
+    case kKeyCodeDpadLeft:
+        return VK_LEFT;
+    case kKeyCodeDpadUp:
+        return VK_UP;
+    case kKeyCodeDpadRight:
+        return VK_RIGHT;
+    case kKeyCodeDpadDown:
+        return VK_DOWN;
+    case kKeyCode0:
+        return VK_0;
+    case kKeyCode1:
+        return VK_1;
+    case kKeyCode2:
+        return VK_2;
+    case kKeyCode3:
+        return VK_3;
+    case kKeyCode4:
+        return VK_4;
+    case kKeyCode5:
+        return VK_5;
+    case kKeyCode6:
+        return VK_6;
+    case kKeyCode7:
+        return VK_7;
+    case kKeyCode8:
+        return VK_8;
+    case kKeyCode9:
+        return VK_9;
+    case kKeyCodeA:
+        return VK_A;
+    case kKeyCodeB:
+        return VK_B;
+    case kKeyCodeC:
+        return VK_C;
+    case kKeyCodeD:
+        return VK_D;
+    case kKeyCodeE:
+        return VK_E;
+    case kKeyCodeF:
+        return VK_F;
+    case kKeyCodeG:
+        return VK_G;
+    case kKeyCodeH:
+        return VK_H;
+    case kKeyCodeI:
+        return VK_I;
+    case kKeyCodeJ:
+        return VK_J;
+    case kKeyCodeK:
+        return VK_K;
+    case kKeyCodeL:
+        return VK_L;
+    case kKeyCodeM:
+        return VK_M;
+    case kKeyCodeN:
+        return VK_N;
+    case kKeyCodeO:
+        return VK_O;
+    case kKeyCodeP:
+        return VK_P;
+    case kKeyCodeQ:
+        return VK_Q;
+    case kKeyCodeR:
+        return VK_R;
+    case kKeyCodeS:
+        return VK_S;
+    case kKeyCodeT:
+        return VK_T;
+    case kKeyCodeU:
+        return VK_U;
+    case kKeyCodeV:
+        return VK_V;
+    case kKeyCodeW:
+        return VK_W;
+    case kKeyCodeX:
+        return VK_X;
+    case kKeyCodeY:
+        return VK_Y;
+    case kKeyCodeZ:
+        return VK_Z;
+    // colon
+    case kKeyCodeSemicolon:
+        return VK_OEM_1;
+    case kKeyCodeComma:
+        return VK_OEM_COMMA;
+    case kKeyCodeMinus:
+        return VK_OEM_MINUS;
+    case kKeyCodeEquals:
+        return VK_OEM_PLUS;
+    case kKeyCodePeriod:
+        return VK_OEM_PERIOD;
+    case kKeyCodeSlash:
+        return VK_OEM_2;
+    // maybe not the right choice
+    case kKeyCodeLeftBracket:
+        return VK_OEM_4;
+    case kKeyCodeBackslash:
+        return VK_OEM_5;
+    case kKeyCodeRightBracket:
+        return VK_OEM_6;
+    default:
+        return 0;
     }
 }
 
@@ -171,28 +171,28 @@ static String keyIdentifierForAndroidKeyCode(int keyCode)
     // Does not return all of the same key identifiers, and
     // does not handle all the keys.
     switch (keyCode) {
-        case kKeyCodeClear:
-            return "Clear";
-        case kKeyCodeNewline:
-        case kKeyCodeDpadCenter:
-            return "Enter";
-        case kKeyCodeHome:
-            return "Home";
-        case kKeyCodeDpadDown:
-            return "Down";
-        case kKeyCodeDpadLeft:
-            return "Left";
-        case kKeyCodeDpadRight:
-            return "Right";
-        case kKeyCodeDpadUp:
-            return "Up";
-        // Standard says that DEL becomes U+00007F.
-        case kKeyCodeDel:
-            return "U+00007F";
-        default:
-            char upper[16];
-            sprintf(upper, "U+%06X", windowsKeyCodeForKeyEvent(keyCode));
-            return String(upper);
+    case kKeyCodeClear:
+        return "Clear";
+    case kKeyCodeNewline:
+    case kKeyCodeDpadCenter:
+        return "Enter";
+    case kKeyCodeHome:
+        return "Home";
+    case kKeyCodeDpadDown:
+        return "Down";
+    case kKeyCodeDpadLeft:
+        return "Left";
+    case kKeyCodeDpadRight:
+        return "Right";
+    case kKeyCodeDpadUp:
+        return "Up";
+    // Standard says that DEL becomes U+00007F.
+    case kKeyCodeDel:
+        return "U+00007F";
+    default:
+        char upper[16];
+        sprintf(upper, "U+%06X", windowsKeyCodeForKeyEvent(keyCode));
+        return String(upper);
     }
 }
 
diff --git a/WebCore/platform/android/ScreenAndroid.cpp b/WebCore/platform/android/ScreenAndroid.cpp
index 2439c1f..dcd2d10 100644
--- a/WebCore/platform/android/ScreenAndroid.cpp
+++ b/WebCore/platform/android/ScreenAndroid.cpp
@@ -31,14 +31,12 @@
 
 #include "FloatRect.h"
 #include "Widget.h"
-
+#include "ui/DisplayInfo.h"
+#include "ui/PixelFormat.h"
+#include "ui/SurfaceComposerClient.h"
 #undef LOG // FIXME: Still have to do this to get the log to show up
 #include "utils/Log.h"
 
-#include "ui/SurfaceComposerClient.h"
-#include "ui/PixelFormat.h"
-#include "ui/DisplayInfo.h"
-
 namespace WebCore {
 
 int screenDepth(Widget* page)
@@ -70,18 +68,18 @@ int Screen::orientation() const
     // to the values described here
     // (http://developer.apple.com/documentation/AppleApplications/Reference/SafariWebContent/HandlingEvents/chapter_8_section_6.html)
     switch (info.orientation) {
-        case android::ISurfaceComposer::eOrientationDefault:
-            return 0;
-        case android::ISurfaceComposer::eOrientation90:
-            return 90;
-        case android::ISurfaceComposer::eOrientation180:
-            return 180;
-        case android::ISurfaceComposer::eOrientation270:
-            return -90;
-        default:
-            LOGE("Bad orientation returned from getDisplayIndo %d",
-                    info.orientation);
-            return 0;
+    case android::ISurfaceComposer::eOrientationDefault:
+        return 0;
+    case android::ISurfaceComposer::eOrientation90:
+        return 90;
+    case android::ISurfaceComposer::eOrientation180:
+        return 180;
+    case android::ISurfaceComposer::eOrientation270:
+        return -90;
+    default:
+        LOGE("Bad orientation returned from getDisplayIndo %d",
+                info.orientation);
+        return 0;
     }
 }
 #endif
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index c0b57a6..b82edaf 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -28,17 +28,15 @@
 
 #define ANDROID_COMPILE_HACK
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "AXObjectCache.h"
+#include "CString.h"
 #include "CachedPage.h"
 #include "CachedResource.h"
-#include "CookieJar.h"
+#include "Clipboard.h"
 #include "Console.h"
 #include "ContextMenu.h"
 #include "ContextMenuItem.h"
-#include "Clipboard.h"
-#include "CString.h"
+#include "CookieJar.h"
 #include "Cursor.h"
 #include "Database.h"
 #include "DocumentFragment.h"
@@ -49,8 +47,8 @@
 #include "FileList.h"
 #include "Font.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoadRequest.h"
+#include "FrameLoader.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "HTMLFrameOwnerElement.h"
@@ -60,21 +58,11 @@
 #include "IconDatabase.h"
 #include "IconLoader.h"
 #include "IntPoint.h"
-
-#if USE(JSC)
-#include "JavaScriptCallFrame.h"
-#include "JavaScriptDebugServer.h"
-#include "API/JSClassRef.h"
-#include "JavaScriptProfile.h"
-#include "jni_utility.h"
-#endif
-
 #include "KURL.h"
 #include "Language.h"
-#include "loader.h"
 #include "LocalizedStrings.h"
-#include "MainResourceLoader.h"
 #include "MIMETypeRegistry.h"
+#include "MainResourceLoader.h"
 #include "Node.h"
 #include "NotImplemented.h"
 #include "PageCache.h"
@@ -89,6 +77,17 @@
 #include "ScrollbarTheme.h"
 #include "SmartReplace.h"
 #include "Widget.h"
+#include "loader.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#if USE(JSC)
+#include "API/JSClassRef.h"
+#include "JavaScriptCallFrame.h"
+#include "JavaScriptDebugServer.h"
+#include "JavaScriptProfile.h"
+#include "jni_utility.h"
+#endif
 
 using namespace WebCore;
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list