Skip to content

Commit 3c2de44

Browse files
GnorTechrogerwang
GnorTech
authored and
rogerwang
committed
rebase to Chromium 62
1 parent ca9366c commit 3c2de44

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

‎patch/patches/ffmpeg.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git BUILD.gn BUILD.gn
22
index a922eeef70..307ff64618 100755
33
--- BUILD.gn
44
+++ BUILD.gn
5-
@@ -415,6 +415,12 @@ if (is_component_ffmpeg) {
5+
@@ -420,6 +420,12 @@ if (is_component_ffmpeg) {
66
# So we can append below and assume they're defined.
77
ldflags = []
88

‎src/api/nw_window_api.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static void SetDeskopEnvironment() {
9090
namespace {
9191

9292
printing::PrinterList EnumeratePrintersOnBlockingPoolThread() {
93-
DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
93+
DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksInCurrentSequence());
9494

9595
scoped_refptr<printing::PrintBackend> print_backend(
9696
printing::PrintBackend::CreateInstance(nullptr));

‎src/api/object_manager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ using extensions::EventRouter;
5050

5151
namespace nw {
5252

53-
IDMap<std::unique_ptr<Base>> nw::ObjectManager::objects_registry_;
53+
base::IDMap<std::unique_ptr<Base>> nw::ObjectManager::objects_registry_;
5454
int nw::ObjectManager::next_object_id_ = 0;
5555

5656
ObjectManager* ObjectManager::Get(content::BrowserContext* context) {

‎src/api/object_manager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#ifndef CONTENT_NW_SRC_API_OBJECT_MANAGER_H_
2222
#define CONTENT_NW_SRC_API_OBJECT_MANAGER_H_
2323

24-
#include "base/id_map.h"
24+
#include "base/containers/id_map.h"
2525
#include "base/memory/weak_ptr.h"
2626
#include "components/keyed_service/core/keyed_service.h"
2727
#include "content/public/browser/web_contents_observer.h"
@@ -101,7 +101,7 @@ class ObjectManager : public KeyedService {
101101
const base::ListValue& arguments,
102102
base::ListValue* result);
103103
private:
104-
static IDMap<std::unique_ptr<Base>> objects_registry_;
104+
static base::IDMap<std::unique_ptr<Base>> objects_registry_;
105105
static int next_object_id_;
106106

107107
base::RunLoop* run_loop_;

‎src/nw_content_verifier_delegate.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ void NWContentVerifierDelegate::VerifyFailed(
144144
ReportLoadError(extension->path(), "Extension file corrupted: " + relative_path.AsUTF8Unsafe(),
145145
system->extension_service()->profile(), true);
146146
system->extension_service()->DisableExtension(extension_id,
147-
Extension::DISABLE_CORRUPTED);
147+
disable_reason::DISABLE_CORRUPTED);
148148
}
149149
}
150150

‎src/nw_custom_bindings.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ using namespace blink;
6363
#include "third_party/WebKit/Source/core/frame/LocalFrame.h"
6464
#include "third_party/WebKit/public/web/WebFrame.h"
6565
#include "third_party/WebKit/public/web/WebView.h"
66-
#include "third_party/WebKit/Source/web/WebLocalFrameImpl.h"
66+
#include "third_party/WebKit/Source/core/frame/WebLocalFrameImpl.h"
6767
#include "third_party/WebKit/public/web/WebScriptSource.h"
6868

6969
#undef BLINK_IMPLEMENTATION

‎src/nw_version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#define NW_VERSION_H
2323

2424
#define NW_MAJOR_VERSION 0
25-
#define NW_MINOR_VERSION 25
26-
#define NW_PATCH_VERSION 5
25+
#define NW_MINOR_VERSION 26
26+
#define NW_PATCH_VERSION 0
2727

28-
#define NW_VERSION_IS_RELEASE 1
28+
#define NW_VERSION_IS_RELEASE 0
2929

3030
#ifndef NW_STRINGIFY
3131
#define NW_STRINGIFY(n) NW_STRINGIFY_HELPER(n)
@@ -39,7 +39,7 @@
3939
#else
4040
# define NW_VERSION_STRING NW_STRINGIFY(NW_MAJOR_VERSION) "." \
4141
NW_STRINGIFY(NW_MINOR_VERSION) "." \
42-
NW_STRINGIFY(NW_PATCH_VERSION) "-beta2"
42+
NW_STRINGIFY(NW_PATCH_VERSION) "-rc1"
4343
#endif
4444

4545
#define NW_VERSION "v" NW_VERSION_STRING

‎src/nwjs_browsertest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ class NWAppTest : public extensions::PlatformAppBrowserTest {
882882
class NWJSAppTest : public NWAppTest {};
883883

884884
void NWTimeoutCallback(const std::string& timeout_message) {
885-
base::MessageLoop::current()->QuitWhenIdle();
885+
base::RunLoop::QuitCurrentWhenIdleDeprecated();
886886
}
887887

888888
IN_PROC_BROWSER_TEST_F(NWAppTest, LocalFlash) {

‎src/renderer/nw_extensions_renderer_hooks.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ void ContextCreationHook(blink::WebLocalFrame* frame, ScriptContext* context) {
319319
v8::Context::Scope cscope(context->v8_context());
320320
// Make node's relative modules work
321321
std::string root_path = extension_root;
322-
GURL frame_url = ScriptContext::GetDataSourceURLForFrame(frame);
322+
GURL frame_url = ScriptContext::GetDocumentLoaderURLForFrame(frame);
323323
std::string url_path = frame_url.path();
324324
#if defined(OS_WIN)
325325
base::ReplaceChars(root_path, "\\", "\\\\", &root_path);
@@ -406,7 +406,7 @@ void DocumentHook2(bool start, content::RenderFrame* frame, Dispatcher* dispatch
406406
// there will follow another one with valid url
407407
blink::ScriptForbiddenScope::AllowUserAgentScript script;
408408
blink::WebLocalFrame* web_frame = frame->GetWebFrame();
409-
GURL frame_url = ScriptContext::GetDataSourceURLForFrame(web_frame);
409+
GURL frame_url = ScriptContext::GetDocumentLoaderURLForFrame(web_frame);
410410
if (web_frame->Parent() && (!frame_url.is_valid() || frame_url.is_empty()))
411411
return;
412412
v8::Isolate* isolate = v8::Isolate::GetCurrent();
@@ -443,7 +443,7 @@ void DocumentElementHook(blink::WebLocalFrame* frame,
443443
// or we'll trigger creating a context with invalid type
444444
// there will follow another one with valid url
445445
blink::ScriptForbiddenScope::AllowUserAgentScript script;
446-
GURL frame_url = ScriptContext::GetDataSourceURLForFrame(frame);
446+
GURL frame_url = ScriptContext::GetDocumentLoaderURLForFrame(frame);
447447
if (frame->Parent() && (!frame_url.is_valid() || frame_url.is_empty()))
448448
return;
449449
v8::Isolate* isolate = v8::Isolate::GetCurrent();

0 commit comments

Comments
 (0)