Fix Clang build on SkPDFResourceDict (CL 18977002)

Fix Clang build on SkPDFResourceDict (CL 18977002)

Committed: http://code.google.com/p/skia/source/detail?r=10295

[ducky, 2013-07-22 19:22:04]

Previous CL, which was reverted: https://codereview.chromium.org/18977002

[vandebo (ex-Chrome), 2013-07-23 19:49:29]

https://codereview.chromium.org/19954011/diff/1010/src/pdf/SkPDFResourceDict.h
File src/pdf/SkPDFResourceDict.h (right):

https://codereview.chromium.org/19954011/diff/1010/src/pdf/SkPDFResourceDict....
src/pdf/SkPDFResourceDict.h:66: void getRefResources(
nit: I can't think of a good name for this function, but this abbreviation is
potentially confusing with reference counting.  How about getReferencedResources
?

[ducky, 2013-07-23 20:31:27]

Renamed to getReferencedResources. Also changed insertResourceAsRef to
insertResourceAsReference, for consistency.

https://codereview.chromium.org/19954011/diff/1010/src/pdf/SkPDFResourceDict.h
File src/pdf/SkPDFResourceDict.h (right):

https://codereview.chromium.org/19954011/diff/1010/src/pdf/SkPDFResourceDict....
src/pdf/SkPDFResourceDict.h:66: void getRefResources(
On 2013/07/23 19:49:29, vandebo wrote:
> nit: I can't think of a good name for this function, but this abbreviation is
> potentially confusing with reference counting.  How about
getReferencedResources
> ?

Done.

[vandebo (ex-Chrome), 2013-07-23 20:33:39]

LGTM after nits.

https://codereview.chromium.org/19954011/diff/127001/src/pdf/SkPDFPage.cpp
File src/pdf/SkPDFPage.cpp (right):

https://codereview.chromium.org/19954011/diff/127001/src/pdf/SkPDFPage.cpp#ne...
src/pdf/SkPDFPage.cpp:44:
resourceDict->getReferencedResources(knownResourceObjects, newResourceObjects,
nit: 80 col

https://codereview.chromium.org/19954011/diff/127001/src/pdf/SkPDFPage.cpp#ne...
src/pdf/SkPDFPage.cpp:45: true);
nit: indent

[edisonn, 2013-07-23 20:36:54]

LGTM

[commit-bot: I haz the power, 2013-07-23 21:14:51]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/richardlin@chromium.org/19954011/17002

[commit-bot: I haz the power, 2013-07-23 21:49:35]

Change committed as 10295

[fmalita_google_do_not_use, 2013-07-23 22:18:27]

On 2013/07/23 21:49:35, I haz the power (commit-bot) wrote:
> Change committed as 10295

Looks like this broke the Chrome canary build. Is this something expected that
should be handled together with the DEPS roll?

http://108.170.217.252:10115/builders/Canary-Chrome-Ubuntu12-Ninja-x86_64-Def...

[14:52:15.691366] [65/65] LINK chrome
[14:56:36.975277] FAILED: g++ -Wl,-z,now -Wl,-z,relro -pthread
-Wl,-z,noexecstack -fPIC -B../../third_party/gold -pie -L.
-Wl,-uIsHeapProfilerRunning,-uProfilerStart
-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi
-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl
-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv
-Wl,--threads -Wl,--thread-count=4 -Wl,--icf=none -o chrome -Wl,--start-group
obj/chrome/app/chrome.chrome_exe_main_gtk.o
...
obj/ui/surface/libsurface.a  -Wl,--end-group -lX11 -lXcursor -lXrender -lXss
-lXext -lrt -ldl -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lXtst
-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0
-lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lXi -lnss3
-lnssutil3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lgconf-2 -lresolv -lXcomposite
-lasound -lXdamage -lXfixes -lcups -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-lgnutls -lgcrypt -lz -lpthread -lcrypt -lm -L/lib/x86_64-linux-gnu -lexpat
-ldbus-1 -ludev
[14:56:36.975665] ../../third_party/skia/src/pdf/SkPDFUtils.cpp:213: error:
undefined reference to
'SkPDFResourceDict::getResourceName(SkPDFResourceDict::SkPDFResourceType, int)'
[14:56:36.975713] ../../third_party/skia/src/pdf/SkPDFShader.cpp:845: error:
undefined reference to
'SkPDFResourceDict::getReferencedResources(SkTSet<SkPDFObject*> const&,
SkTSet<SkPDFObject*>*, bool) const'
[14:56:36.975770] ../../third_party/skia/src/pdf/SkPDFFormXObject.cpp:26: error:
undefined reference to
'SkPDFResourceDict::getReferencedResources(SkTSet<SkPDFObject*> const&,
SkTSet<SkPDFObject*>*, bool) const'
[14:56:36.975803] ../../third_party/skia/src/pdf/SkPDFDevice.cpp:430: error:
undefined reference to
'SkPDFResourceDict::getResourceName(SkPDFResourceDict::SkPDFResourceType, int)'
[14:56:36.975841] ../../third_party/skia/src/pdf/SkPDFUtils.cpp:222: error:
undefined reference to
'SkPDFResourceDict::getResourceName(SkPDFResourceDict::SkPDFResourceType, int)'
[14:56:36.975884] ../../third_party/skia/src/pdf/SkPDFDevice.cpp:1132: error:
undefined reference to 'SkPDFResourceDict::SkPDFResourceDict()'
[14:56:36.975942] ../../third_party/skia/src/pdf/SkPDFDevice.cpp:1138: error:
undefined reference to
'SkPDFResourceDict::insertResourceAsReference(SkPDFResourceDict::SkPDFResourceType,
int, SkPDFObject*)'
[14:56:36.975982] ../../third_party/skia/src/pdf/SkPDFDevice.cpp:1146: error:
undefined reference to
'SkPDFResourceDict::insertResourceAsReference(SkPDFResourceDict::SkPDFResourceType,
int, SkPDFObject*)'
[14:56:36.976015] ../../third_party/skia/src/pdf/SkPDFDevice.cpp:1154: error:
undefined reference to
'SkPDFResourceDict::insertResourceAsReference(SkPDFResourceDict::SkPDFResourceType,
int, SkPDFObject*)'
[14:56:36.976050] ../../third_party/skia/src/pdf/SkPDFDevice.cpp:1163: error:
undefined reference to
'SkPDFResourceDict::insertResourceAsReference(SkPDFResourceDict::SkPDFResourceType,
int, SkPDFObject*)'
[14:56:36.976084] ../../third_party/skia/src/pdf/SkPDFDevice.cpp:1704: error:
undefined reference to
'SkPDFResourceDict::getResourceName(SkPDFResourceDict::SkPDFResourceType, int)'
[14:56:36.976117] ../../third_party/skia/src/pdf/SkPDFPage.cpp:46: error:
undefined reference to
'SkPDFResourceDict::getReferencedResources(SkTSet<SkPDFObject*> const&,
SkTSet<SkPDFObject*>*, bool) const'
[14:56:36.976151] collect2: ld returned 1 exit status
[14:56:36.976183] ninja: build stopped: subcommand failed.

[fmalita_google_do_not_use, 2013-07-23 22:28:05]

I presume this should do it:

--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -92,6 +92,8 @@
     '../third_party/skia/src/pdf/SkPDFImageStream.h',
     '../third_party/skia/src/pdf/SkPDFPage.cpp',
     '../third_party/skia/src/pdf/SkPDFPage.h',
+    '../src/pdf/SkPDFResourceDict.cpp',
+    '../src/pdf/SkPDFResourceDict.h',
     '../third_party/skia/src/pdf/SkPDFShader.cpp',
     '../third_party/skia/src/pdf/SkPDFShader.h',

[fmalita_google_do_not_use, 2013-07-23 22:29:03]

On 2013/07/23 22:28:05, fmalita wrote:
> I presume this should do it:
> 
> --- a/skia/skia_library.gypi
> +++ b/skia/skia_library.gypi
> @@ -92,6 +92,8 @@
>      '../third_party/skia/src/pdf/SkPDFImageStream.h',
>      '../third_party/skia/src/pdf/SkPDFPage.cpp',
>      '../third_party/skia/src/pdf/SkPDFPage.h',
> +    '../src/pdf/SkPDFResourceDict.cpp',
> +    '../src/pdf/SkPDFResourceDict.h',
>      '../third_party/skia/src/pdf/SkPDFShader.cpp',
>      '../third_party/skia/src/pdf/SkPDFShader.h',

(with paths prefixed accordingly).