diff options
22 files changed, 248 insertions, 493 deletions
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index ad2a792..a117610 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -1641,10 +1641,6 @@ TabsCaptureVisibleTabFunction::TabsCaptureVisibleTabFunction() : chrome_details_(this) { } -bool TabsCaptureVisibleTabFunction::HasPermission() { - return true; -} - bool TabsCaptureVisibleTabFunction::IsScreenshotEnabled() { PrefService* service = chrome_details_.GetProfile()->GetPrefs(); if (service->GetBoolean(prefs::kDisableScreenshots)) { @@ -1672,40 +1668,6 @@ WebContents* TabsCaptureVisibleTabFunction::GetWebContentsForID(int window_id) { return contents; } -bool TabsCaptureVisibleTabFunction::RunAsync() { - using api::extension_types::ImageDetails; - - EXTENSION_FUNCTION_VALIDATE(args_); - - int context_id = extension_misc::kCurrentWindowId; - args_->GetInteger(0, &context_id); - - scoped_ptr<ImageDetails> image_details; - if (args_->GetSize() > 1) { - base::Value* spec = NULL; - EXTENSION_FUNCTION_VALIDATE(args_->Get(1, &spec) && spec); - image_details = ImageDetails::FromValue(*spec); - } - - WebContents* contents = GetWebContentsForID(context_id); - - return CaptureAsync( - contents, image_details.get(), - base::Bind(&TabsCaptureVisibleTabFunction::CopyFromBackingStoreComplete, - this)); -} - -void TabsCaptureVisibleTabFunction::OnCaptureSuccess(const SkBitmap& bitmap) { - std::string base64_result; - if (!EncodeBitmap(bitmap, &base64_result)) { - OnCaptureFailure(FAILURE_REASON_ENCODING_FAILED); - return; - } - - SetResult(new base::StringValue(base64_result)); - SendResponse(true); -} - void TabsCaptureVisibleTabFunction::OnCaptureFailure(FailureReason reason) { const char* reason_description = "internal error"; switch (reason) { diff --git a/chrome/browser/extensions/api/tabs/tabs_api.h b/chrome/browser/extensions/api/tabs/tabs_api.h index e0a5f24..b398e70 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.h +++ b/chrome/browser/extensions/api/tabs/tabs_api.h @@ -15,8 +15,8 @@ #include "components/ui/zoom/zoom_controller.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/api/capture_web_contents_function.h" #include "extensions/browser/api/execute_code_function.h" -#include "extensions/browser/api/web_contents_capture_client.h" #include "extensions/common/extension_resource.h" #include "extensions/common/user_script.h" #include "url/gurl.h" @@ -195,29 +195,21 @@ class TabsDetectLanguageFunction : public ChromeAsyncExtensionFunction, content::NotificationRegistrar registrar_; DECLARE_EXTENSION_FUNCTION("tabs.detectLanguage", TABS_DETECTLANGUAGE) }; - class TabsCaptureVisibleTabFunction - : public extensions::WebContentsCaptureClient, - public AsyncExtensionFunction { + : public extensions::CaptureWebContentsFunction { public: TabsCaptureVisibleTabFunction(); static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); - // ExtensionFunction implementation. - bool HasPermission() override; - bool RunAsync() override; - protected: ~TabsCaptureVisibleTabFunction() override {} private: ChromeExtensionFunctionDetails chrome_details_; - content::WebContents* GetWebContentsForID(int window_id); - - // extensions::WebContentsCaptureClient: + // extensions::CaptureWebContentsFunction: bool IsScreenshotEnabled() override; - void OnCaptureSuccess(const SkBitmap& bitmap) override; + content::WebContents* GetWebContentsForID(int id) override; void OnCaptureFailure(FailureReason reason) override; DECLARE_EXTENSION_FUNCTION("tabs.captureVisibleTab", TABS_CAPTUREVISIBLETAB) diff --git a/chrome/common/extensions/api/webview_tag.json b/chrome/common/extensions/api/webview_tag.json index 0263954..8828eb3 100644 --- a/chrome/common/extensions/api/webview_tag.json +++ b/chrome/common/extensions/api/webview_tag.json @@ -676,28 +676,6 @@ ], "functions": [ { - "name": "captureVisibleRegion", - "type": "function", - "description": "Captures the visible region of the webview.", - "parameters": [ - { - "$ref": "extensionTypes.ImageDetails", - "name": "options", - "optional": true - }, - { - "type": "function", - "name": "callback", - "parameters": [ - {"type": "string", - "name": "dataUrl", - "description": "A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display." - } - ] - } - ] - }, - { "name": "addContentScripts", "type": "function", "description": "<p>Adds content script injection rules to the <code>webview</code>. When the <code>webview</code> navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the <code>webview</code>: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([\r {\r name: 'myRule',\r matches: ['http://www.foo.com/*'],\r css: { files: ['mystyles.css'] },\r js: { files: ['jquery.js', 'myscript.js'] },\r run_at: 'document_start'\r },\r {\r name: 'anotherRule',\r matches: ['http://www.bar.com/*'],\r js: { code: \"document.body.style.backgroundColor = 'red';\" },\r run_at: 'document_end'\r }]);\r ...\r\r// Navigates webview.\rwebview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{\r name: 'rule',\r matches: ['http://www.foo.com/*'],\r js: { files: ['scriptA.js'] },\r run_at: 'document_start'}]);\r\r// Do something.\rwebview.src = 'http://www.foo.com/*';\r ...\r// Overwrite 'rule' defined before.\rwebview.addContentScripts([{\r name: 'rule',\r matches: ['http://www.bar.com/*'],\r js: { files: ['scriptB.js'] },\r run_at: 'document_end'}]);</pre><p>If <code>webview</code> has been naviagted to the origin (e.g., foo.com) and calls <code>webview.addContentScripts</code> to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, <code>executeScript</code> will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the <code>webview</code> is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>", diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc index 3125dd5..f381da0 100644 --- a/content/browser/compositor/delegated_frame_host.cc +++ b/content/browser/compositor/delegated_frame_host.cc @@ -151,7 +151,7 @@ void DelegatedFrameHost::CopyFromCompositingSurface( scoped_ptr<cc::CopyOutputRequest> request = cc::CopyOutputRequest::CreateRequest( - base::Bind(&CopyFromCompositingSurfaceHasResult, + base::Bind(&DelegatedFrameHost::CopyFromCompositingSurfaceHasResult, output_size, preferred_color_type, callback)); if (!src_subrect.IsEmpty()) request->set_area(src_subrect); @@ -593,6 +593,155 @@ void DelegatedFrameHost::EvictDelegatedFrame() { } // static +void DelegatedFrameHost::CopyFromCompositingSurfaceHasResult( + const gfx::Size& dst_size_in_pixel, + const SkColorType color_type, + const ReadbackRequestCallback& callback, + scoped_ptr<cc::CopyOutputResult> result) { + if (result->IsEmpty() || result->size().IsEmpty()) { + callback.Run(SkBitmap(), content::READBACK_FAILED); + return; + } + + gfx::Size output_size_in_pixel; + if (dst_size_in_pixel.IsEmpty()) + output_size_in_pixel = result->size(); + else + output_size_in_pixel = dst_size_in_pixel; + + if (result->HasTexture()) { + // GPU-accelerated path + PrepareTextureCopyOutputResult(output_size_in_pixel, color_type, callback, + std::move(result)); + return; + } + + DCHECK(result->HasBitmap()); + // Software path + PrepareBitmapCopyOutputResult(output_size_in_pixel, color_type, callback, + std::move(result)); +} + +static void CopyFromCompositingSurfaceFinished( + const ReadbackRequestCallback& callback, + scoped_ptr<cc::SingleReleaseCallback> release_callback, + scoped_ptr<SkBitmap> bitmap, + scoped_ptr<SkAutoLockPixels> bitmap_pixels_lock, + bool result) { + bitmap_pixels_lock.reset(); + + gpu::SyncToken sync_token; + if (result) { + GLHelper* gl_helper = ImageTransportFactory::GetInstance()->GetGLHelper(); + if (gl_helper) + gl_helper->GenerateSyncToken(&sync_token); + } + const bool lost_resource = !sync_token.HasData(); + release_callback->Run(sync_token, lost_resource); + + callback.Run(*bitmap, + result ? content::READBACK_SUCCESS : content::READBACK_FAILED); +} + +// static +void DelegatedFrameHost::PrepareTextureCopyOutputResult( + const gfx::Size& dst_size_in_pixel, + const SkColorType color_type, + const ReadbackRequestCallback& callback, + scoped_ptr<cc::CopyOutputResult> result) { + DCHECK(result->HasTexture()); + base::ScopedClosureRunner scoped_callback_runner( + base::Bind(callback, SkBitmap(), content::READBACK_FAILED)); + + // TODO(siva.gunturi): We should be able to validate the format here using + // GLHelper::IsReadbackConfigSupported before we processs the result. + // See crbug.com/415682 and crbug.com/415131. + scoped_ptr<SkBitmap> bitmap(new SkBitmap); + if (!bitmap->tryAllocPixels(SkImageInfo::Make( + dst_size_in_pixel.width(), dst_size_in_pixel.height(), color_type, + kOpaque_SkAlphaType))) { + scoped_callback_runner.Reset(base::Bind( + callback, SkBitmap(), content::READBACK_BITMAP_ALLOCATION_FAILURE)); + return; + } + + ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); + GLHelper* gl_helper = factory->GetGLHelper(); + if (!gl_helper) + return; + + scoped_ptr<SkAutoLockPixels> bitmap_pixels_lock( + new SkAutoLockPixels(*bitmap)); + uint8_t* pixels = static_cast<uint8_t*>(bitmap->getPixels()); + + cc::TextureMailbox texture_mailbox; + scoped_ptr<cc::SingleReleaseCallback> release_callback; + result->TakeTexture(&texture_mailbox, &release_callback); + DCHECK(texture_mailbox.IsTexture()); + + ignore_result(scoped_callback_runner.Release()); + + gl_helper->CropScaleReadbackAndCleanMailbox( + texture_mailbox.mailbox(), texture_mailbox.sync_token(), result->size(), + gfx::Rect(result->size()), dst_size_in_pixel, pixels, color_type, + base::Bind(&CopyFromCompositingSurfaceFinished, callback, + base::Passed(&release_callback), base::Passed(&bitmap), + base::Passed(&bitmap_pixels_lock)), + GLHelper::SCALER_QUALITY_GOOD); +} + +// static +void DelegatedFrameHost::PrepareBitmapCopyOutputResult( + const gfx::Size& dst_size_in_pixel, + const SkColorType preferred_color_type, + const ReadbackRequestCallback& callback, + scoped_ptr<cc::CopyOutputResult> result) { + SkColorType color_type = preferred_color_type; + if (color_type != kN32_SkColorType && color_type != kAlpha_8_SkColorType) { + // Switch back to default colortype if format not supported. + color_type = kN32_SkColorType; + } + DCHECK(result->HasBitmap()); + scoped_ptr<SkBitmap> source = result->TakeBitmap(); + DCHECK(source); + SkBitmap scaled_bitmap; + if (source->width() != dst_size_in_pixel.width() || + source->height() != dst_size_in_pixel.height()) { + scaled_bitmap = + skia::ImageOperations::Resize(*source, + skia::ImageOperations::RESIZE_BEST, + dst_size_in_pixel.width(), + dst_size_in_pixel.height()); + } else { + scaled_bitmap = *source; + } + if (color_type == kN32_SkColorType) { + DCHECK_EQ(scaled_bitmap.colorType(), kN32_SkColorType); + callback.Run(scaled_bitmap, READBACK_SUCCESS); + return; + } + DCHECK_EQ(color_type, kAlpha_8_SkColorType); + // The software path currently always returns N32 bitmap regardless of the + // |color_type| we ask for. + DCHECK_EQ(scaled_bitmap.colorType(), kN32_SkColorType); + // Paint |scaledBitmap| to alpha-only |grayscale_bitmap|. + SkBitmap grayscale_bitmap; + bool success = grayscale_bitmap.tryAllocPixels( + SkImageInfo::MakeA8(scaled_bitmap.width(), scaled_bitmap.height())); + if (!success) { + callback.Run(SkBitmap(), content::READBACK_BITMAP_ALLOCATION_FAILURE); + return; + } + SkCanvas canvas(grayscale_bitmap); + SkPaint paint; + skia::RefPtr<SkColorFilter> filter = + skia::AdoptRef(SkLumaColorFilter::Create()); + paint.setColorFilter(filter.get()); + canvas.drawBitmap(scaled_bitmap, SkIntToScalar(0), SkIntToScalar(0), &paint); + callback.Run(grayscale_bitmap, READBACK_SUCCESS); +} + +// static void DelegatedFrameHost::ReturnSubscriberTexture( base::WeakPtr<DelegatedFrameHost> dfh, scoped_refptr<OwnedMailbox> subscriber_texture, @@ -898,12 +1047,11 @@ void DelegatedFrameHost::LockResources() { void DelegatedFrameHost::RequestCopyOfOutput( scoped_ptr<cc::CopyOutputRequest> request) { - if (!request_copy_of_output_callback_for_testing_.is_null()) { + if (!request_copy_of_output_callback_for_testing_.is_null()) request_copy_of_output_callback_for_testing_.Run(std::move(request)); - } else { + else client_->DelegatedFrameHostGetLayer()->RequestCopyOfOutput( std::move(request)); - } } void DelegatedFrameHost::UnlockResources() { diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h index b937c76..d1237af 100644 --- a/content/browser/compositor/delegated_frame_host.h +++ b/content/browser/compositor/delegated_frame_host.h @@ -219,6 +219,21 @@ class CONTENT_EXPORT DelegatedFrameHost // Called after async thumbnailer task completes. Scales and crops the result // of the copy. + static void CopyFromCompositingSurfaceHasResult( + const gfx::Size& dst_size_in_pixel, + const SkColorType color_type, + const ReadbackRequestCallback& callback, + scoped_ptr<cc::CopyOutputResult> result); + static void PrepareTextureCopyOutputResult( + const gfx::Size& dst_size_in_pixel, + const SkColorType color_type, + const ReadbackRequestCallback& callback, + scoped_ptr<cc::CopyOutputResult> result); + static void PrepareBitmapCopyOutputResult( + const gfx::Size& dst_size_in_pixel, + const SkColorType color_type, + const ReadbackRequestCallback& callback, + scoped_ptr<cc::CopyOutputResult> result); static void CopyFromCompositingSurfaceHasResultForVideo( base::WeakPtr<DelegatedFrameHost> rwhva, scoped_refptr<OwnedMailbox> subscriber_texture, diff --git a/content/browser/compositor/surface_utils.cc b/content/browser/compositor/surface_utils.cc index 83d55f5..7ae0591 100644 --- a/content/browser/compositor/surface_utils.cc +++ b/content/browser/compositor/surface_utils.cc @@ -4,21 +4,8 @@ #include "content/browser/compositor/surface_utils.h" -#include "base/callback_helpers.h" -#include "base/memory/ref_counted.h" #include "build/build_config.h" -#include "cc/output/copy_output_result.h" -#include "cc/resources/single_release_callback.h" #include "cc/surfaces/surface_id_allocator.h" -#include "content/common/gpu/client/gl_helper.h" -#include "skia/ext/image_operations.h" -#include "skia/ext/refptr.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkColorFilter.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/effects/SkLumaColorFilter.h" -#include "ui/gfx/geometry/rect.h" - #if defined(OS_ANDROID) && !defined(USE_AURA) #include "content/browser/renderer_host/compositor_impl_android.h" @@ -27,135 +14,6 @@ #include "ui/compositor/compositor.h" #endif -namespace { - -#if !defined(OS_ANDROID) || defined(USE_AURA) -void CopyFromCompositingSurfaceFinished( - const content::ReadbackRequestCallback& callback, - scoped_ptr<cc::SingleReleaseCallback> release_callback, - scoped_ptr<SkBitmap> bitmap, - scoped_ptr<SkAutoLockPixels> bitmap_pixels_lock, - bool result) { - bitmap_pixels_lock.reset(); - - gpu::SyncToken sync_token; - if (result) { - content::GLHelper* gl_helper = - content::ImageTransportFactory::GetInstance()->GetGLHelper(); - if (gl_helper) - gl_helper->GenerateSyncToken(&sync_token); - } - const bool lost_resource = !sync_token.HasData(); - release_callback->Run(sync_token, lost_resource); - - callback.Run(*bitmap, - result ? content::READBACK_SUCCESS : content::READBACK_FAILED); -} -#endif - -void PrepareTextureCopyOutputResult( - const gfx::Size& dst_size_in_pixel, - const SkColorType color_type, - const content::ReadbackRequestCallback& callback, - scoped_ptr<cc::CopyOutputResult> result) { -#if defined(OS_ANDROID) && !defined(USE_AURA) - //TODO(wjmaclean): See if there's an equivalent pathway for Android and - // implement it here. - callback.Run(SkBitmap(), content::READBACK_FAILED); -#else - DCHECK(result->HasTexture()); - base::ScopedClosureRunner scoped_callback_runner( - base::Bind(callback, SkBitmap(), content::READBACK_FAILED)); - - // TODO(siva.gunturi): We should be able to validate the format here using - // GLHelper::IsReadbackConfigSupported before we processs the result. - // See crbug.com/415682 and crbug.com/415131. - scoped_ptr<SkBitmap> bitmap(new SkBitmap); - if (!bitmap->tryAllocPixels(SkImageInfo::Make( - dst_size_in_pixel.width(), dst_size_in_pixel.height(), color_type, - kOpaque_SkAlphaType))) { - scoped_callback_runner.Reset(base::Bind( - callback, SkBitmap(), content::READBACK_BITMAP_ALLOCATION_FAILURE)); - return; - } - - content::ImageTransportFactory* factory = - content::ImageTransportFactory::GetInstance(); - content::GLHelper* gl_helper = factory->GetGLHelper(); - if (!gl_helper) - return; - - scoped_ptr<SkAutoLockPixels> bitmap_pixels_lock( - new SkAutoLockPixels(*bitmap)); - uint8_t* pixels = static_cast<uint8_t*>(bitmap->getPixels()); - - cc::TextureMailbox texture_mailbox; - scoped_ptr<cc::SingleReleaseCallback> release_callback; - result->TakeTexture(&texture_mailbox, &release_callback); - DCHECK(texture_mailbox.IsTexture()); - - ignore_result(scoped_callback_runner.Release()); - - gl_helper->CropScaleReadbackAndCleanMailbox( - texture_mailbox.mailbox(), texture_mailbox.sync_token(), result->size(), - gfx::Rect(result->size()), dst_size_in_pixel, pixels, color_type, - base::Bind(&CopyFromCompositingSurfaceFinished, callback, - base::Passed(&release_callback), base::Passed(&bitmap), - base::Passed(&bitmap_pixels_lock)), - content::GLHelper::SCALER_QUALITY_GOOD); -#endif -} - -void PrepareBitmapCopyOutputResult( - const gfx::Size& dst_size_in_pixel, - const SkColorType preferred_color_type, - const content::ReadbackRequestCallback& callback, - scoped_ptr<cc::CopyOutputResult> result) { - SkColorType color_type = preferred_color_type; - if (color_type != kN32_SkColorType && color_type != kAlpha_8_SkColorType) { - // Switch back to default colortype if format not supported. - color_type = kN32_SkColorType; - } - DCHECK(result->HasBitmap()); - scoped_ptr<SkBitmap> source = result->TakeBitmap(); - DCHECK(source); - SkBitmap scaled_bitmap; - if (source->width() != dst_size_in_pixel.width() || - source->height() != dst_size_in_pixel.height()) { - scaled_bitmap = skia::ImageOperations::Resize( - *source, skia::ImageOperations::RESIZE_BEST, dst_size_in_pixel.width(), - dst_size_in_pixel.height()); - } else { - scaled_bitmap = *source; - } - if (color_type == kN32_SkColorType) { - DCHECK_EQ(scaled_bitmap.colorType(), kN32_SkColorType); - callback.Run(scaled_bitmap, content::READBACK_SUCCESS); - return; - } - DCHECK_EQ(color_type, kAlpha_8_SkColorType); - // The software path currently always returns N32 bitmap regardless of the - // |color_type| we ask for. - DCHECK_EQ(scaled_bitmap.colorType(), kN32_SkColorType); - // Paint |scaledBitmap| to alpha-only |grayscale_bitmap|. - SkBitmap grayscale_bitmap; - bool success = grayscale_bitmap.tryAllocPixels( - SkImageInfo::MakeA8(scaled_bitmap.width(), scaled_bitmap.height())); - if (!success) { - callback.Run(SkBitmap(), content::READBACK_BITMAP_ALLOCATION_FAILURE); - return; - } - SkCanvas canvas(grayscale_bitmap); - SkPaint paint; - skia::RefPtr<SkColorFilter> filter = - skia::AdoptRef(SkLumaColorFilter::Create()); - paint.setColorFilter(filter.get()); - canvas.drawBitmap(scaled_bitmap, SkIntToScalar(0), SkIntToScalar(0), &paint); - callback.Run(grayscale_bitmap, content::READBACK_SUCCESS); -} - -} // namespace - namespace content { scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() { @@ -176,33 +34,4 @@ cc::SurfaceManager* GetSurfaceManager() { #endif } -void CopyFromCompositingSurfaceHasResult( - const gfx::Size& dst_size_in_pixel, - const SkColorType color_type, - const ReadbackRequestCallback& callback, - scoped_ptr<cc::CopyOutputResult> result) { - if (result->IsEmpty() || result->size().IsEmpty()) { - callback.Run(SkBitmap(), READBACK_FAILED); - return; - } - - gfx::Size output_size_in_pixel; - if (dst_size_in_pixel.IsEmpty()) - output_size_in_pixel = result->size(); - else - output_size_in_pixel = dst_size_in_pixel; - - if (result->HasTexture()) { - // GPU-accelerated path - PrepareTextureCopyOutputResult(output_size_in_pixel, color_type, callback, - std::move(result)); - return; - } - - DCHECK(result->HasBitmap()); - // Software path - PrepareBitmapCopyOutputResult(output_size_in_pixel, color_type, callback, - std::move(result)); -} - } // namespace content diff --git a/content/browser/compositor/surface_utils.h b/content/browser/compositor/surface_utils.h index 00d0fd7..b56fef2 100644 --- a/content/browser/compositor/surface_utils.h +++ b/content/browser/compositor/surface_utils.h @@ -6,12 +6,8 @@ #define CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ #include "base/memory/scoped_ptr.h" -#include "content/public/browser/readback_types.h" -#include "third_party/skia/include/core/SkImageInfo.h" -#include "ui/gfx/geometry/size.h" namespace cc { -class CopyOutputResult; class SurfaceIdAllocator; class SurfaceManager; } // namespace cc @@ -22,12 +18,6 @@ scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator(); cc::SurfaceManager* GetSurfaceManager(); -void CopyFromCompositingSurfaceHasResult( - const gfx::Size& dst_size_in_pixel, - const SkColorType color_type, - const ReadbackRequestCallback& callback, - scoped_ptr<cc::CopyOutputResult> result); - } // namespace content #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc index 62b1d6e..e8d384e 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc @@ -9,8 +9,6 @@ #include <vector> #include "build/build_config.h" -#include "cc/output/copy_output_request.h" -#include "cc/output/copy_output_result.h" #include "cc/surfaces/surface.h" #include "cc/surfaces/surface_factory.h" #include "cc/surfaces/surface_manager.h" @@ -428,21 +426,11 @@ bool RenderWidgetHostViewChildFrame::PostProcessEventForPluginIme( #endif // defined(OS_MACOSX) void RenderWidgetHostViewChildFrame::CopyFromCompositingSurface( - const gfx::Rect& src_subrect, - const gfx::Size& output_size, + const gfx::Rect& /* src_subrect */, + const gfx::Size& /* dst_size */, const ReadbackRequestCallback& callback, - const SkColorType preferred_color_type) { - if (!surface_factory_ || surface_id_.is_null()) - callback.Run(SkBitmap(), READBACK_FAILED); - - scoped_ptr<cc::CopyOutputRequest> request = - cc::CopyOutputRequest::CreateRequest( - base::Bind(&CopyFromCompositingSurfaceHasResult, output_size, - preferred_color_type, callback)); - if (!src_subrect.IsEmpty()) - request->set_area(src_subrect); - - surface_factory_->RequestCopyOfSurface(surface_id_, std::move(request)); + const SkColorType /* preferred_color_type */) { + callback.Run(SkBitmap(), READBACK_FAILED); } void RenderWidgetHostViewChildFrame::CopyFromCompositingSurfaceToVideoFrame( diff --git a/extensions/browser/api/web_contents_capture_client.cc b/extensions/browser/api/capture_web_contents_function.cc index 7a38202..e10842d 100644 --- a/extensions/browser/api/web_contents_capture_client.cc +++ b/extensions/browser/api/capture_web_contents_function.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "extensions/browser/api/web_contents_capture_client.h" +#include "extensions/browser/api/capture_web_contents_function.h" #include "base/base64.h" #include "base/strings/stringprintf.h" @@ -25,16 +25,30 @@ namespace extensions { using api::extension_types::ImageDetails; -bool WebContentsCaptureClient::CaptureAsync( - WebContents* web_contents, - const ImageDetails* image_details, - const content::ReadbackRequestCallback callback) { - if (!web_contents) - return false; +bool CaptureWebContentsFunction::HasPermission() { + return true; +} + +bool CaptureWebContentsFunction::RunAsync() { + EXTENSION_FUNCTION_VALIDATE(args_); + + context_id_ = extension_misc::kCurrentWindowId; + args_->GetInteger(0, &context_id_); + + scoped_ptr<ImageDetails> image_details; + if (args_->GetSize() > 1) { + base::Value* spec = NULL; + EXTENSION_FUNCTION_VALIDATE(args_->Get(1, &spec) && spec); + image_details = ImageDetails::FromValue(*spec); + } if (!IsScreenshotEnabled()) return false; + WebContents* contents = GetWebContentsForID(context_id_); + if (!contents) + return false; + // The default format and quality setting used when encoding jpegs. const api::extension_types::ImageFormat kDefaultFormat = api::extension_types::IMAGE_FORMAT_JPEG; @@ -51,7 +65,7 @@ bool WebContentsCaptureClient::CaptureAsync( } // TODO(miu): Account for fullscreen render widget? http://crbug.com/419878 - RenderWidgetHostView* const view = web_contents->GetRenderWidgetHostView(); + RenderWidgetHostView* const view = contents->GetRenderWidgetHostView(); RenderWidgetHost* const host = view ? view->GetRenderWidgetHost() : nullptr; if (!view || !host) { OnCaptureFailure(FAILURE_REASON_VIEW_INVISIBLE); @@ -70,27 +84,26 @@ bool WebContentsCaptureClient::CaptureAsync( if (scale > 1.0f) bitmap_size = gfx::ScaleToCeiledSize(view_size, scale); - host->CopyFromBackingStore(gfx::Rect(view_size), bitmap_size, callback, - kN32_SkColorType); + host->CopyFromBackingStore( + gfx::Rect(view_size), + bitmap_size, + base::Bind(&CaptureWebContentsFunction::CopyFromBackingStoreComplete, + this), + kN32_SkColorType); return true; } -void WebContentsCaptureClient::CopyFromBackingStoreComplete( +void CaptureWebContentsFunction::CopyFromBackingStoreComplete( const SkBitmap& bitmap, content::ReadbackResponse response) { if (response == content::READBACK_SUCCESS) { OnCaptureSuccess(bitmap); return; } - // TODO(wjmaclean): Improve error reporting. Why aren't we passing more - // information here? OnCaptureFailure(FAILURE_REASON_UNKNOWN); } -// TODO(wjmaclean) can this be static? -bool WebContentsCaptureClient::EncodeBitmap(const SkBitmap& bitmap, - std::string* base64_result) { - DCHECK(base64_result); +void CaptureWebContentsFunction::OnCaptureSuccess(const SkBitmap& bitmap) { std::vector<unsigned char> data; SkAutoLockPixels screen_capture_lock(bitmap); bool encoded = false; @@ -99,8 +112,12 @@ bool WebContentsCaptureClient::EncodeBitmap(const SkBitmap& bitmap, case api::extension_types::IMAGE_FORMAT_JPEG: encoded = gfx::JPEGCodec::Encode( reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)), - gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(), bitmap.height(), - static_cast<int>(bitmap.rowBytes()), image_quality_, &data); + gfx::JPEGCodec::FORMAT_SkBitmap, + bitmap.width(), + bitmap.height(), + static_cast<int>(bitmap.rowBytes()), + image_quality_, + &data); mime_type = kMimeTypeJpeg; break; case api::extension_types::IMAGE_FORMAT_PNG: @@ -114,17 +131,20 @@ bool WebContentsCaptureClient::EncodeBitmap(const SkBitmap& bitmap, NOTREACHED() << "Invalid image format."; } - if (!encoded) - return false; + if (!encoded) { + OnCaptureFailure(FAILURE_REASON_ENCODING_FAILED); + return; + } + std::string base64_result; base::StringPiece stream_as_string(reinterpret_cast<const char*>(data.data()), data.size()); - base::Base64Encode(stream_as_string, base64_result); - base64_result->insert( + base::Base64Encode(stream_as_string, &base64_result); + base64_result.insert( 0, base::StringPrintf("data:%s;base64,", mime_type.c_str())); - - return true; + SetResult(new base::StringValue(base64_result)); + SendResponse(true); } } // namespace extensions diff --git a/extensions/browser/api/web_contents_capture_client.h b/extensions/browser/api/capture_web_contents_function.h index 4107ee4..53f78f7 100644 --- a/extensions/browser/api/web_contents_capture_client.h +++ b/extensions/browser/api/capture_web_contents_function.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef EXTENSIONS_BROWSER_API_WEB_CONTENTS_CAPTURE_CLIENT_H_ -#define EXTENSIONS_BROWSER_API_WEB_CONTENTS_CAPTURE_CLIENT_H_ +#ifndef EXTENSIONS_BROWSER_API_CAPTURE_WEB_CONTENTS_FUNCTION_H_ +#define EXTENSIONS_BROWSER_API_CAPTURE_WEB_CONTENTS_FUNCTION_H_ #include "base/macros.h" #include "content/public/browser/readback_types.h" @@ -18,41 +18,50 @@ class WebContents; namespace extensions { -// Base class for capturing visible area of a WebContents. +// Base class for capturing visibile area of a WebContents. // This is used by both webview.captureVisibleRegion and tabs.captureVisibleTab. -class WebContentsCaptureClient { +class CaptureWebContentsFunction : public AsyncExtensionFunction { public: - WebContentsCaptureClient() {} + CaptureWebContentsFunction() {} protected: - virtual ~WebContentsCaptureClient() {} + ~CaptureWebContentsFunction() override {} + + // ExtensionFunction implementation. + bool HasPermission() override; + bool RunAsync() override; virtual bool IsScreenshotEnabled() = 0; + virtual content::WebContents* GetWebContentsForID(int context_id) = 0; enum FailureReason { FAILURE_REASON_UNKNOWN, FAILURE_REASON_ENCODING_FAILED, FAILURE_REASON_VIEW_INVISIBLE }; - bool CaptureAsync(content::WebContents* web_contents, - const api::extension_types::ImageDetails* image_detail, - const content::ReadbackRequestCallback callback); - bool EncodeBitmap(const SkBitmap& bitmap, std::string* base64_result); virtual void OnCaptureFailure(FailureReason reason) = 0; - virtual void OnCaptureSuccess(const SkBitmap& bitmap) = 0; + + private: + void CopyFromBackingStoreComplete(const SkBitmap& bitmap, content::ReadbackResponse response); + void OnCaptureSuccess(const SkBitmap& bitmap); + + // |context_id_| is the ID used to find the relevant WebContents. In the + // |tabs.captureVisibleTab()| api, this represents the window-id, and in the + // |webview.captureVisibleRegion()| api, this represents the instance-id of + // the guest. + int context_id_; - private: // The format (JPEG vs PNG) of the resulting image. Set in RunAsync(). api::extension_types::ImageFormat image_format_; // Quality setting to use when encoding jpegs. Set in RunAsync(). int image_quality_; - DISALLOW_COPY_AND_ASSIGN(WebContentsCaptureClient); + DISALLOW_COPY_AND_ASSIGN(CaptureWebContentsFunction); }; } // namespace extensions -#endif // EXTENSIONS_BROWSER_API_WEB_CONTENTS_CAPTURE_CLIENT_H_ +#endif // EXTENSIONS_BROWSER_API_CAPTURE_WEB_CONTENTS_FUNCTION_H_ diff --git a/extensions/browser/api/guest_view/extension_view/extension_view_internal_api.h b/extensions/browser/api/guest_view/extension_view/extension_view_internal_api.h index 1899d42..9e77cbd 100644 --- a/extensions/browser/api/guest_view/extension_view/extension_view_internal_api.h +++ b/extensions/browser/api/guest_view/extension_view/extension_view_internal_api.h @@ -6,6 +6,7 @@ #define EXTENSIONS_BROWSER_API_EXTENSION_VIEW_EXTENSION_VIEW_INTERNAL_API_H_ #include "base/macros.h" +#include "extensions/browser/api/capture_web_contents_function.h" #include "extensions/browser/api/execute_code_function.h" #include "extensions/browser/extension_function.h" #include "extensions/browser/guest_view/extension_view/extension_view_guest.h" diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc index 3e3a8ed..bba531d 100644 --- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc +++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc @@ -259,62 +259,6 @@ bool WebViewInternalExtensionFunction::RunAsync() { return RunAsyncSafe(guest); } -bool WebViewInternalCaptureVisibleRegionFunction::RunAsyncSafe( - WebViewGuest* guest) { - using api::extension_types::ImageDetails; - - scoped_ptr<web_view_internal::CaptureVisibleRegion::Params> params( - web_view_internal::CaptureVisibleRegion::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - - scoped_ptr<ImageDetails> image_details; - if (args_->GetSize() > 1) { - base::Value* spec = NULL; - EXTENSION_FUNCTION_VALIDATE(args_->Get(1, &spec) && spec); - image_details = ImageDetails::FromValue(*spec); - } - - return CaptureAsync(guest->web_contents(), image_details.get(), - base::Bind(&WebViewInternalCaptureVisibleRegionFunction:: - CopyFromBackingStoreComplete, - this)); -} -bool WebViewInternalCaptureVisibleRegionFunction::IsScreenshotEnabled() { - // TODO(wjmaclean): Is it ok to always return true here? - return true; -} - -void WebViewInternalCaptureVisibleRegionFunction::OnCaptureSuccess( - const SkBitmap& bitmap) { - std::string base64_result; - if (!EncodeBitmap(bitmap, &base64_result)) { - OnCaptureFailure(FAILURE_REASON_ENCODING_FAILED); - return; - } - - SetResult(new base::StringValue(base64_result)); - SendResponse(true); -} - -void WebViewInternalCaptureVisibleRegionFunction::OnCaptureFailure( - FailureReason reason) { - const char* reason_description = "internal error"; - switch (reason) { - case FAILURE_REASON_UNKNOWN: - reason_description = "unknown error"; - break; - case FAILURE_REASON_ENCODING_FAILED: - reason_description = "encoding failed"; - break; - case FAILURE_REASON_VIEW_INVISIBLE: - reason_description = "view is invisible"; - break; - } - error_ = ErrorUtils::FormatErrorMessage("Failed to capture webview: *", - reason_description); - SendResponse(false); -} - bool WebViewInternalNavigateFunction::RunAsyncSafe(WebViewGuest* guest) { scoped_ptr<web_view_internal::Navigate::Params> params( web_view_internal::Navigate::Params::Create(*args_)); diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.h b/extensions/browser/api/guest_view/web_view/web_view_internal_api.h index 388491e..dcdb828 100644 --- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.h +++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.h @@ -8,8 +8,8 @@ #include <stdint.h> #include "base/macros.h" +#include "extensions/browser/api/capture_web_contents_function.h" #include "extensions/browser/api/execute_code_function.h" -#include "extensions/browser/api/web_contents_capture_client.h" #include "extensions/browser/extension_function.h" #include "extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h" #include "extensions/browser/guest_view/web_view/web_view_guest.h" @@ -37,29 +37,6 @@ class WebViewInternalExtensionFunction : public AsyncExtensionFunction { virtual bool RunAsyncSafe(WebViewGuest* guest) = 0; }; -class WebViewInternalCaptureVisibleRegionFunction - : public WebViewInternalExtensionFunction, - public WebContentsCaptureClient { - public: - DECLARE_EXTENSION_FUNCTION("webViewInternal.captureVisibleRegion", - WEBVIEWINTERNAL_CAPTUREVISIBLEREGION); - WebViewInternalCaptureVisibleRegionFunction() {} - - protected: - ~WebViewInternalCaptureVisibleRegionFunction() override {} - - private: - // WebViewInternalExtensionFunction implementation. - bool RunAsyncSafe(WebViewGuest* guest) override; - - // extensions::WebContentsCaptureClient: - bool IsScreenshotEnabled() override; - void OnCaptureSuccess(const SkBitmap& bitmap) override; - void OnCaptureFailure(FailureReason reason) override; - - DISALLOW_COPY_AND_ASSIGN(WebViewInternalCaptureVisibleRegionFunction); -}; - class WebViewInternalNavigateFunction : public WebViewInternalExtensionFunction { public: diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc index 89bbf05..9896e13 100644 --- a/extensions/browser/guest_view/web_view/web_view_apitest.cc +++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc @@ -736,8 +736,5 @@ IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebViewInsideFrame) { LaunchApp("web_view/inside_iframe"); } -IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestCaptureVisibleRegion) { - RunTest("testCaptureVisibleRegion", "web_view/apitest"); -} } // namespace extensions diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json index 5e07269..b30775f 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json @@ -460,12 +460,6 @@ "chrome://oobe/*" ] }], - "webViewExperimentalInternal": [{ - "internal": true, - "channel": "dev", - "dependencies": ["permission:webview"], - "contexts": ["blessed_extension"] - }], "webViewRequest": [{ "dependencies": ["permission:webview"], "contexts": ["blessed_extension"] diff --git a/extensions/common/api/web_view_internal.json b/extensions/common/api/web_view_internal.json index 94a6eb9..a33f500 100644 --- a/extensions/common/api/web_view_internal.json +++ b/extensions/common/api/web_view_internal.json @@ -670,33 +670,6 @@ ] }, { - "name": "captureVisibleRegion", - "type": "function", - "description": "foo", - "parameters": [ - { - "type": "integer", - "name": "instanceId", - "description": "The instance ID of the guest <webview> process." - }, - { - "$ref": "extensionTypes.ImageDetails", - "name": "options", - "optional": true - }, - { - "type": "function", - "name": "callback", - "parameters": [ - {"type": "string", - "name": "dataUrl", - "description": "A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display." - } - ] - } - ] - }, - { "name": "clearData", "type": "function", "description": "Clears various types of browsing data stored in a storage partition of a <webview>.", diff --git a/extensions/extensions.gypi b/extensions/extensions.gypi index 8a0fb29..27b1033 100644 --- a/extensions/extensions.gypi +++ b/extensions/extensions.gypi @@ -273,6 +273,8 @@ 'browser/api/bluetooth_socket/bluetooth_socket_api.h', 'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc', 'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h', + 'browser/api/capture_web_contents_function.cc', + 'browser/api/capture_web_contents_function.h', 'browser/api/cast_channel/cast_auth_ica.cc', 'browser/api/cast_channel/cast_auth_ica.h', 'browser/api/cast_channel/cast_auth_util.cc', @@ -489,8 +491,6 @@ 'browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h', 'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc', 'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h', - 'browser/api/web_contents_capture_client.cc', - 'browser/api/web_contents_capture_client.h', 'browser/api/web_request/form_data_parser.cc', 'browser/api/web_request/form_data_parser.h', 'browser/api/web_request/upload_data_presenter.cc', diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index bdfa298..7ec76ad 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -644,8 +644,6 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() { resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS)); resources.push_back(std::make_pair("webViewInternal", IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS)); - resources.push_back(std::make_pair("webViewExperimental", - IDR_WEB_VIEW_EXPERIMENTAL_JS)); if (content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) { resources.push_back(std::make_pair("webViewIframe", IDR_WEB_VIEW_IFRAME_JS)); @@ -1599,10 +1597,6 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) { module_system->Require("webView"); module_system->Require("webViewApiMethods"); module_system->Require("webViewAttributes"); - if (context->GetAvailability("webViewExperimentalInternal") - .is_available()) { - module_system->Require("webViewExperimental"); - } if (content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) { module_system->Require("webViewIframe"); diff --git a/extensions/renderer/resources/extensions_renderer_resources.grd b/extensions/renderer/resources/extensions_renderer_resources.grd index b4f5dad..bad8e29 100644 --- a/extensions/renderer/resources/extensions_renderer_resources.grd +++ b/extensions/renderer/resources/extensions_renderer_resources.grd @@ -61,7 +61,6 @@ <include name="IDR_WEB_VIEW_ATTRIBUTES_JS" file="guest_view/web_view/web_view_attributes.js" type="BINDATA" /> <include name="IDR_WEB_VIEW_CONSTANTS_JS" file="guest_view/web_view/web_view_constants.js" type="BINDATA" /> <include name="IDR_WEB_VIEW_EVENTS_JS" file="guest_view/web_view/web_view_events.js" type="BINDATA" /> - <include name="IDR_WEB_VIEW_EXPERIMENTAL_JS" file="guest_view/web_view/web_view_experimental.js" type="BINDATA" /> <include name="IDR_WEB_VIEW_IFRAME_JS" file="guest_view/web_view/web_view_iframe.js" type="BINDATA" /> <include name="IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS" file="guest_view/web_view/web_view_internal.js" type="BINDATA" /> <include name="IDR_WEB_VIEW_JS" file="guest_view/web_view/web_view.js" type="BINDATA" /> diff --git a/extensions/renderer/resources/guest_view/web_view/web_view.js b/extensions/renderer/resources/guest_view/web_view/web_view.js index d55249f..6dd4fae 100644 --- a/extensions/renderer/resources/guest_view/web_view/web_view.js +++ b/extensions/renderer/resources/guest_view/web_view/web_view.js @@ -31,11 +31,6 @@ WebViewImpl.setupElement = function(proto) { // Public-facing API methods. var apiMethods = WebViewImpl.getApiMethods(); - // Add the experimental API methods, if available. - var experimentalApiMethods = - WebViewImpl.maybeGetExperimentalApiMethods(); - apiMethods = $Array.concat(apiMethods, experimentalApiMethods); - // Create default implementations for undefined API methods. var createDefaultApiMethod = function(m) { return function(var_args) { @@ -225,9 +220,6 @@ WebViewImpl.prototype.makeElementFullscreen = function() { // Implemented when the ChromeWebView API is available. WebViewImpl.prototype.maybeSetupContextMenus = function() {}; -// Implemented when the experimental WebView API is available. -WebViewImpl.maybeGetExperimentalApiMethods = function() { return []; }; - GuestViewContainer.registerElement(WebViewImpl); // Exports. diff --git a/extensions/renderer/resources/guest_view/web_view/web_view_experimental.js b/extensions/renderer/resources/guest_view/web_view/web_view_experimental.js deleted file mode 100644 index 96331df..0000000 --- a/extensions/renderer/resources/guest_view/web_view/web_view_experimental.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This module implements experimental API for <webview>. -// See web_view.js and web_view_api_methods.js for details. -// -// <webview> Experimental API is only available on canary and channels of -// Chrome. - -var WebViewImpl = require('webView').WebViewImpl; -var WebViewInternal = require('webViewInternal').WebViewInternal; - -// An array of <webview>'s experimental API methods. See |WEB_VIEW_API_METHODS| -// in web_view_api_methods.js for more details. -var WEB_VIEW_EXPERIMENTAL_API_METHODS = [ - // Captures the visible region of the WebView contents into a bitmap. - 'captureVisibleRegion' -]; - -// Registers the experimantal WebVIew API when available. -WebViewImpl.maybeGetExperimentalApiMethods = function() { - return WEB_VIEW_EXPERIMENTAL_API_METHODS; -}; diff --git a/extensions/test/data/web_view/apitest/main.js b/extensions/test/data/web_view/apitest/main.js index b203025..983212c 100644 --- a/extensions/test/data/web_view/apitest/main.js +++ b/extensions/test/data/web_view/apitest/main.js @@ -1685,28 +1685,6 @@ function testWebRequestAPIGoogleProperty() { document.body.appendChild(webview); } -// This is a basic test to verify that image data is returned by -// captureVisibleRegion(). -function testCaptureVisibleRegion() { - var webview = document.createElement('webview'); - webview.setAttribute('src', 'data:text/html,webview test'); - - webview.addEventListener('loadstop', function(e) { - webview.captureVisibleRegion({}, function(imgdata) { - if (chrome.runtime.lastError) { - console.log('webview.apitest.testCaptureVisibleRegion: ' + - chrome.runtime.lastError.message); - embedder.test.fail(); - } else { - embedder.test.assertTrue( - imgdata.indexOf('data:image/jpeg;base64') == 0); - embedder.test.succeed(); - } - }); - }); - document.body.appendChild(webview); -} - // Tests end. embedder.test.testList = { @@ -1774,8 +1752,7 @@ embedder.test.testList = { 'testWebRequestAPI': testWebRequestAPI, 'testWebRequestAPIWithHeaders': testWebRequestAPIWithHeaders, 'testWebRequestAPIExistence': testWebRequestAPIExistence, - 'testWebRequestAPIGoogleProperty': testWebRequestAPIGoogleProperty, - 'testCaptureVisibleRegion' : testCaptureVisibleRegion + 'testWebRequestAPIGoogleProperty': testWebRequestAPIGoogleProperty }; onload = function() { |