| Index: Source/core/loader/FrameLoader.cpp
|
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
|
| index 110cf41ab19735ef20b91c4fe7b12b1829c9ae2b..89b9d2b8b82b3259e6efd57fbb1efd567e02820b 100644
|
| --- a/Source/core/loader/FrameLoader.cpp
|
| +++ b/Source/core/loader/FrameLoader.cpp
|
| @@ -35,11 +35,6 @@
|
| #include "config.h"
|
| #include "core/loader/FrameLoader.h"
|
|
|
| -#include <wtf/CurrentTime.h>
|
| -#include <wtf/MemoryInstrumentationHashSet.h>
|
| -#include <wtf/StdLibExtras.h>
|
| -#include <wtf/text/CString.h>
|
| -#include <wtf/text/WTFString.h>
|
| #include "HTMLNames.h"
|
| #include "SVGNames.h"
|
| #include "bindings/v8/DOMWrapperWorld.h"
|
| @@ -114,7 +109,11 @@
|
| #include "weborigin/SchemeRegistry.h"
|
| #include "weborigin/SecurityOrigin.h"
|
| #include "weborigin/SecurityPolicy.h"
|
| -
|
| +#include "wtf/CurrentTime.h"
|
| +#include "wtf/MemoryInstrumentationHashSet.h"
|
| +#include "wtf/StdLibExtras.h"
|
| +#include "wtf/text/CString.h"
|
| +#include "wtf/text/WTFString.h"
|
|
|
| namespace WebCore {
|
|
|
| @@ -1029,8 +1028,7 @@ void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockBac
|
| }
|
| }
|
|
|
| -void FrameLoader::loadURL(const ResourceRequest& request, const String& frameName, FrameLoadType newLoadType,
|
| - PassRefPtr<Event> event, PassRefPtr<FormState> formState)
|
| +void FrameLoader::loadURL(const ResourceRequest& request, const String& frameName, FrameLoadType newLoadType, PassRefPtr<Event> event, PassRefPtr<FormState> formState)
|
| {
|
| if (m_inStopAllLoaders)
|
| return;
|
|
|