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

Side by Side Diff: webkit/glue/webframe_impl.cc

Issue 149575: Roll WebKit DEPS from 45738 to 45840. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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
« no previous file with comments | « webkit/glue/chrome_client_impl.cc ('k') | webkit/glue/webworker_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
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 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 break; 1701 break;
1702 case WebConsoleMessage::LevelError: 1702 case WebConsoleMessage::LevelError:
1703 webcore_message_level = WebCore::ErrorMessageLevel; 1703 webcore_message_level = WebCore::ErrorMessageLevel;
1704 break; 1704 break;
1705 default: 1705 default:
1706 NOTREACHED(); 1706 NOTREACHED();
1707 return; 1707 return;
1708 } 1708 }
1709 1709
1710 frame()->domWindow()->console()->addMessage( 1710 frame()->domWindow()->console()->addMessage(
1711 WebCore::OtherMessageSource, webcore_message_level, 1711 WebCore::OtherMessageSource, WebCore::LogMessageType,
1712 webkit_glue::WebStringToString(message.text), 1, String()); 1712 webcore_message_level, webkit_glue::WebStringToString(message.text),
1713 1, String());
1713 } 1714 }
1714 1715
1715 void WebFrameImpl::ClosePage() { 1716 void WebFrameImpl::ClosePage() {
1716 // TODO(creis): Find a way to use WebView::Close() instead. (See comments in 1717 // TODO(creis): Find a way to use WebView::Close() instead. (See comments in
1717 // webframe.h and RenderView::OnClosePage.) 1718 // webframe.h and RenderView::OnClosePage.)
1718 frame_->loader()->closeURL(); 1719 frame_->loader()->closeURL();
1719 } 1720 }
1720 1721
1721 WebSize WebFrameImpl::ScrollOffset() const { 1722 WebSize WebFrameImpl::ScrollOffset() const {
1722 WebCore::FrameView* view = frameview(); 1723 WebCore::FrameView* view = frameview();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1817 1818
1818 SecurityOrigin* security_origin = frame_->document()->securityOrigin(); 1819 SecurityOrigin* security_origin = frame_->document()->securityOrigin();
1819 1820
1820 if (!frame_->loader()->isScheduledLocationChangePending()) { 1821 if (!frame_->loader()->isScheduledLocationChangePending()) {
1821 frame_->loader()->stopAllLoaders(); 1822 frame_->loader()->stopAllLoaders();
1822 frame_->loader()->begin(frame_->loader()->url(), true, security_origin); 1823 frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
1823 frame_->loader()->write(script_result); 1824 frame_->loader()->write(script_result);
1824 frame_->loader()->end(); 1825 frame_->loader()->end();
1825 } 1826 }
1826 } 1827 }
OLDNEW
« no previous file with comments | « webkit/glue/chrome_client_impl.cc ('k') | webkit/glue/webworker_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698