Commit Graph

52 Commits

Author SHA1 Message Date
reed
f0b1710bdb fix some bit-rot in the ios port of sampleapp
BUG=skia:

Review URL: https://codereview.chromium.org/637263004
2014-10-22 13:06:00 -07:00
caryclark
17f0b6df72 share dm and command flags
Share command flags between dm and unit tests.
Also, allow dm's core to be included by itself and iOSShell.

Command line flags that are the same (or nearly the same) in DM
and in skia_tests have been moved to common_flags. Authors,
please check to see that the shared common flag is correct for
the tool.

For iOS, the 'tool_main' entry point has a wrapper to allow multiple
tools to be statically linked in the iOSShell.
Since SkCommandLineFlags::Parse can only be called once, these calls
are disabled in the IOS build.

Since the iOS app directory is dynamically assigned a name, use '@' to
select it. (This is the same convention chosen by the Mobile Harness
iOS file system utilities.)

Move the heart of dm.gyp into dm.gypi so that it can be included by
itself and iOSShell.gyp.

Add tools/flags/SkCommonFlags.* to define and declare common
command line flags.

Add support for dm to iOSShell.

BUG=skia:
R=scroggo@google.com, mtklein@google.com, jvanverth@google.com, bsalomon@google.com

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/389653004
2014-07-22 10:15:35 -07:00
caryclark
936b73424f ios fixes
skia_ios.mm
Get the app's Documents directory and pass use it to set the resource path.
This is a quick hack which will be replaced by a new application that is
a tiny shim around a command line tool.

SkImageEncoder.h
SkForceLinking.cpp
SkImageDecoder_CG.cpp
Add support for FORCE_LINKING so iOS sees the PNG encoder and others.

SkFloatBits.cpp
SkPoint.cpp
Handle denormalized numbers that are floored by the iOS ARM processor.

SkImageDecoder_iOS.mm
Remove empty encoder factory.

SkTouchGesture.cpp
Return early on empty state on touch rather than aborting (crashing)

JpegTest.cpp
Hal via stackoverflow.com says partial jpegs can be gray as well.

skia_test.cpp
Remove crash handler call for now to avoid link failure.

OverwriteLine.h
Remove fancy line overwrite for iOS.

Resources.cpp
Add interface to set resource directory based on runtime query.

BUG=skia:2736 skia:2737 skia:2738
R=reed@google.com, halcanary@google.com, mtklein@google.com, tfarina@chromium.org

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/373383003
2014-07-11 12:14:51 -07:00
jvanverth
66c9582d1b Fix a number of issues with iOS build.
Set pointer to root view in window (for SampleApp)
Set up the correct function pointer for GL multisampling
Remove use of SkBitmap::setConfig()
Remove incomplete iOS implementation of SkFILE (use SkOSFile for now)

R=caryclark@google.com, reed@google.com, bsalomon@google.com, tfarina@chromium.org

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/322403007
2014-06-11 13:59:22 -07:00
commit-bot@chromium.org
28fcae2ec7 Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/)
Reason for revert:
Want to reland the original CL.

Original issue's description:
> Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
>
> Reason for revert:
> breaking the Chrome deps roll.
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
>
> Original issue's description:
> > Rename kPMColor_SkColorType to kN32_SkColorType.
> >
> > The new name better represents what this flag means.
> >
> > BUG=skia:2384
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14117
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144

R=reed@google.com, bensong@google.com
TBR=bensong@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14156 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-11 17:15:40 +00:00
commit-bot@chromium.org
96edc24598 Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
Chrome's side of define changes not easy to figure out quickly. Reverting this for DEPS roll for now.

Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14149 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-11 13:47:30 +00:00
commit-bot@chromium.org
d923288e50 Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/)
Reason for revert:
fixes on the chrome side are landing (brettw), keep fingers crossed.

Original issue's description:
> Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
>
> Reason for revert:
> breaking the Chrome deps roll.
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
>
> Original issue's description:
> > Rename kPMColor_SkColorType to kN32_SkColorType.
> >
> > The new name better represents what this flag means.
> >
> > BUG=skia:2384
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14117
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14145 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-10 22:49:20 +00:00
commit-bot@chromium.org
757ebd20ef Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
breaking the Chrome deps roll.
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio

Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14144 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-10 22:36:34 +00:00
commit-bot@chromium.org
149e9a107c Rename kPMColor_SkColorType to kN32_SkColorType.
The new name better represents what this flag means.

BUG=skia:2384
R=reed@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14117 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-09 20:45:29 +00:00
commit-bot@chromium.org
b45c56e4b7 fix iOS build -- pass colortype, not config
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13494 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-18 23:32:05 +00:00
reed@google.com
26deb23e15 change SkScalarRound to SkScalarRoundToInt
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12720 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-17 19:50:57 +00:00
commit-bot@chromium.org
e029440758 Replace SkTScopedPtr with SkAutoTDelete in Skia.
BUG=
R=djsollen@google.com, reed@google.com, vandebo@chromium.org

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/23621005

git-svn-id: http://skia.googlecode.com/svn/trunk@11016 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-29 22:14:04 +00:00
robertphillips@google.com
1f2f338e23 Split SkDevice into SkBaseDevice and SkBitmapDevice
https://codereview.chromium.org/22978012/



git-svn-id: http://skia.googlecode.com/svn/trunk@10995 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-29 11:54:56 +00:00
robertphillips@google.com
9b051a375b Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready.
git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-20 20:06:40 +00:00
robertphillips@google.com
3055b70018 Split SkDevice out of SkBitmapDevice
https://codereview.chromium.org/22978012/



git-svn-id: http://skia.googlecode.com/svn/trunk@10830 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-20 17:49:04 +00:00
robertphillips@google.com
c94a9cc351 Fix iOS compiler error/warning
git-svn-id: http://skia.googlecode.com/svn/trunk@8436 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-28 18:03:27 +00:00
bsalomon@google.com
64cc810ad1 Make SkOSWindow return the sample count and stencil bit count for its GL context.
Review URL: https://codereview.chromium.org/12437010

git-svn-id: http://skia.googlecode.com/svn/trunk@7995 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-05 20:06:05 +00:00
bsalomon@google.com
365d78762d More fixes for ios build.
git-svn-id: http://skia.googlecode.com/svn/trunk@7643 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-07 17:01:39 +00:00
bsalomon@google.com
f67bd9d59e Attempt to fix iOS build.
git-svn-id: http://skia.googlecode.com/svn/trunk@7642 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-07 16:23:58 +00:00
skia.committer@gmail.com
e16efc1882 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7406 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-26 07:06:02 +00:00
caryclark@google.com
5987f58036 build iOS with 'make all'
This builds all skia tests by treating iOS tools
as executable applications. A few warnings were
fixed as well.

Removed old trace draw code and remnants.
Review URL: https://codereview.appspot.com/6597063

git-svn-id: http://skia.googlecode.com/svn/trunk@5776 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-02 18:33:14 +00:00
reed@google.com
5957f47e8d retool so we don't need to call SkCanvas::setDevice
Review URL: https://codereview.appspot.com/6591054

git-svn-id: http://skia.googlecode.com/svn/trunk@5759 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 20:31:56 +00:00
bsalomon@google.com
17a595a1ae Use setDevice rather than the removed setBitmapDevice.
R=reed@google.com
Review URL: https://codereview.appspot.com/6588057

git-svn-id: http://skia.googlecode.com/svn/trunk@5756 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 19:06:09 +00:00
bsalomon@google.com
6ac79dc9da Change the ios sample app name.
Review URL: https://codereview.appspot.com/6597053

git-svn-id: http://skia.googlecode.com/svn/trunk@5748 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 15:39:22 +00:00
bsalomon@google.com
cca3c8f21b Make gpu work in iOS SampleApp.
This includes updates to the GrGLInterface and changes to the DeviceManager subclass used on iOS.
Review URL: https://codereview.appspot.com/6582043

git-svn-id: http://skia.googlecode.com/svn/trunk@5722 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-28 16:56:28 +00:00
bsalomon@google.com
230504d6b5 Make SampleApp work on iPhone/iOS simulator.
Several parts to this:

1) The DeviceManager subclass for iOS was rewritten because the base class
changed.

2) Two old samples that rely on hardcoded paths to images are deleted. They hit
assertions in SkImageRef. No one has the required images to run these anyway.

3) argv must be non-NULL.

4) The UI delegate must not be loaded from the NIB for viewDidLoad ordering
reasons. So I removed an IBOutlet link from the window to the splitview
controller in the iPad's NIB file. The split view is attached by the AppDelegate
programmatically.

This doesn't make GPU work. That will come in a later change.

Review URL: https://codereview.appspot.com/6561056/



git-svn-id: http://skia.googlecode.com/svn/trunk@5712 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-27 16:04:54 +00:00
caryclark@google.com
32847be8c3 remove precompiled header option for ios
unreviewed

git-svn-id: http://skia.googlecode.com/svn/trunk@5700 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 17:58:27 +00:00
caryclark@google.com
867cbd8bc2 first cut at making iOS work
Replace __arm__ with SK_CPU_ARM
add support for iOS simulator and device
fix const warning in iOSSampleApp
update gyp files

https://code.google.com/p/skia/issues/detail?id=900
tracks fixing missing arm assembly
Review URL: https://codereview.appspot.com/6552045

git-svn-id: http://skia.googlecode.com/svn/trunk@5606 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 15:45:41 +00:00
rmistry@google.com
d6176b0dca Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part II of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6474054

git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 18:14:13 +00:00
rmistry@google.com
bda03db289 Fixing source files that do not have newlines at the end.
Found using the new unsubmitted newline_checker slave script:
piraeus.cnc.corp.google.com:10125/builders/Skia_House_Keeping/builds/5/steps/shell_1/logs/stdio
Review URL: https://codereview.appspot.com/6443124

git-svn-id: http://skia.googlecode.com/svn/trunk@5097 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-14 20:27:54 +00:00
bsalomon@google.com
9923c2b29a Remove gpu stats tracking
Review URL: http://codereview.appspot.com/6300052/



git-svn-id: http://skia.googlecode.com/svn/trunk@4194 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 18:21:18 +00:00
bsalomon@google.com
1195925b05 Add MSAA option to SampleApp
Review URL: http://codereview.appspot.com/5969049


git-svn-id: http://skia.googlecode.com/svn/trunk@3627 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-06 20:13:38 +00:00
robertphillips@google.com
d5b05ef06b Patching Mac files missed in first delivery
git-svn-id: http://skia.googlecode.com/svn/trunk@3579 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-02 20:19:28 +00:00
tomhudson@google.com
02f90e8ac1 Fix include paths in non-standard targets.
git-svn-id: http://skia.googlecode.com/svn/trunk@3187 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 15:43:01 +00:00
bsalomon@google.com
c436499622 [GPU] Add explicit byte order and PM vs. UPM 8888 configs
Review URL: http://codereview.appspot.com/5347042/



git-svn-id: http://skia.googlecode.com/svn/trunk@2618 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 15:54:49 +00:00
yangsu@google.com
688823f5d3 Added SimpleiOSApp and updated iOSSampleApp
git-svn-id: http://skia.googlecode.com/svn/trunk@2202 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 19:14:13 +00:00
yangsu@google.com
69f2e05b58 Updated iOS SampleApp and the simple hello world Skia Cocoa App under experimental
git-svn-id: http://skia.googlecode.com/svn/trunk@2194 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 17:08:08 +00:00
yangsu@google.com
ef7bdfac61 Added Debugger to Sample App, off by default
Removed CocoaDebugger from experimental
Slight changes to SkOSMenu
Bug fixes for NetPipeReader and DrawingBoard


git-svn-id: http://skia.googlecode.com/svn/trunk@2102 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-12 14:27:47 +00:00
yangsu@google.com
f3493f0e1f iOS/Cocoa SampleApp, Drawingboard, and Networking updates
http://codereview.appspot.com/4843041/
http://codereview.appspot.com/4826061/
http://codereview.appspot.com/4832044/
http://codereview.appspot.com/4798055/


git-svn-id: http://skia.googlecode.com/svn/trunk@2058 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-08 15:12:05 +00:00
yangsu@google.com
5987045388 iOS Sample App menu implementation
http://codereview.appspot.com/4798055/


git-svn-id: http://skia.googlecode.com/svn/trunk@2022 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-02 13:20:22 +00:00
epoger@google.com
ec3ed6a5eb Automatic update of all copyright notices to reflect new license terms.
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.

The following files still need to be modified manually, in a separate CL:

android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058

git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:26:00 +00:00
epoger@google.com
fd03db0fe9 Manually update copyright notices in files that defied the automated process
used in http://codereview.appspot.com/4816058/ ('Automatic update of all copyright notices to reflect new license terms.')

Note that the following files have been left alone, because they name
copyright holders outside of Google.  Please let me know if we need to update
these files:

experimental/CiCarbonSampleMain.c
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
Review URL: http://codereview.appspot.com/4806054

git-svn-id: http://skia.googlecode.com/svn/trunk@1981 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:24:55 +00:00
yangsu@google.com
2ba30c0182 iOSSampleApp can now switch backends during runtime
git-svn-id: http://skia.googlecode.com/svn/trunk@1897 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-19 15:17:44 +00:00
yangsu@google.com
74d25b1049 Fixed an #ifdef bug in SkUIView
git-svn-id: http://skia.googlecode.com/svn/trunk@1881 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-17 14:51:52 +00:00
yangsu@google.com
22db8af525 Removed old files in iOSSampleApp
git-svn-id: http://skia.googlecode.com/svn/trunk@1880 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-17 14:44:55 +00:00
yangsu@google.com
c5aeccd8ba Updated iOSSampleApp to display FPS and display in OpenGL
git-svn-id: http://skia.googlecode.com/svn/trunk@1879 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-17 14:42:08 +00:00
yangsu@google.com
033bee3106 Changed Bundler identifier to com.google in iOSSampleApp
git-svn-id: http://skia.googlecode.com/svn/trunk@1823 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:50:59 +00:00
yangsu@google.com
6eece45cf3 Fixed iOSSampleApp dependencies
git-svn-id: http://skia.googlecode.com/svn/trunk@1822 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:45:39 +00:00
yangsu@google.com
2e20c248f3 Updated iOSSampleApp and related files.
Removed include guard in SkTime_Unix.cpp, which the iOSSampleApp now uses.


git-svn-id: http://skia.googlecode.com/svn/trunk@1820 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 19:26:42 +00:00
epoger@google.com
ea5dfa87b2 merge of SkiOSSampleApp into SampleApp, still a work in progress
http://codereview.appspot.com/4636078/



git-svn-id: http://skia.googlecode.com/svn/trunk@1785 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-01 21:01:32 +00:00