mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move osr related files to atom/browser/osr

Browse source
This commit is contained in:
Cheng Zhao 2016-08-03 11:01:35 +09:00
parent b0e36ec93a
commit 921aaf9aa3
10 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_web_contents.cc
View file

@ -17,6 +17,8 @@
#include "atom/browser/lib/bluetooth_chooser.h" #include "atom/browser/lib/bluetooth_chooser.h"
#include "atom/browser/native_window.h" #include "atom/browser/native_window.h"
#include "atom/browser/net/atom_network_delegate.h" #include "atom/browser/net/atom_network_delegate.h"
#include "atom/browser/osr/osr_web_contents_view.h"
#include "atom/browser/osr/osr_render_widget_host_view.h"
#include "atom/browser/ui/drag_util.h" #include "atom/browser/ui/drag_util.h"
#include "atom/browser/web_contents_permission_helper.h" #include "atom/browser/web_contents_permission_helper.h"
#include "atom/browser/web_contents_preferences.h" #include "atom/browser/web_contents_preferences.h"
@ -42,6 +44,7 @@
#include "chrome/browser/printing/print_view_manager_basic.h" #include "chrome/browser/printing/print_view_manager_basic.h"
#include "chrome/browser/printing/print_preview_message_handler.h" #include "chrome/browser/printing/print_preview_message_handler.h"
#include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/view_messages.h" #include "content/common/view_messages.h"
#include "content/public/browser/favicon_status.h" #include "content/public/browser/favicon_status.h"
#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/native_web_keyboard_event.h"
@ -68,10 +71,6 @@
#include "third_party/WebKit/public/web/WebFindOptions.h" #include "third_party/WebKit/public/web/WebFindOptions.h"
#include "ui/display/screen.h" #include "ui/display/screen.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "atom/browser/osr_web_contents_view.h"
#include "atom/browser/osr_render_widget_host_view.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
namespace { namespace {

3
atom/browser/api/atom_api_web_contents.h
View file

@ -12,14 +12,13 @@
#include "atom/browser/api/save_page_handler.h" #include "atom/browser/api/save_page_handler.h"
#include "atom/browser/api/trackable_object.h" #include "atom/browser/api/trackable_object.h"
#include "atom/browser/common_web_contents_delegate.h" #include "atom/browser/common_web_contents_delegate.h"
#include "atom/browser/osr/osr_output_device.h"
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
#include "content/public/common/favicon_url.h" #include "content/public/common/favicon_url.h"
#include "content/common/cursors/webcursor.h" #include "content/common/cursors/webcursor.h"
#include "native_mate/handle.h" #include "native_mate/handle.h"
#include "ui/gfx/image/image.h" #include "ui/gfx/image/image.h"
#include "atom/browser/osr_output_device.h"
namespace blink { namespace blink {
struct WebDeviceEmulationParams; struct WebDeviceEmulationParams;
} }

2
atom/browser/osr_output_device.cc → atom/browser/osr/osr_output_device.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "atom/browser/osr_output_device.h" #include "atom/browser/osr/osr_output_device.h"
#include "third_party/skia/include/core/SkDevice.h" #include "third_party/skia/include/core/SkDevice.h"
#include "ui/gfx/skia_util.h" #include "ui/gfx/skia_util.h"

6
atom/browser/osr_output_device.h → atom/browser/osr/osr_output_device.h
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ATOM_BROWSER_OSR_OUTPUT_DEVICE_H_ #ifndef ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
#define ATOM_BROWSER_OSR_OUTPUT_DEVICE_H_ #define ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
#include "base/callback.h" #include "base/callback.h"
#include "cc/output/software_output_device.h" #include "cc/output/software_output_device.h"
@ -44,4 +44,4 @@ class OffScreenOutputDevice : public cc::SoftwareOutputDevice {
} // namespace atom } // namespace atom
#endif // ATOM_BROWSER_OSR_OUTPUT_DEVICE_H_ #endif // ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_

2
atom/browser/osr_render_widget_host_view.cc → atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "atom/browser/osr_render_widget_host_view.h" #include "atom/browser/osr/osr_render_widget_host_view.h"
#include <vector> #include <vector>

31
atom/browser/osr_render_widget_host_view.h → atom/browser/osr/osr_render_widget_host_view.h
View file

@ -2,34 +2,35 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ATOM_BROWSER_OSR_RENDER_WIDGET_HOST_VIEW_H_ #ifndef ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
#define ATOM_BROWSER_OSR_RENDER_WIDGET_HOST_VIEW_H_ #define ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
#include <string> #include <string>
#include <vector> #include <vector>
#include "atom/browser/native_window.h" #if defined(OS_WIN)
#include <windows.h>
#endif
#include "content/browser/renderer_host/render_widget_host_view_base.h" #include "atom/browser/native_window.h"
#include "content/browser/renderer_host/delegated_frame_host.h" #include "atom/browser/osr/osr_output_device.h"
#include "content/browser/renderer_host/resize_lock.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "cc/scheduler/begin_frame_source.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "cc/output/compositor_frame.h"
#include "ui/gfx/geometry/point.h"
#include "base/process/kill.h" #include "base/process/kill.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "cc/scheduler/begin_frame_source.h"
#include "cc/output/compositor_frame.h"
#include "content/browser/renderer_host/delegated_frame_host.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/renderer_host/resize_lock.h"
#include "ui/compositor/compositor.h" #include "ui/compositor/compositor.h"
#include "ui/compositor/layer_delegate.h" #include "ui/compositor/layer_delegate.h"
#include "ui/compositor/layer_owner.h" #include "ui/compositor/layer_owner.h"
#include "ui/base/ime/text_input_client.h" #include "ui/base/ime/text_input_client.h"
#include "ui/gfx/geometry/point.h"
#include "atom/browser/osr_output_device.h" #include "third_party/WebKit/public/platform/WebVector.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include <windows.h>
#include "ui/gfx/win/window_impl.h" #include "ui/gfx/win/window_impl.h"
#endif #endif
@ -263,4 +264,4 @@ private:
} // namespace atom } // namespace atom
#endif // ATOM_BROWSER_OSR_RENDER_WIDGET_HOST_VIEW_H_ #endif // ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_

2
atom/browser/osr_render_widget_host_view_mac.mm → atom/browser/osr/osr_render_widget_host_view_mac.mm
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "atom/browser/osr_render_widget_host_view.h" #include "atom/browser/osr/osr_render_widget_host_view.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>

2
atom/browser/osr_web_contents_view.cc → atom/browser/osr/osr_web_contents_view.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "atom/browser/osr_web_contents_view.h" #include "atom/browser/osr/osr_web_contents_view.h"
namespace atom { namespace atom {

9
atom/browser/osr_web_contents_view.h → atom/browser/osr/osr_web_contents_view.h
View file

@ -2,15 +2,14 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ATOM_BROWSER_OSR_WEB_CONTENTS_VIEW_H_ #ifndef ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
#define ATOM_BROWSER_OSR_WEB_CONTENTS_VIEW_H_ #define ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
#include "atom/browser/osr/osr_render_widget_host_view.h"
#include "content/browser/renderer_host/render_view_host_delegate_view.h" #include "content/browser/renderer_host/render_view_host_delegate_view.h"
#include "content/browser/web_contents/web_contents_view.h" #include "content/browser/web_contents/web_contents_view.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "atom/browser/osr_render_widget_host_view.h"
namespace atom { namespace atom {
class OffScreenWebContentsView : public content::WebContentsView, class OffScreenWebContentsView : public content::WebContentsView,
@ -70,4 +69,4 @@ class OffScreenWebContentsView : public content::WebContentsView,
} // namespace atom } // namespace atom
#endif // ATOM_BROWSER_OSR_WEB_CONTENTS_VIEW_H_ #endif // ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_

14
filenames.gypi
View file

@ -206,13 +206,13 @@
'atom/browser/native_window_mac.h', 'atom/browser/native_window_mac.h',
'atom/browser/native_window_mac.mm', 'atom/browser/native_window_mac.mm',
'atom/browser/native_window_observer.h', 'atom/browser/native_window_observer.h',
'atom/browser/osr_web_contents_view.cc', 'atom/browser/osr/osr_web_contents_view.cc',
'atom/browser/osr_web_contents_view.h', 'atom/browser/osr/osr_web_contents_view.h',
'atom/browser/osr_output_device.cc', 'atom/browser/osr/osr_output_device.cc',
'atom/browser/osr_output_device.h', 'atom/browser/osr/osr_output_device.h',
'atom/browser/osr_render_widget_host_view.cc', 'atom/browser/osr/osr_render_widget_host_view.cc',
'atom/browser/osr_render_widget_host_view.h', 'atom/browser/osr/osr_render_widget_host_view.h',
'atom/browser/osr_render_widget_host_view_mac.mm', 'atom/browser/osr/osr_render_widget_host_view_mac.mm',
'atom/browser/net/asar/asar_protocol_handler.cc', 'atom/browser/net/asar/asar_protocol_handler.cc',
'atom/browser/net/asar/asar_protocol_handler.h', 'atom/browser/net/asar/asar_protocol_handler.h',
'atom/browser/net/asar/url_request_asar_job.cc', 'atom/browser/net/asar/url_request_asar_job.cc',