|
|
Description[SkDebugger] Remove unneeded SkDebuggerGUI includes
R=robertphillips@google.com,mtklein@google.com
Committed: https://skia.googlesource.com/skia/+/3f0424ff57f93666df7347d4787816b210233eb0
Patch Set 1 #
Messages
Total messages: 7 (1 generated)
Fixes this build borkage locally: FAILED: c++ -MMD -MF obj/debugger/QT/debugger.SkDebuggerGUI.o.d -DSK_INTERNAL -DSK_GAMMA_SRGB -DSK_GAMMA_APPLY_TO_A8 -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1 -DSK_SUPPORT_GPU=1 -DSK_SUPPORT_OPENCL=0 -DSK_FORCE_DISTANCE_FIELD_TEXT=0 -DSK_SAMPLES_FOR_X -DSK_BUILD_FOR_UNIX -DSKIA_PNG_PREFIXED -DSK_DEVELOPER=1 -I../../include/private -I../../src/core -I../../src/utils/debugger -I../../debugger -I../../src/gpu -I../../src/ports -I../../bench -I../../tools -I../../debugger/QT -I/usr/include -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include/QtOpenGL -I/usr/include/qt4 -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL -I../../include/c -I../../include/config -I../../include/core -I../../include/pathops -I../../include/pipe -I../../include/codec -I../../third_party/externals/libjpeg-turbo -I../../include/effects -I../../include/images -I../../third_party/externals/libpng -I../../third_party/libpng -I../../include/ports -I../../src/sfnt -I../../include/utils -I../../src/utils -I../../include/gpu -g -fno-exceptions -fstrict-aliasing -Wall -Wextra -Winit-self -Wpointer-arith -Wsign-compare -Wno-unused-parameter -m64 -Wno-uninitialized -Wno-array-bounds -fno-omit-frame-pointer -std=c++11 -fno-rtti -fno-threadsafe-statics -Wnon-virtual-dtor -c ../../debugger/QT/SkDebuggerGUI.cpp -o obj/debugger/QT/debugger.SkDebuggerGUI.o In file included from ../../src/core/SkPictureRecord.h:17:0, from ../../debugger/QT/SkDebuggerGUI.cpp:11: ../../include/private/SkTHash.h:100:25: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given void foreach(Fn&& fn) { ^ ../../include/private/SkTHash.h:110:25: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given void foreach(Fn&& fn) const { ^ ../../include/private/SkTHash.h:235:25: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given void foreach(Fn&& fn) { ^ ../../include/private/SkTHash.h:236:62: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given fTable.foreach([&fn](Pair* p){ fn(p->key, &p->val); }); ^ ../../include/private/SkTHash.h:241:25: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given void foreach(Fn&& fn) const { ^ ../../include/private/SkTHash.h:242:65: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given fTable.foreach([&fn](const Pair& p){ fn(p.key, p.val); }); ^ ../../include/private/SkTHash.h:289:26: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given void foreach (Fn&& fn) const { ^ ../../include/private/SkTHash.h:290:26: error: macro "Q_FOREACH" requires 2 arguments, but only 1 given fTable.foreach(fn); ^ In file included from ../../src/core/SkPictureRecord.h:17:0, from ../../debugger/QT/SkDebuggerGUI.cpp:11: ../../include/private/SkTHash.h:101:9: error: expected primary-expression before ‘for’ for (int i = 0; i < fCapacity; i++) { ^ ../../include/private/SkTHash.h:101:9: error: expected ‘}’ before ‘for’ ../../include/private/SkTHash.h:101:9: error: variable or field ‘Q_FOREACH’ declared void ../../include/private/SkTHash.h:101:25: error: ‘i’ does not name a type for (int i = 0; i < fCapacity; i++) { ^ ../../include/private/SkTHash.h:101:40: error: ‘i’ does not name a type for (int i = 0; i < fCapacity; i++) { ^ ../../include/private/SkTHash.h:106:5: error: expected ‘;’ after class definition } ^ ../../include/private/SkTHash.h: In constructor ‘SkTHashTable<T, K, Traits>::SkTHashTable()’: ../../include/private/SkTHash.h:27:22: error: class ‘SkTHashTable<T, K, Traits>’ does not have any field named ‘fCount’ SkTHashTable() : fCount(0), fRemoved(0), fCapacity(0) {} ^ ../../include/private/SkTHash.h:27:33: error: class ‘SkTHashTable<T, K, Traits>’ does not have any field named ‘fRemoved’ SkTHashTable() : fCount(0), fRemoved(0), fCapacity(0) {} ^ ../../include/private/SkTHash.h:27:46: error: class ‘SkTHashTable<T, K, Traits>’ does not have any field named ‘fCapacity’ SkTHashTable() : fCount(0), fRemoved(0), fCapacity(0) {} ^ ../../include/private/SkTHash.h: In member function ‘int SkTHashTable<T, K, Traits>::count() const’: ../../include/private/SkTHash.h:36:32: error: ‘fCount’ was not declared in this scope int count() const { return fCount; } ^ ../../include/private/SkTHash.h: In member function ‘size_t SkTHashTable<T, K, Traits>::approxBytesUsed() const’: ../../include/private/SkTHash.h:39:45: error: ‘fCapacity’ was not declared in this scope size_t approxBytesUsed() const { return fCapacity * sizeof(Slot); } ^ ../../include/private/SkTHash.h:39:64: error: ‘Slot’ was not declared in this scope size_t approxBytesUsed() const { return fCapacity * sizeof(Slot); } ^ ../../include/private/SkTHash.h: In member function ‘T* SkTHashTable<T, K, Traits>::set(const T&)’: ../../include/private/SkTHash.h:54:18: error: ‘fCount’ was not declared in this scope if (4 * (fCount+fRemoved) >= 3 * fCapacity) { ^ ../../include/private/SkTHash.h:54:25: error: ‘fRemoved’ was not declared in this scope if (4 * (fCount+fRemoved) >= 3 * fCapacity) { ^ ../../include/private/SkTHash.h:54:42: error: ‘fCapacity’ was not declared in this scope if (4 * (fCount+fRemoved) >= 3 * fCapacity) { ^ ../../include/private/SkTHash.h: In member function ‘T* SkTHashTable<T, K, Traits>::find(const K&) const’: ../../include/private/SkTHash.h:63:29: error: ‘fCapacity’ was not declared in this scope int index = hash & (fCapacity-1); ^ ../../include/private/SkTHash.h:65:13: error: ‘Slot’ was not declared in this scope Slot& s = fSlots[index]; ^ ../../include/private/SkTHash.h:65:19: error: ‘s’ was not declared in this scope Slot& s = fSlots[index]; ^ ../../include/private/SkTHash.h:65:23: error: ‘fSlots’ was not declared in this scope Slot& s = fSlots[index]; ^ ../../include/private/SkTHash.h: In member function ‘void SkTHashTable<T, K, Traits>::remove(const K&)’: ../../include/private/SkTHash.h:83:29: error: ‘fCapacity’ was not declared in this scope int index = hash & (fCapacity-1); ^ ../../include/private/SkTHash.h:85:13: error: ‘Slot’ was not declared in this scope Slot& s = fSlots[index]; ^ ../../include/private/SkTHash.h:85:19: error: ‘s’ was not declared in this scope Slot& s = fSlots[index]; ^ ../../include/private/SkTHash.h:85:23: error: ‘fSlots’ was not declared in this scope Slot& s = fSlots[index]; ^ ../../include/private/SkTHash.h:88:17: error: ‘fRemoved’ was not declared in this scope fRemoved++; ^ ../../include/private/SkTHash.h:89:17: error: ‘fCount’ was not declared in this scope fCount--; ^ ../../include/private/SkTHash.h: At global scope: ../../include/private/SkTHash.h:110:27: error: expected initializer before ‘const’ void foreach(Fn&& fn) const { ^ ../../include/private/SkTHash.h:118:1: error: expected unqualified-id before ‘private’ private: ^ ninja: build stopped: subcommand failed.
The CQ bit was checked by fmalita@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1411963006/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1411963006/1
Note for Reviewers: The CQ is waiting for an approval. If you believe that the CL is not ready yet, or if you would like to L-G-T-M with comments then please uncheck the CQ checkbox. Waiting for LGTM from valid reviewer(s) till 2015-11-02 23:22 UTC
lgtm
wtf, lgtm
Message was sent while issue was closed.
Committed patchset #1 (id:1) as https://skia.googlesource.com/skia/+/3f0424ff57f93666df7347d4787816b210233eb0 |