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

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

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 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 void scrollToAnchor(const KURL&); 339 void scrollToAnchor(const KURL&);
340 340
341 void tokenizerProcessedData(); 341 void tokenizerProcessedData();
342 342
343 void handledOnloadEvents(); 343 void handledOnloadEvents();
344 String userAgent(const KURL&) const; 344 String userAgent(const KURL&) const;
345 345
346 Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const HashMap<String, String>& args); 346 Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const HashMap<String, String>& args);
347 347
348 void dispatchWindowObjectAvailable(); 348 void dispatchWindowObjectAvailable();
349 void dispatchDocumentElementAvailable();
350 void restoreDocumentState(); 349 void restoreDocumentState();
351 350
352 Frame* opener(); 351 Frame* opener();
353 void setOpener(Frame*); 352 void setOpener(Frame*);
354 bool openedByDOM() const; 353 bool openedByDOM() const;
355 void setOpenedByDOM(); 354 void setOpenedByDOM();
356 355
357 void provisionalLoadStarted(); 356 void provisionalLoadStarted();
358 357
359 bool userGestureHint(); 358 bool userGestureHint();
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 #endif 690 #endif
692 691
693 #if ENABLE(WML) 692 #if ENABLE(WML)
694 bool m_forceReloadWmlDeck; 693 bool m_forceReloadWmlDeck;
695 #endif 694 #endif
696 }; 695 };
697 696
698 } 697 }
699 698
700 #endif 699 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/loader/EmptyClients.h ('k') | third_party/WebKit/WebCore/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698