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

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

Issue 41017: WebKit merge 41498:41530. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address darin's comments Created 11 years, 9 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/searchable_form_data.cc ('k') | webkit/port/bindings/v8/v8_proxy.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 10
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 } 1211 }
1212 1212
1213 void WebFrameLoaderClient::frameLoadCompleted() { 1213 void WebFrameLoaderClient::frameLoadCompleted() {
1214 // FIXME: the mac port also conditionally calls setDrawsBackground:YES on 1214 // FIXME: the mac port also conditionally calls setDrawsBackground:YES on
1215 // it's ScrollView here. 1215 // it's ScrollView here.
1216 1216
1217 // This comment from the Mac port: 1217 // This comment from the Mac port:
1218 // Note: Can be called multiple times. 1218 // Note: Can be called multiple times.
1219 // Even if already complete, we might have set a previous item on a frame that 1219 // Even if already complete, we might have set a previous item on a frame that
1220 // didn't do any data loading on the past transaction. Make sure to clear thes e out. 1220 // didn't do any data loading on the past transaction. Make sure to clear thes e out.
1221 webframe_->frame()->loader()->setPreviousHistoryItem(0); 1221
1222 // FIXME: setPreviousHistoryItem() no longer exists. http://crbug.com/8566
1223 // webframe_->frame()->loader()->setPreviousHistoryItem(0);
1222 } 1224 }
1223 1225
1224 void WebFrameLoaderClient::saveViewStateToItem(HistoryItem*) { 1226 void WebFrameLoaderClient::saveViewStateToItem(HistoryItem*) {
1225 // FIXME 1227 // FIXME
1226 } 1228 }
1227 1229
1228 1230
1229 void WebFrameLoaderClient::restoreViewState() { 1231 void WebFrameLoaderClient::restoreViewState() {
1230 // FIXME: probably scrolls to last position when you go back or forward 1232 // FIXME: probably scrolls to last position when you go back or forward
1231 } 1233 }
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1520 if (!middle_or_ctrl && !shift && !alt) 1522 if (!middle_or_ctrl && !shift && !alt)
1521 return false; 1523 return false;
1522 1524
1523 DCHECK(disposition); 1525 DCHECK(disposition);
1524 if (middle_or_ctrl) 1526 if (middle_or_ctrl)
1525 *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; 1527 *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
1526 else 1528 else
1527 *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK; 1529 *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK;
1528 return true; 1530 return true;
1529 } 1531 }
OLDNEW
« no previous file with comments | « webkit/glue/searchable_form_data.cc ('k') | webkit/port/bindings/v8/v8_proxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698