Skip to content

GitLab

T
tangled
Switch branch/tag
  1. 24 Feb, 2015 6 commits
    • stanisc's avatar
      Use external ID to match native model nodes during bookmark association. · 8fab3e60
      stanisc authored 
      This is a resubmit of https://codereview.chromium.org/904083002
which was reverted due to an unrelated flaky test. There are no
changes compared to the original patch, hence skipping the code
review (zea@ was the original reviewer).

Original patch description:

The fix improves matching of nodes in BookmarkModelAssociator in
situations where there are multiple bookmarks or folders with the
same titles or URLs.
This will address one particular scenario leading to bookmark
duplication (see crbug.com/118105).

1) In BookmarkModelAssociator::BuildAssociations, when there are
multiple native model nodes with matching title / URL, a secondary
match on external ID is used to pick a preferred one; otherwise
the first matching node is returned.
The preferred match on external ID should be applicable in most
situations except when the native model has been rebuilt from scratch.
Picking a wrong folder during the association process results in
duplicating the entire subtree within the wrong folder. This issue
should be addressed now.
2) In BookmarkModelAssociator::ApplyDeletesFromSyncJournal the external
ID match is now the primary criteria for selecting a native model
node to be deleted. The previous implementation would pick an arbitrary
native model node based on just the title / URL match anywhere in the
node hierarchy. That would happen every time after deleting a bookmark
or folder and recreating it in another place.
Since external IDs might be reused, there is a secondary match on
title and URL to ensure that the right node gets deleted. To avoid
costly O(N*M) algorithm (where N is number of bookmarks and M is
number of entries in delete journal), the implementation uses a set
of external IDs to reduce the cost to O(N*logM).

BUG=456228
TBR=zea@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#317688}
      8fab3e60
    • dnicoara's avatar
      [Ozone-Dri] Gracefully handle DRM devices with no resources · 3b2bde2e
      dnicoara authored 
      DRM devices such as VGEM do not have resources, so we want to ignore
them rather than crash.

BUG=460982

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

Cr-Commit-Position: refs/heads/master@{#317687}
      3b2bde2e
    • scottmg's avatar
      Revert of ui: Add another presubmit check to catch two more scoped_ptr usages.... · 511f02da
      scottmg authored 
      Revert of ui: Add another presubmit check to catch two more scoped_ptr usages. (patchset #6 id:100001 of https://codereview.chromium.org/919253002/)

Reason for revert:
Presubmit in ui/ failing with

...
File "<string>", line 38, in CheckScopedPtr
NameError: global name 're' is not defined

Original issue's description:
> ui: Add another presubmit check to catch two more scoped_ptr usages.
>
> This should catch the following usages:
>
> 1- return scoped_ptr<T>(foo)
> 2- bar = scoped_ptr<T>(foo)
>
> And recommend the solo usage of make_scoped_ptr().
>
> The entries were found with the following command line:
>
> $ git grep -E '(=|\breturn)\s*scoped_ptr<.*?>([^)]+)'
>
> BUG=None
> TEST=g cl presubmit -uv
> R=sky@chromium.org,maruel@chromium.org
>
> Committed: https://crrev.com/63f25bef305bd8143766e2e1a98bf01548c78376
> Cr-Commit-Position: refs/heads/master@{#317669}

TBR=maruel@chromium.org,sky@chromium.org,maruel@google.com,sadrul@chromium.org,tfarina@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None

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

Cr-Commit-Position: refs/heads/master@{#317686}
      511f02da
    • pkasting's avatar
      Minor infobar cleanup. · bdbf3b18
      pkasting authored 
      * Stop calling GetIconID() as a proxy for having RTTI to detect
  ThreeDAPIInfoBarDelegates.  Just add a downcast function.
* Slightly more reasonable base class function order.
* Fix declaration/definition orders to match base class (and each other) in
  other instances where it was noticeably wrong.
* Keep infobar code consistent about not inlining method definitions in class
  declarations, and making overridden functions private unless otherwise
  necessary.

BUG=none
TEST=none

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

Cr-Commit-Position: refs/heads/master@{#317685}
      bdbf3b18
    • dpranke's avatar
      Roll PDFium · a2592d89
      dpranke authored 
      This brings in:

28ddd48  Replace second set of #defines with templates in JS_Define.h
94dd28e  Update GN build files w/ cpu_arch -> current_cpu changes.
dce5730  Add test for PDF's JS "global".
a96cc9b  Replace ugly JS_Define macros with templates.
2da7bd4  Tidy up JS_Defines.h
7435e8e  Run pixel tests via automated script.
83c87e5  run_javascript_tests.py: Be more flexible about directory layout.

TBR=jam@chromium.org, tsepez@chromium.org
BUG=344767

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

Cr-Commit-Position: refs/heads/master@{#317684}
      a2592d89
    • gunsch's avatar
      Chromecast: disables wifi-based features on ATV. · dc466675
      gunsch authored 
      R=lcwu@chromium.org,byungchul@chromium.org
BUG=internal b/18934906

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

Cr-Commit-Position: refs/heads/master@{#317683}
      dc466675
  3. 23 Feb, 2015 34 commits