Skip to content

Commit 6d8696c

Browse files
rogerwangrogerwang
committed
rebase to chrome 29
1 parent 798c2d8 commit 6d8696c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+170
-116
lines changed

‎nw.gypi

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
'dependencies': [
1818
'<(DEPTH)/base/base.gyp:base',
1919
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
20-
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
21-
'<(DEPTH)/components/components.gyp:autofill_renderer',
20+
'<(DEPTH)/components/components.gyp:autofill_content_renderer',
2221
'<(DEPTH)/content/content.gyp:content_app',
2322
'<(DEPTH)/content/content.gyp:content_browser',
2423
'<(DEPTH)/content/content.gyp:content_common',
@@ -38,16 +37,17 @@
3837
'<(DEPTH)/third_party/node/node.gyp:node',
3938
'<(DEPTH)/ui/ui.gyp:ui',
4039
'<(DEPTH)/ui/ui.gyp:ui_resources',
40+
'<(DEPTH)/url/url.gyp:url_lib',
4141
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
4242
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
4343
'<(DEPTH)/third_party/zlib/zlib.gyp:minizip',
44-
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
44+
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
4545
'nw_resources',
4646
],
4747
'include_dirs': [
4848
'<(DEPTH)',
4949
'<(DEPTH)/third_party/WebKit/Source',
50-
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/public',
50+
'<(DEPTH)/third_party/WebKit/public/web',
5151
'<(SHARED_INTERMEDIATE_DIR)/webkit',
5252
'<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
5353
],
@@ -90,9 +90,9 @@
9090
'<(DEPTH)/third_party/zlib/google/zip_reader.h',
9191
'<(DEPTH)/third_party/zlib/google/zip_internal.cc',
9292
'<(DEPTH)/third_party/zlib/google/zip_internal.h',
93-
'<(DEPTH)/components/autofill/renderer/page_click_listener.h',
94-
'<(DEPTH)/components/autofill/renderer/page_click_tracker.cc',
95-
'<(DEPTH)/components/autofill/renderer/page_click_tracker.h',
93+
'<(DEPTH)/components/autofill/content/renderer/page_click_listener.h',
94+
'<(DEPTH)/components/autofill/content/renderer/page_click_tracker.cc',
95+
'<(DEPTH)/components/autofill/content/renderer/page_click_tracker.h',
9696
'<(DEPTH)/chrome/renderer/static_v8_external_string_resource.cc',
9797
'<(DEPTH)/chrome/renderer/static_v8_external_string_resource.h',
9898
'src/api/api_messages.cc',
@@ -267,6 +267,12 @@
267267
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
268268
],
269269
}],
270+
['(os_posix==1 and linux_use_tcmalloc==1) or (android_use_tcmalloc==1)', {
271+
'dependencies': [
272+
# This is needed by content/app/content_main_runner.cc
273+
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
274+
],
275+
}],
270276
['toolkit_uses_gtk == 1', {
271277
'dependencies': [
272278
# For FT_Init_FreeType and friends.
@@ -453,7 +459,7 @@
453459
},
454460
},
455461
}], # OS=="win"
456-
['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
462+
['OS == "win" or toolkit_uses_gtk == 1', {
457463
'dependencies': [
458464
'<(DEPTH)/sandbox/sandbox.gyp:sandbox',
459465
],

‎src/api/app/app.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "content/public/browser/web_contents.h"
3434
#include "content/public/browser/render_process_host.h"
3535

36+
using base::MessageLoop;
3637
using content::Shell;
3738
using content::ShellBrowserContext;
3839
using content::RenderProcessHost;

‎src/api/bindings_common.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include "content/public/renderer/render_view.h"
2727
#include "content/public/renderer/render_thread.h"
2828
#include "content/public/renderer/v8_value_converter.h"
29-
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
30-
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
29+
#include "third_party/WebKit/public/web/WebView.h"
30+
#include "third_party/WebKit/public/web/WebFrame.h"
3131
#include "ui/base/resource/resource_bundle.h"
3232

3333
using content::RenderView;

‎src/api/clipboard/clipboard.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "content/nw/src/api/clipboard/clipboard.h"
2222

2323
#include "base/values.h"
24-
#include "base/utf_string_conversions.h"
25-
#include "base/string16.h"
24+
#include "base/strings/utf_string_conversions.h"
25+
#include "base/strings/string16.h"
2626
#include "content/nw/src/api/dispatcher_host.h"
2727
#include "ui/base/clipboard/clipboard.h"
2828

@@ -68,7 +68,7 @@ void Clipboard::SetText(std::string& text) {
6868
ui::Clipboard::ObjectMap map;
6969
map[ui::Clipboard::CBF_TEXT].push_back(
7070
std::vector<char>(text.begin(), text.end()));
71-
clipboard->WriteObjects(ui::Clipboard::BUFFER_STANDARD, map, NULL);
71+
clipboard->WriteObjects(ui::Clipboard::BUFFER_STANDARD, map);
7272
}
7373

7474
std::string Clipboard::GetText() {

‎src/api/dispatcher.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@
1818
// ETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
1919
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2020

21+
#define V8_USE_UNSAFE_HANDLES
22+
2123
#include "content/nw/src/api/dispatcher.h"
2224

2325
#include "content/nw/src/api/api_messages.h"
2426
#include "content/public/renderer/render_view.h"
2527
#include "content/renderer/v8_value_converter_impl.h"
2628
#include "third_party/node/src/node.h"
2729
#include "third_party/node/src/req_wrap.h"
28-
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
29-
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
30-
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
30+
#include "third_party/WebKit/public/web/WebDocument.h"
31+
#include "third_party/WebKit/public/web/WebFrame.h"
32+
#include "third_party/WebKit/public/web/WebView.h"
3133
#include "v8/include/v8.h"
3234

3335
namespace api {

‎src/api/window_bindings.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
#include "content/nw/src/api/window_bindings.h"
2222

2323
#include "base/values.h"
24-
#include "content/common/child_thread.h"
24+
#include "content/child/child_thread.h"
2525
#include "content/nw/src/api/bindings_common.h"
2626
#include "content/renderer/render_view_impl.h"
2727
#include "grit/nw_resources.h"
2828
#undef LOG
2929
#include "third_party/WebKit/Source/core/html/HTMLIFrameElement.h"
30-
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
30+
#include "third_party/WebKit/public/web/WebFrame.h"
31+
#include "third_party/WebKit/public/web/WebView.h"
3132
#include "third_party/WebKit/Source/WebKit/chromium/src/WebFrameImpl.h"
3233

3334
#include "V8HTMLIFrameElement.h"

‎src/browser/file_select_helper.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include "base/file_util.h"
2727
#include "base/platform_file.h"
2828
#include "base/logging.h"
29-
#include "base/strings/string_split.h"
3029
#include "base/string_util.h"
31-
#include "base/utf_string_conversions.h"
30+
#include "base/strings/string_split.h"
31+
#include "base/strings/utf_string_conversions.h"
3232
#include "chrome/browser/platform_util.h"
3333
#include "content/public/browser/browser_thread.h"
3434
#include "content/public/browser/notification_details.h"
@@ -228,7 +228,7 @@ void FileSelectHelper::OnListFile(
228228
// Directory upload returns directories via a "." file, so that
229229
// empty directories are included. This util call just checks
230230
// the flags in the structure; there's no file I/O going on.
231-
if (file_util::FileEnumerator::IsDirectory(data.info))
231+
if (data.info.IsDirectory())
232232
entry->results_.push_back(data.path.Append(FILE_PATH_LITERAL(".")));
233233
else
234234
entry->results_.push_back(data.path);

‎src/browser/printing/print_dialog_gtk.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "base/file_util.h"
1717
#include "base/files/file_util_proxy.h"
1818
#include "base/logging.h"
19-
#include "base/message_loop_proxy.h"
20-
#include "base/utf_string_conversions.h"
19+
#include "base/message_loop/message_loop_proxy.h"
20+
#include "base/strings/utf_string_conversions.h"
2121
#include "base/values.h"
2222
#include "printing/metafile.h"
2323
#include "printing/print_job_constants.h"

‎src/browser/printing/print_job.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "printing/printed_page.h"
1818

1919
using base::TimeDelta;
20+
using base::MessageLoop;
2021

2122
namespace {
2223

‎src/browser/printing/print_job.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class PrinterQuery;
3434
// runs in the UI thread.
3535
class PrintJob : public PrintJobWorkerOwner,
3636
public content::NotificationObserver,
37-
public MessageLoop::DestructionObserver {
37+
public base::MessageLoop::DestructionObserver {
3838
public:
3939
// Create a empty PrintJob. When initializing with this constructor,
4040
// post-constructor initialization must be done with Initialize().
@@ -54,7 +54,7 @@ class PrintJob : public PrintJobWorkerOwner,
5454
virtual void GetSettingsDone(const PrintSettings& new_settings,
5555
PrintingContext::Result result) OVERRIDE;
5656
virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE;
57-
virtual MessageLoop* message_loop() OVERRIDE;
57+
virtual base::MessageLoop* message_loop() OVERRIDE;
5858
virtual const PrintSettings& settings() const OVERRIDE;
5959
virtual int cookie() const OVERRIDE;
6060

@@ -124,7 +124,7 @@ class PrintJob : public PrintJobWorkerOwner,
124124

125125
// Main message loop reference. Used to send notifications in the right
126126
// thread.
127-
MessageLoop* const ui_message_loop_;
127+
base::MessageLoop* const ui_message_loop_;
128128

129129
// Source that generates the PrintedPage's (i.e. a WebContents). It will be
130130
// set back to NULL if the source is deleted before this object.

‎src/browser/printing/print_job_worker.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "ui/base/l10n/l10n_util.h"
2525

2626
using content::BrowserThread;
27+
using base::MessageLoop;
2728

2829
namespace {
2930

‎src/browser/printing/print_view_manager.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "base/metrics/histogram.h"
1414
#include "base/prefs/pref_service.h"
1515
#include "base/timer.h"
16-
#include "base/utf_string_conversions.h"
16+
#include "base/strings/utf_string_conversions.h"
1717
//#include "chrome/browser/browser_process.h"
1818
//#include "chrome/browser/printing/print_error_dialog.h"
1919
#include "content/nw/src/browser/printing/print_job.h"
@@ -44,6 +44,7 @@
4444
#include "ui/base/l10n/l10n_util.h"
4545

4646
using base::TimeDelta;
47+
using base::MessageLoop;
4748
using content::BrowserThread;
4849
using content::WebContents;
4950

‎src/browser/printing/print_view_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "base/memory/ref_counted.h"
99
#include "base/prefs/pref_member.h"
10-
#include "base/string16.h"
10+
#include "base/strings/string16.h"
1111
#include "content/public/browser/notification_observer.h"
1212
#include "content/public/browser/notification_registrar.h"
1313
#include "content/public/browser/web_contents_observer.h"

‎src/browser/printing/printer_query.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include "base/values.h"
1212
#include "content/nw/src/browser/printing/print_job_worker.h"
1313

14+
using base::MessageLoop;
15+
1416
namespace printing {
1517

1618
PrinterQuery::PrinterQuery()

‎src/browser/shell_download_manager_delegate.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "base/file_util.h"
3434
#include "base/logging.h"
3535
#include "base/string_util.h"
36-
#include "base/utf_string_conversions.h"
36+
#include "base/strings/utf_string_conversions.h"
3737
#include "content/public/browser/browser_context.h"
3838
#include "content/public/browser/browser_thread.h"
3939
#include "content/public/browser/download_manager.h"

‎src/browser/shell_download_manager_delegate_gtk.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "base/file_util.h"
2929
#include "base/logging.h"
3030
#include "base/string_util.h"
31-
#include "base/utf_string_conversions.h"
31+
#include "base/strings/utf_string_conversions.h"
3232
#include "content/public/browser/browser_context.h"
3333
#include "content/public/browser/browser_thread.h"
3434
#include "content/public/browser/download_manager.h"

‎src/browser/shell_javascript_dialog_creator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "base/command_line.h"
2424
#include "base/logging.h"
25-
#include "base/utf_string_conversions.h"
25+
#include "base/strings/utf_string_conversions.h"
2626
#include "content/public/browser/web_contents.h"
2727
#include "content/public/browser/web_contents_view.h"
2828
#include "content/nw/src/browser/shell_javascript_dialog.h"

‎src/browser/shell_javascript_dialog_gtk.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "base/logging.h"
2626
#include "base/string_util.h"
27-
#include "base/utf_string_conversions.h"
27+
#include "base/strings/utf_string_conversions.h"
2828
#include "content/nw/src/browser/shell_javascript_dialog_creator.h"
2929
#include "content/nw/src/resource.h"
3030
#include "content/nw/src/nw_shell.h"

‎src/browser/shell_login_dialog.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "base/bind.h"
2424
#include "base/logging.h"
25-
#include "base/utf_string_conversions.h"
25+
#include "base/strings/utf_string_conversions.h"
2626
#include "content/public/browser/browser_thread.h"
2727
#include "content/public/browser/resource_dispatcher_host.h"
2828
#include "net/base/auth.h"

‎src/browser/shell_login_dialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define CONTENT_NW_SRC_BROWSER_SHELL_LOGIN_DIALOG_H_
2323

2424
#include "base/compiler_specific.h"
25-
#include "base/string16.h"
25+
#include "base/strings/string16.h"
2626
#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
2727

2828
#if defined(TOOLKIT_GTK)

‎src/browser/shell_login_dialog_gtk.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <gtk/gtk.h>
2424

2525
#include "base/logging.h"
26-
#include "base/string16.h"
27-
#include "base/utf_string_conversions.h"
26+
#include "base/strings/string16.h"
27+
#include "base/strings/utf_string_conversions.h"
2828
#include "content/public/browser/browser_thread.h"
2929
#include "content/public/browser/render_view_host.h"
3030
#include "content/public/browser/resource_dispatcher_host.h"

‎src/common/print_messages.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "content/nw/src/common/print_messages.h"
66

77
#include "base/basictypes.h"
8-
#include "base/string16.h"
8+
#include "base/strings/string16.h"
99
#include "ui/gfx/size.h"
1010

1111
PrintMsg_Print_Params::PrintMsg_Print_Params()

‎src/common/print_messages.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "ipc/ipc_message_macros.h"
1414
#include "printing/page_size_margins.h"
1515
#include "printing/print_job_constants.h"
16-
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintScalingOption.h"
16+
#include "third_party/WebKit/public/web/WebPrintScalingOption.h"
1717
#include "ui/gfx/native_widget_types.h"
1818
#include "ui/gfx/rect.h"
1919

‎src/geolocation/shell_access_token_store.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "base/bind.h"
88
#include "base/message_loop.h"
9-
#include "base/utf_string_conversions.h"
9+
#include "base/strings/utf_string_conversions.h"
1010
#include "content/public/browser/browser_thread.h"
1111
#include "content/nw/src/shell_browser_context.h"
1212

‎src/media/media_internals.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "content/nw/src/media/media_internals.h"
2222

2323
#include "base/memory/scoped_ptr.h"
24-
#include "base/string16.h"
24+
#include "base/strings/string16.h"
2525
#include "base/stringprintf.h"
2626
#include "content/nw/src/media/media_capture_devices_dispatcher.h"
2727
#include "content/public/browser/browser_thread.h"

‎src/net/clear_on_exit_policy.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "content/public/common/url_constants.h"
88
#include "googleurl/src/gurl.h"
9-
#include "webkit/quota/special_storage_policy.h"
9+
#include "webkit/browser/quota/special_storage_policy.h"
1010

1111
ClearOnExitPolicy::ClearOnExitPolicy(
1212
quota::SpecialStoragePolicy* special_storage_policy)

‎src/net/resource_request_job.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include "grit/nw_resources.h"
3636
#include "ui/base/resource/resource_bundle.h"
3737

38+
using base::MessageLoop;
39+
3840
namespace nw {
3941

4042
ResourceRequestJob::ResourceRequestJob(

0 commit comments

Comments
 (0)