Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: third_party/WebKit/WebCore/loader/FrameLoader.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 5161 matching lines...) Expand 10 before | Expand all | Expand 10 after
5172 KURL FrameLoader::originalRequestURL() const 5172 KURL FrameLoader::originalRequestURL() const
5173 { 5173 {
5174 return activeDocumentLoader()->originalRequest().url(); 5174 return activeDocumentLoader()->originalRequest().url();
5175 } 5175 }
5176 5176
5177 String FrameLoader::referrer() const 5177 String FrameLoader::referrer() const
5178 { 5178 {
5179 return documentLoader()->request().httpReferrer(); 5179 return documentLoader()->request().httpReferrer();
5180 } 5180 }
5181 5181
5182 void FrameLoader::dispatchDocumentElementAvailable()
5183 {
5184 m_client->documentElementAvailable();
5185 }
5186
5187 void FrameLoader::dispatchWindowObjectAvailable() 5182 void FrameLoader::dispatchWindowObjectAvailable()
5188 { 5183 {
5189 #if USE(JSC) 5184 #if USE(JSC)
5190 if (!m_frame->script()->isEnabled() || !m_frame->script()->haveWindowShell() ) 5185 if (!m_frame->script()->isEnabled() || !m_frame->script()->haveWindowShell() )
5191 return; 5186 return;
5192 #else 5187 #else
5193 // TODO(tc): We should also return early if we have no window shell. 5188 // TODO(tc): We should also return early if we have no window shell.
5194 // But we can't check that until we refactor ScriptController. 5189 // But we can't check that until we refactor ScriptController.
5195 if (!m_frame->script()->isEnabled()) 5190 if (!m_frame->script()->isEnabled())
5196 return; 5191 return;
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
5515 } 5510 }
5516 5511
5517 #endif 5512 #endif
5518 5513
5519 bool FrameLoaderClient::hasHTMLView() const 5514 bool FrameLoaderClient::hasHTMLView() const
5520 { 5515 {
5521 return true; 5516 return true;
5522 } 5517 }
5523 5518
5524 } // namespace WebCore 5519 } // namespace WebCore
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/loader/FrameLoader.h ('k') | third_party/WebKit/WebCore/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698