Skip to content

Commit

Permalink
content: Rename all classes with WebKitPlatform to BlinkPlatform.
Browse files Browse the repository at this point in the history
BUG=359244
TEST=None
R=avi@chromium.org

Review URL: https://codereview.chromium.org/628793003

Cr-Commit-Position: refs/heads/master@{#298176}
  • Loading branch information
tfarina authored and Commit bot committed Oct 5, 2014
1 parent 926dd7d commit 556a723
Show file tree
Hide file tree
Showing 36 changed files with 315 additions and 329 deletions.
2 changes: 1 addition & 1 deletion content/browser/android/content_view_statics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace {
// This tracks the renderer processes that received a suspend request. It's
// important on resume to only resume the renderer processes that were actually
// suspended as opposed to all the current renderer processes because the
// suspend calls are refcounted within WebKitPlatformSupport and it expects a
// suspend calls are refcounted within BlinkPlatformImpl and it expects a
// perfectly matched number of resume calls.
// Note that this class is only accessed from the UI thread.
class SuspendedProcessWatcher : public content::RenderProcessHostObserver {
Expand Down
5 changes: 3 additions & 2 deletions content/browser/net/view_blob_internals_job_factory.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ namespace net {
class NetworkDelegate;
class URLRequest;
class URLRequestJob;
} // namespace net
}

namespace storage {
class BlobStorageContext;
} // webkit_blob
}

class GURL;

Expand Down
8 changes: 4 additions & 4 deletions content/browser/renderer_host/sandbox_ipc_linux.cc
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ void SandboxIPCHandler::SendRendererReply(

SandboxIPCHandler::~SandboxIPCHandler() {
paths_.deleteAll();
if (webkit_platform_support_)
if (blink_platform_impl_)
blink::shutdownWithoutV8();

if (IGNORE_EINTR(close(lifeline_fd_)) < 0)
Expand All @@ -453,10 +453,10 @@ SandboxIPCHandler::~SandboxIPCHandler() {
}

void SandboxIPCHandler::EnsureWebKitInitialized() {
if (webkit_platform_support_)
if (blink_platform_impl_)
return;
webkit_platform_support_.reset(new BlinkPlatformImpl);
blink::initializeWithoutV8(webkit_platform_support_.get());
blink_platform_impl_.reset(new BlinkPlatformImpl);
blink::initializeWithoutV8(blink_platform_impl_.get());
}

} // namespace content
2 changes: 1 addition & 1 deletion content/browser/renderer_host/sandbox_ipc_linux.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class SandboxIPCHandler : public base::DelegateSimpleThread::Delegate {

const int lifeline_fd_;
const int browser_socket_;
scoped_ptr<BlinkPlatformImpl> webkit_platform_support_;
scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
SkTDArray<SkString*> paths_;

DISALLOW_COPY_AND_ASSIGN(SandboxIPCHandler);
Expand Down
5 changes: 3 additions & 2 deletions content/child/database_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ class SyncMessageFilter;
}

namespace content {
// A class of utility functions used by RendererWebKitPlatformSupportImpl and
// WorkerWebKitPlatformSupportImpl to handle database file accesses.

// A class of utility functions used by RendererBlinkPlatformImpl to handle
// database file accesses.
class DatabaseUtil {
public:
static blink::Platform::FileHandle DatabaseOpenFile(
Expand Down
5 changes: 2 additions & 3 deletions content/child/resource_loader_bridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct SyncLoadResponse;
// now that it lives in content/.
class CONTENT_EXPORT ResourceLoaderBridge {
public:
// use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but
// use BlinkPlatformImpl::CreateResourceLoader() for construction, but
// anybody can delete at any time, INCLUDING during processing of callbacks.
virtual ~ResourceLoaderBridge();

Expand Down Expand Up @@ -78,8 +78,7 @@ class CONTENT_EXPORT ResourceLoaderBridge {
virtual void SyncLoad(SyncLoadResponse* response) = 0;

protected:
// Construction must go through
// WebKitPlatformSupportImpl::CreateResourceLoader()
// Construction must go through BlinkPlatformImpl::CreateResourceLoader().
// For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload
// methods may be called to construct the body of the request.
ResourceLoaderBridge();
Expand Down
2 changes: 1 addition & 1 deletion content/common/gpu/gpu_command_buffer_stub.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class GpuCommandBufferMemoryTracker : public gpu::gles2::MemoryTracker {
// url_hash matches.
void FastSetActiveURL(const GURL& url, size_t url_hash) {
// Leave the previously set URL in the empty case -- empty URLs are given by
// WebKitPlatformSupportImpl::createOffscreenGraphicsContext3D. Hopefully the
// BlinkPlatformImpl::createOffscreenGraphicsContext3D. Hopefully the
// onscreen context URL was set previously and will show up even when a crash
// occurs during offscreen command processing.
if (url.is_empty())
Expand Down
4 changes: 2 additions & 2 deletions content/content_ppapi_plugin.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
'ppapi_plugin/broker_process_dispatcher.h',
'ppapi_plugin/plugin_process_dispatcher.cc',
'ppapi_plugin/plugin_process_dispatcher.h',
'ppapi_plugin/ppapi_blink_platform_impl.cc',
'ppapi_plugin/ppapi_blink_platform_impl.h',
'ppapi_plugin/ppapi_broker_main.cc',
'ppapi_plugin/ppapi_plugin_main.cc',
'ppapi_plugin/ppapi_thread.cc',
'ppapi_plugin/ppapi_thread.h',
'ppapi_plugin/ppapi_webkitplatformsupport_impl.cc',
'ppapi_plugin/ppapi_webkitplatformsupport_impl.h',
],
'include_dirs': [
'..',
Expand Down
4 changes: 2 additions & 2 deletions content/content_renderer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,8 @@
'renderer/render_widget.h',
'renderer/render_widget_fullscreen.cc',
'renderer/render_widget_fullscreen.h',
'renderer/renderer_blink_platform_impl.cc',
'renderer/renderer_blink_platform_impl.h',
'renderer/renderer_clipboard_client.cc',
'renderer/renderer_clipboard_client.h',
'renderer/renderer_font_platform_win.cc',
Expand All @@ -356,8 +358,6 @@
'renderer/renderer_webcolorchooser_impl.h',
'renderer/renderer_webcookiejar_impl.cc',
'renderer/renderer_webcookiejar_impl.h',
'renderer/renderer_webkitplatformsupport_impl.cc',
'renderer/renderer_webkitplatformsupport_impl.h',
'renderer/resizing_mode_selector.cc',
'renderer/resizing_mode_selector.h',
'renderer/sad_plugin.cc',
Expand Down
4 changes: 2 additions & 2 deletions content/content_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
'test/net/url_request_slow_download_job.h',
'test/ppapi_unittest.cc',
'test/ppapi_unittest.h',
'test/test_blink_web_unit_test_support.cc',
'test/test_blink_web_unit_test_support.h',
'test/test_content_browser_client.cc',
'test/test_content_browser_client.h',
'test/test_content_client.cc',
Expand All @@ -146,8 +148,6 @@
'test/test_render_view_host_factory.h',
'test/test_web_contents.cc',
'test/test_web_contents.h',
'test/test_webkit_platform_support.cc',
'test/test_webkit_platform_support.h',
'test/web_gesture_curve_mock.cc',
'test/web_gesture_curve_mock.h',
'test/web_layer_tree_view_impl_for_testing.cc',
Expand Down
6 changes: 3 additions & 3 deletions content/plugin/plugin_thread.cc
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ PluginThread::PluginThread()

channel()->AddFilter(new EnsureTerminateMessageFilter());

// This is needed because we call some code which uses WebKit strings.
webkit_platform_support_.reset(new BlinkPlatformImpl);
blink::initialize(webkit_platform_support_.get());
// This is needed because we call some code which uses Blink strings.
blink_platform_impl_.reset(new BlinkPlatformImpl);
blink::initialize(blink_platform_impl_.get());
}

PluginThread::~PluginThread() {
Expand Down
2 changes: 1 addition & 1 deletion content/plugin/plugin_thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class PluginThread : public ChildThread {

bool forcefully_terminate_plugin_process_;

scoped_ptr<BlinkPlatformImpl> webkit_platform_support_;
scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;

DISALLOW_COPY_AND_ASSIGN(PluginThread);
};
Expand Down
4 changes: 2 additions & 2 deletions content/ppapi_plugin/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ source_set("ppapi_plugin") {
"broker_process_dispatcher.h",
"plugin_process_dispatcher.cc",
"plugin_process_dispatcher.h",
"ppapi_blink_platform_impl.cc",
"ppapi_blink_platform_impl.h",
"ppapi_broker_main.cc",
"ppapi_plugin_main.cc",
"ppapi_thread.cc",
"ppapi_thread.h",
"ppapi_webkitplatformsupport_impl.cc",
"ppapi_webkitplatformsupport_impl.h",
]

configs += [ "//content:content_implementation" ]
Expand Down
Loading

0 comments on commit 556a723

Please sign in to comment.