Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Issue 1377723005: Revert of permissions: add layout tests for multiple requests (Closed)

Created:
5 years, 2 months ago by dmurph
Modified:
5 years, 2 months ago
CC:
blink-reviews, chromium-reviews, mlamouri+watch-blink_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of permissions: add layout tests for multiple requests (patchset #2 id:20001 of https://codereview.chromium.org/1381023003/ ) Reason for revert: BUG=538717 https://code.google.com/p/chromium/issues/detail?id=538717 Original issue's description: > permissions: add layout tests for multiple requests > > No permisisons, single, multiple and duplicate permissions > are all tested. Permission updates being reflected in the request > is also tested. > > BUG=516626 > > Committed: https://crrev.com/4a5a84a2a326cecc6d183478ca684aea753adc18 > Cr-Commit-Position: refs/heads/master@{#352015} TBR=mlamouri@chromium.org,lalitm@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=516626

Patch Set 1 #

Messages

Total messages: 5 (2 generated)
dmurph
Created Revert of permissions: add layout tests for multiple requests
5 years, 2 months ago (2015-10-02 19:04:37 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1377723005/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1377723005/1
5 years, 2 months ago (2015-10-02 19:05:11 UTC) #2
commit-bot: I haz the power
5 years, 2 months ago (2015-10-02 19:07:01 UTC) #4
Failed to apply patch for
third_party/WebKit/Source/modules/permissions/Permissions.cpp:
While running git apply --index -3 -p1;
  error: patch failed:
third_party/WebKit/Source/modules/permissions/Permissions.cpp:160
  Falling back to three-way merge...
  Applied patch to
'third_party/WebKit/Source/modules/permissions/Permissions.cpp' with conflicts.
  U third_party/WebKit/Source/modules/permissions/Permissions.cpp

Patch:       third_party/WebKit/Source/modules/permissions/Permissions.cpp
Index: third_party/WebKit/Source/modules/permissions/Permissions.cpp
diff --git a/third_party/WebKit/Source/modules/permissions/Permissions.cpp
b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
index
1e6acc2955aa3b4d4b2b90709071b412f07f32df..bd4029f2dd1cdca36636a84dfad180516d561838
100644
--- a/third_party/WebKit/Source/modules/permissions/Permissions.cpp
+++ b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
@@ -160,8 +160,7 @@
     ScriptPromiseResolver* resolver =
ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
-    WebVector<WebPermissionType> permissionsCopy = *permissions;
-    client->requestPermissions(permissionsCopy, KURL(KURL(),
scriptState->executionContext()->securityOrigin()->toString()), new
PermissionsCallback(resolver, permissions.release()));
+    client->requestPermissions(*permissions, KURL(KURL(),
scriptState->executionContext()->securityOrigin()->toString()), new
PermissionsCallback(resolver, permissions.release()));
     return promise;
 }

Powered by Google App Engine
This is Rietveld 408576698