Summary: | Remove unneeded headers from FrameLoader.h | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Anders Carlsson <andersca> | ||||||||||
Component: | New Bugs | Assignee: | Anders Carlsson <andersca> | ||||||||||
Status: | RESOLVED FIXED | ||||||||||||
Severity: | Normal | CC: | abarth, benjamin, buildbot, cmarcelo, eric.carlson, esprehn+autocc, ggaren, japhet, jer.noble, mifenton, ojan.autocc, ossy, philn, rego+ews, rniwa, roger_fong, rwlbuis, tonikitoo, webkit-ews, webkit.review.bot, xan.lopez | ||||||||||
Priority: | P2 | ||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||
Hardware: | Unspecified | ||||||||||||
OS: | Unspecified | ||||||||||||
Attachments: |
|
Description
Anders Carlsson
2013-04-08 16:57:53 PDT
Created attachment 196971 [details]
Patch
Comment on attachment 196971 [details]
Patch
r=me if it builds
Created attachment 196972 [details]
Patch
Created attachment 196974 [details]
Patch
Comment on attachment 196974 [details] Patch Attachment 196974 [details] did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17674001 Comment on attachment 196974 [details] Patch Attachment 196974 [details] did not pass efl-ews (efl): Output: http://webkit-commit-queue.appspot.com/results/17672008 Comment on attachment 196974 [details] Patch Attachment 196974 [details] did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/17650014 Comment on attachment 196974 [details] Patch Attachment 196974 [details] did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/17673003 Comment on attachment 196974 [details] Patch Attachment 196974 [details] did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/17687006 /Volumes/Data/EWS/WebKit/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm:123:39: error: implicit instantiation of undefined template 'WTF::PassOwnPtr<WebCore::NetworkStorageSession>' privateBrowsingStorageSession() = NetworkStorageSession::createPrivateBrowsingSession(privateBrowsingStorageSessionIdentifierBase()); ^ /Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/wtf/Forward.h:33:32: note: template is declared here template<typename T> class PassOwnPtr; ^ Created attachment 197315 [details]
Patch
Comment on attachment 197315 [details]
Patch
r=me
Committed r148123: <http://trac.webkit.org/changeset/148123> (In reply to comment #13) > Committed r148123: <http://trac.webkit.org/changeset/148123> It broke the Qt minimal build: ------------------------------- In file included from /ramdisk/qt-linux-release-minimal/build/Source/WebCore/inspector/InspectorCanvasInstrumentation.h:35:0, from /ramdisk/qt-linux-release-minimal/build/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp:32: /ramdisk/qt-linux-release-minimal/build/Source/WebCore/inspector/InspectorInstrumentation.h:206:141: error: 'HTTPHeaderMap' does not name a type /ramdisk/qt-linux-release-minimal/build/Source/WebCore/inspector/InspectorInstrumentation.h:206:154: error: ISO C++ forbids declaration of 'parameter' with no type [-fpermissive] fix landed in http://trac.webkit.org/changeset/148133 And it broke the Qt Debug build: --------------------------------- /home/webkitbuildbot/slaves/debug64bit/buildslave/qt-linux-64-debug/build/Source/WebCore/platform/graphics/filters/CustomFilterMeshGenerator.cpp: In member function 'void WebCore::CustomFilterMeshGenerator::dumpBuffers() const': /home/webkitbuildbot/slaves/debug64bit/buildslave/qt-linux-64-debug/build/Source/WebCore/platform/graphics/filters/CustomFilterMeshGenerator.cpp:156:67: error: 'printf' was not declared in this scope fix landed in http://trac.webkit.org/changeset/148138 This change broke DumpRenderTree on Windows (makes it crash 100%) Crashes on writing to m_refCount at m_refCount+=s_refCountIncrement Stack trace here: > WebKit.dll!WTF::StringImpl::ref() Line 587 + 0xb bytes C++ WebKit.dll!WTF::refIfNotNull<WTF::StringImpl>(WTF::StringImpl * ptr=0x64284fa8) Line 48 C++ WebKit.dll!WTF::RefPtr<WTF::StringImpl>::operator=(const WTF::RefPtr<WTF::StringImpl> & o=0x64284fa8 const WebFrame::`vftable'{for `WebFrameLoaderClient'} {???}) Line 104 + 0x9 bytes C++ WebKit.dll!WTF::String::operator=(const WTF::String & __that={???}) + 0x1a bytes C++ WebKit.dll!WebCore::KURL::operator=(const WebCore::KURL & __that={???}) + 0x1a bytes C++ WebKit.dll!WebCore::ResourceRequestBase::operator=(const WebCore::ResourceRequestBase & __that={...}) + 0x1a bytes C++ WebKit.dll!WebCore::ResourceRequest::operator=(const WebCore::ResourceRequest & __that={...}) + 0x1a bytes C++ WebKit.dll!WebMutableURLRequest::createInstance(const WebCore::ResourceRequest & request={...}) Line 80 C++ WebKit.dll!WebFrame::dispatchDecidePolicyForNavigationAction(void (WebCore::PolicyAction)* function=0x638e5280, const WebCore::NavigationAction & action={...}, const WebCore::ResourceRequest & request={...}, WTF::PassRefPtr<WebCore::FormState> formState={...}) Line 1775 + 0x9 bytes C++ WebKit.dll!WebCore::PolicyChecker::checkNavigationPolicy(const WebCore::ResourceRequest & request={...}, WebCore::DocumentLoader * loader=0x01e300a0, WTF::PassRefPtr<WebCore::FormState> formState={...}, void (void *, const WebCore::ResourceRequest &, WTF::PassRefPtr<WebCore::FormState>, bool)* function=0x62cc41f0, void * argument=0x01d75090) Line 100 C++ WebKit.dll!WebCore::FrameLoader::loadWithDocumentLoader(WebCore::DocumentLoader * loader=0x01e300a0, WebCore::FrameLoadType type=FrameLoadTypeStandard, WTF::PassRefPtr<WebCore::FormState> prpFormState={...}) Line 1398 C++ WebKit.dll!WebCore::FrameLoader::load(WebCore::DocumentLoader * newDocumentLoader=0x01e300a0) Line 1338 C++ WebKit.dll!WebCore::FrameLoader::load(const WebCore::FrameLoadRequest & passedRequest={...}) Line 1288 C++ WebKit.dll!WebFrame::loadRequest(IWebURLRequest * request=0x01e2fdd8) Line 560 + 0x3b bytes C++ DumpRenderTree.dll!runTest(const std::basic_string<char,std::char_traits<char>,std::allocator<char> > & inputLine="C:\cygwin\home\buildbot\WebKit\OpenSource\LayoutTests\css3\filters\composited-layer-bounds-after-sw-blur-animation.html") Line 1031 + 0x21 bytes C++ DumpRenderTree.dll!dllLauncherEntryPoint(int argc=2, const char * * argv=0x00171e78) Line 1428 + 0x33 bytes C++ DumpRenderTree.exe!main(int argc=2, const char * * argv=0x00171e78) Line 206 + 0x10 bytes C++ DumpRenderTree.exe!__tmainCRTStartup() Line 597 + 0x17 bytes C Can you try a clean build? (In reply to comment #16) > Can you try a clean build? Same problem :/ |