GitLab

This CL supplies the necessary changes to CC to support the
inner/outer viewport model for pinch-zoom and fixed-position
elements. The specification for these changes is contained in
the document "Layer-based Solution for Pinch Zoom / Fixed
Position".

It incorporates a change to how scrollbar parameters are
computed (removes the notion of max_scroll_offset as a
quantity set be the embedder, and instead inferred from the
relative sizes of a clip layer w.r.t. the scroll layer).

Scrollbars are generalized so that a layer may have more than
two scrollbars, and the parameters of the scrollbar are set
w.r.t. the sizes and positions of a clip and a scroll layer.
Further, changes to the scrip/scroll layer automatically
notify any attached scrollbars.

The CL also removes existing references to root_scroll_layer
from LTH, LTI and LTHI and replaces them with either
Inner/OuterViewportScrollLayer (dual-layer operation only
exists at present if the --enable-pinch-virtual-viewport flag
is specified, otherwise behavior is unchanged).

Logic is added to (i) combine scroll offsets for the two
viewports before passing it to the embedder, and (ii)
splitting any offsets received from the embedder
appropriately between the two viewports.

This CL relies on https://codereview.chromium.org/138453004/
for changes in Blink to support it.

BUG=148816

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246812

R=aelias@chromium.org, enne@chromium.org, joi@chromium.org, piman@chromium.org, sky@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247684 0039d316-1c4b-4281-b951-d872f2087c98

utils.expose now accepts a third parameter (readonly properties).

BUG=324859

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247683 0039d316-1c4b-4281-b951-d872f2087c98

Revert of Unify desktop and Android tab helper instantiation. (https://codereview.chromium.org/144443003/)

Reason for revert:
This causes Clank to crash at startup, and makes tests fail http://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/11575

Tried the revert locally, and Clank started normally.

Original issue's description:
> Unify desktop and Android tab helper instantiation.
> 
> BUG=337600
> TEST=zero visible change
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247676

TBR=yfriedman@chromium.org,jam@chromium.org,avi@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=337600

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247682 0039d316-1c4b-4281-b951-d872f2087c98

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247680 0039d316-1c4b-4281-b951-d872f2087c98

BUG=331712
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247678 0039d316-1c4b-4281-b951-d872f2087c98

BUG=325685
R=pliard@chromium.org, bulach@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247677 0039d316-1c4b-4281-b951-d872f2087c98

BUG=337600
TEST=zero visible change

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247676 0039d316-1c4b-4281-b951-d872f2087c98

Adds the Readability CSS and also makes the DOM Distiller viewer load it.

BUG=319881

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247675 0039d316-1c4b-4281-b951-d872f2087c98

We have quite a few number (12) of files for providing interfaces
to FileSystem API. They can be clearly separated from other
files under drive/.

BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247674 0039d316-1c4b-4281-b951-d872f2087c98

Also works with unprefixed reports.

BUG=325685
R=glider@chromium.org, bulach@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247673 0039d316-1c4b-4281-b951-d872f2087c98

BUG=263749,325685
TEST=cc_unittests on ASan/Android bot
R=glider@chromium.org, thakis@chromium.org, bulach@chromium.org, navabi@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247670 0039d316-1c4b-4281-b951-d872f2087c98

Revert of Revert of Revert of Remove threading from RendererGpuVideoAcceleratorFactories (https://codereview.chromium.org/135393004/)

Reason for revert:
It turned out the reverting the patchset was effective after all, so I am reverting the revert of the revert.

Original issue's description:
> Revert of Revert of Remove threading from RendererGpuVideoAcceleratorFactories (https://codereview.chromium.org/145103004/)
> 
> Reason for revert:
> Reverting the revert as it did not fix the failures.
> 
> Original issue's description:
> > Revert of Remove threading from RendererGpuVideoAcceleratorFactories (https://codereview.chromium.org/27420004/)
> > 
> > Reason for revert:
> > Sorry, it looks like you broke the Win 7 Tests (dbg)(2) bot. http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%282%29/builds/19785
> > 
> > Original issue's description:
> > > This change removes all the threading considerations from
> > > GpuVideoAcceleratorFactories (and its implementation,
> > > RendererGpuVideoAcceleratorFactories).  Most notably, it removes Abort() and
> > > associated functions and state.  And with the removal of Abort() and friends,
> > > we can also remove its Clone() interface.
> > > 
> > > All of the previously abortable operations on the RGVAF (with the exception of
> > > ReadPixels()) can be made non-abortable, with no functional difference, due to
> > > the way the users of RGVAF function.  These three users are
> > > WebMediaPlayerImpl/GpuVideoDecoder, RTCVideoDecoder, and RTCVideoEncoder, and
> > > they can be made non-abortable because:
> > > 
> > > WebMediaPlayerImpl/GpuVideoDecoder:
> > > * Abort() is called from WebMediaPlayerImpl::Destroy().  It has no effect, as:
> > >   * All the RGVAF entry points are called from the the RGVAF message loop
> > >     from GpuVideoDecoder (except for ReadPixels()), so the Abort() has no
> > >     effect on them.
> > > 
> > > RTCVideoDecoder:
> > > * Abort() is called from RTCVideoDecoder::WillDestroyCurrentMessageLoop() for
> > >   the RGVAF message loop.  It has no effect, as:
> > >   * Amost all the RGVAF entry points are called from the RGVAF message loop
> > >     (except for ReadPixels()), so Abort() has no effect on them.
> > >   * The other exception is CreateVideoDecodeAccelerator(), which is called from
> > >     RTC's main thread.  But as the Abort() is called from
> > >     WillDestroyCurrentMessageLoop() for the RGVAF message loop itself, it is
> > >     guaranteed to occur after any tasks posted to the RGVAF message loop by
> > >     CreateVideoDecodeAccelerator() has completed, and so the Abort() has no
> > >     effect.
> > > 
> > > RTCVideoEncoder:
> > > * Abort() is called from RTCVideoDecoder::Release().  It has no effect, as:
> > >   * All the RGVAF entry points are called from the RGVAF message loop.
> > > 
> > > The only functional difference remaining is that making ReadPixels()
> > > non-abortable.  This is preferable, as as long as a completed video accelerator
> > > texture is available, it should be readable.  We also specify that all calls to
> > > ReadPixels must be made on the RGVAF message loop, like all other entry points,
> > > and leave it up to the users of ReadPixels() to handle thread trampolining if
> > > necessary.
> > > 
> > > BUG=306333
> > > TEST=local build, run on CrOS snow; build, run unittests on desktop Linux
> > > 
> > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247480
> > 
> > TBR=fischman@chromium.org,wuchengli@chromium.org,jamesr@chromium.org,jam@chromium.org,hshi@chromium.org,sheu@chromium.org
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=306333
> > 
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247655
> 
> TBR=fischman@chromium.org,wuchengli@chromium.org,jamesr@chromium.org,jam@chromium.org,hshi@chromium.org,sheu@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=306333
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247662

TBR=fischman@chromium.org,wuchengli@chromium.org,jamesr@chromium.org,jam@chromium.org,hshi@chromium.org,sheu@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=306333

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247669 0039d316-1c4b-4281-b951-d872f2087c98

BUG=316568
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247668 0039d316-1c4b-4281-b951-d872f2087c98

Take 2 on insets.

BUG=333499
TEST=none
R=sadrul@chromium.org
TBR=sadrul@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247667 0039d316-1c4b-4281-b951-d872f2087c98

- Remove unused #include's.
- Remove obsolete comments.
- Prefer not to access error_ protected member directly.

BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247666 0039d316-1c4b-4281-b951-d872f2087c98

Introduce MidiManagerUsb, a MIDIManager subclass for USB-MIDI.
Android port will use this class.

BUG=303596
R=toyoshim@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247665 0039d316-1c4b-4281-b951-d872f2087c98

Callbacks notify when the parser starts, and finishes handling
a SPDY headers block. No other changes (new methods not in use).

This lands server change 59261835 by ygi.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247664 0039d316-1c4b-4281-b951-d872f2087c98

The transitionType "start_page" is out of date, replace it with
"auto_toplevel"

BUG=333878

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247663 0039d316-1c4b-4281-b951-d872f2087c98

Revert of Revert of Remove threading from RendererGpuVideoAcceleratorFactories (https://codereview.chromium.org/145103004/)

Reason for revert:
Reverting the revert as it did not fix the failures.

Original issue's description:
> Revert of Remove threading from RendererGpuVideoAcceleratorFactories (https://codereview.chromium.org/27420004/)
> 
> Reason for revert:
> Sorry, it looks like you broke the Win 7 Tests (dbg)(2) bot. http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%282%29/builds/19785
> 
> Original issue's description:
> > This change removes all the threading considerations from
> > GpuVideoAcceleratorFactories (and its implementation,
> > RendererGpuVideoAcceleratorFactories).  Most notably, it removes Abort() and
> > associated functions and state.  And with the removal of Abort() and friends,
> > we can also remove its Clone() interface.
> > 
> > All of the previously abortable operations on the RGVAF (with the exception of
> > ReadPixels()) can be made non-abortable, with no functional difference, due to
> > the way the users of RGVAF function.  These three users are
> > WebMediaPlayerImpl/GpuVideoDecoder, RTCVideoDecoder, and RTCVideoEncoder, and
> > they can be made non-abortable because:
> > 
> > WebMediaPlayerImpl/GpuVideoDecoder:
> > * Abort() is called from WebMediaPlayerImpl::Destroy().  It has no effect, as:
> >   * All the RGVAF entry points are called from the the RGVAF message loop
> >     from GpuVideoDecoder (except for ReadPixels()), so the Abort() has no
> >     effect on them.
> > 
> > RTCVideoDecoder:
> > * Abort() is called from RTCVideoDecoder::WillDestroyCurrentMessageLoop() for
> >   the RGVAF message loop.  It has no effect, as:
> >   * Amost all the RGVAF entry points are called from the RGVAF message loop
> >     (except for ReadPixels()), so Abort() has no effect on them.
> >   * The other exception is CreateVideoDecodeAccelerator(), which is called from
> >     RTC's main thread.  But as the Abort() is called from
> >     WillDestroyCurrentMessageLoop() for the RGVAF message loop itself, it is
> >     guaranteed to occur after any tasks posted to the RGVAF message loop by
> >     CreateVideoDecodeAccelerator() has completed, and so the Abort() has no
> >     effect.
> > 
> > RTCVideoEncoder:
> > * Abort() is called from RTCVideoDecoder::Release().  It has no effect, as:
> >   * All the RGVAF entry points are called from the RGVAF message loop.
> > 
> > The only functional difference remaining is that making ReadPixels()
> > non-abortable.  This is preferable, as as long as a completed video accelerator
> > texture is available, it should be readable.  We also specify that all calls to
> > ReadPixels must be made on the RGVAF message loop, like all other entry points,
> > and leave it up to the users of ReadPixels() to handle thread trampolining if
> > necessary.
> > 
> > BUG=306333
> > TEST=local build, run on CrOS snow; build, run unittests on desktop Linux
> > 
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247480
> 
> TBR=fischman@chromium.org,wuchengli@chromium.org,jamesr@chromium.org,jam@chromium.org,hshi@chromium.org,sheu@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=306333
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247655

TBR=fischman@chromium.org,wuchengli@chromium.org,jamesr@chromium.org,jam@chromium.org,hshi@chromium.org,sheu@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=306333

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247662 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247661 0039d316-1c4b-4281-b951-d872f2087c98

Add UploadNewFileOptions argument to JobScheduler::UploadNewFile().
Pass ChangeListLoader* to SyncClient and EntryUpdatePerformer to lock the loader while creating new files.
Upload an empty file if the locally created file doesn't have a cache file.

BUG=260539
TEST=unit_tests
R=kinaba@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247660 0039d316-1c4b-4281-b951-d872f2087c98

Based on infrastructure in http://crrev.com/54323003

BUG=330255

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247659 0039d316-1c4b-4281-b951-d872f2087c98

Chrome for Android does not use Download Menu so it should not
include strings for it.

BUG=326023

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247658 0039d316-1c4b-4281-b951-d872f2087c98

I contend we probably don't want to ship gtest?

R=jschuh@chromium.org
BUG=329384

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247657 0039d316-1c4b-4281-b951-d872f2087c98

The corner is shown when there is both a vertical and horizontal
scrollbar. We need this as we want to draw the corner differently (a
different color) for win-aura now.

BUG=333499
TEST=none
R=ben@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247656 0039d316-1c4b-4281-b951-d872f2087c98

Revert of Remove threading from RendererGpuVideoAcceleratorFactories (https://codereview.chromium.org/27420004/)

Reason for revert:
Sorry, it looks like you broke the Win 7 Tests (dbg)(2) bot. http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%282%29/builds/19785

Original issue's description:
> This change removes all the threading considerations from
> GpuVideoAcceleratorFactories (and its implementation,
> RendererGpuVideoAcceleratorFactories).  Most notably, it removes Abort() and
> associated functions and state.  And with the removal of Abort() and friends,
> we can also remove its Clone() interface.
> 
> All of the previously abortable operations on the RGVAF (with the exception of
> ReadPixels()) can be made non-abortable, with no functional difference, due to
> the way the users of RGVAF function.  These three users are
> WebMediaPlayerImpl/GpuVideoDecoder, RTCVideoDecoder, and RTCVideoEncoder, and
> they can be made non-abortable because:
> 
> WebMediaPlayerImpl/GpuVideoDecoder:
> * Abort() is called from WebMediaPlayerImpl::Destroy().  It has no effect, as:
>   * All the RGVAF entry points are called from the the RGVAF message loop
>     from GpuVideoDecoder (except for ReadPixels()), so the Abort() has no
>     effect on them.
> 
> RTCVideoDecoder:
> * Abort() is called from RTCVideoDecoder::WillDestroyCurrentMessageLoop() for
>   the RGVAF message loop.  It has no effect, as:
>   * Amost all the RGVAF entry points are called from the RGVAF message loop
>     (except for ReadPixels()), so Abort() has no effect on them.
>   * The other exception is CreateVideoDecodeAccelerator(), which is called from
>     RTC's main thread.  But as the Abort() is called from
>     WillDestroyCurrentMessageLoop() for the RGVAF message loop itself, it is
>     guaranteed to occur after any tasks posted to the RGVAF message loop by
>     CreateVideoDecodeAccelerator() has completed, and so the Abort() has no
>     effect.
> 
> RTCVideoEncoder:
> * Abort() is called from RTCVideoDecoder::Release().  It has no effect, as:
>   * All the RGVAF entry points are called from the RGVAF message loop.
> 
> The only functional difference remaining is that making ReadPixels()
> non-abortable.  This is preferable, as as long as a completed video accelerator
> texture is available, it should be readable.  We also specify that all calls to
> ReadPixels must be made on the RGVAF message loop, like all other entry points,
> and leave it up to the users of ReadPixels() to handle thread trampolining if
> necessary.
> 
> BUG=306333
> TEST=local build, run on CrOS snow; build, run unittests on desktop Linux
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247480

TBR=fischman@chromium.org,wuchengli@chromium.org,jamesr@chromium.org,jam@chromium.org,hshi@chromium.org,sheu@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=306333

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247655 0039d316-1c4b-4281-b951-d872f2087c98

Was another workaround for escaping arguments, no longer needed in
ninja-only world.

R=thakis@chromium.org
BUG=123026
TEST=ninja -C out\Debug mini_installer

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247650 0039d316-1c4b-4281-b951-d872f2087c98

The crash in the bug seems to occur when 2 stacked panels are being removed
in a very short peirod of time. When 1st panel is being removed, other stacked
panels could be queued for update. If 2nd panel, that is in this update list,
is then removed, it should be removed from the update list.

This only occurs on Mac. Windows does not have the problem due to the similar
logic. Linux GTK does not either due to that the update will be performed
immediately.

BUG=336582

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247648 0039d316-1c4b-4281-b951-d872f2087c98

Started by trying remove use of atlbase.h in native_control,
but since it's unused, just delete it all and a few places
where it was referenced in !USE_AURA blocks.

R=sky@chromium.org
BUG=5027,330735

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247647 0039d316-1c4b-4281-b951-d872f2087c98

BUG=none
R=satorux@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247646 0039d316-1c4b-4281-b951-d872f2087c98

Adds support in the content::URLDataSource for DOM Distiller for displaying
distilled articles.

Also adds preliminary error handling.

Depends on https://codereview.chromium.org/105723002/

BUG=319881

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247645 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247639 0039d316-1c4b-4281-b951-d872f2087c98

r1843: Xcode: Add .xcassets = folder.assetcatalog in extension_map
r1844: Eclipse generator now uses compiler's default include dirs
r1845: Quell warnings for exclusion list dictionaries in MSVS generator
r1846: Ninja generator: support using clang-cl for Windows

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247638 0039d316-1c4b-4281-b951-d872f2087c98

Started by trying to remove only atlbase.h, but atlcrack.h (WTL)
uses CPoint/CSize, etc from ATL. So, msg_util.h is atlcrack.h,
but adapted to use gfx types, and with CR_ prefix on crack macros
for now.

R=ben@chromium.org
BUG=5027, 323300

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247637 0039d316-1c4b-4281-b951-d872f2087c98

Ozone uses clipboard_aura and DChecks in WriteObjects with type
CLIPBOARD_TYPE_SELECTION fail here as this is defined only for X11 
platform. This CL replaces the current platform checks(X11) with 
checks this shouldn't be defined on.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247635 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247634 0039d316-1c4b-4281-b951-d872f2087c98

Use in-memory LevelDB in tests that don't test LevelDB behavior itself.

BUG=331988
R=kinuko@chromium.org, nhiroki@chromium.org, sky@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247631 0039d316-1c4b-4281-b951-d872f2087c98

This CL changes the transparent background of icons generated by the "Create app
from this website" button into solid white.

BUG=315632

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247629 0039d316-1c4b-4281-b951-d872f2087c98

1. Modify OnBoundsChanged() to unconditionally call SetSize() to propagate all aura::Window size changes (e.g., due to container layout) to the renderer.  There are already re-entrancy and redundancy guards in place, making this safe/sane.

2. Apply coordinate conversion for mouse events propagated to the parent->delegate.  This was previously overlooked because it was assumed WebContentsViewAura was the only parent->delegate, and WCVA does not do anything with mouse coordinates.

BUG=256870

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247628 0039d316-1c4b-4281-b951-d872f2087c98

If Send() fails in SendOrDrop(), then |message| will have been deleted,
but SendOrDrop() will still try to access its header fields.

Fixed.

BUG=338354
TEST=content_unittests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247627 0039d316-1c4b-4281-b951-d872f2087c98