MacViews: Implement FormatType::operator< on Mac.

MacViews: Implement FormatType::operator< on Mac.

This is needed by some views browser code that wants to put FormatType in a set.
Other platforms other than Android already has it implemented.

BUG=425229
Committed: https://crrev.com/c85a8d3c87e0a5fa7a23ea1c9306bffbcf542169
Cr-Commit-Position: refs/heads/master@{#301910}

[Andre, 2014-10-29 01:26:24]

andresantoso@chromium.org changed reviewers:
+ dcheng@chromium.org

[Andre, 2014-10-29 01:26:25]

dcheng@ PTAL.

[dcheng, 2014-10-29 01:31:24]

Mind reminding me where this views code is? It's been awhile.

https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard.h
File ui/base/clipboard/clipboard.h (right):

https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard....
ui/base/clipboard/clipboard.h:74: #if !defined(OS_ANDROID)
Is there another #define to tie this to? Using !OS_ANDROID is a bit unintuitive.

[Andre, 2014-10-29 05:37:19]

On 2014/10/29 01:31:24, dcheng wrote:
> Mind reminding me where this views code is? It's been awhile.
> 
> https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard.h
> File ui/base/clipboard/clipboard.h (right):
> 
>
https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard....
> ui/base/clipboard/clipboard.h:74: #if !defined(OS_ANDROID)
> Is there another #define to tie this to? Using !OS_ANDROID is a bit
unintuitive.

I actually don't remember where the client code is, I ran into it when trying to
get the browser to build (https://codereview.chromium.org/664703003/).
!OS_ANDROID matches what is implemented because all clipboard implementation
except android implements it.
We can use defined(TOOLKIT_VIEWS) instead, but that reflects what needs it
instead of what is implemented.

[dcheng, 2014-10-29 05:45:34]

On 2014/10/29 at 05:37:19, andresantoso wrote:
> On 2014/10/29 01:31:24, dcheng wrote:
> > Mind reminding me where this views code is? It's been awhile.
> > 
> >
https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard.h
> > File ui/base/clipboard/clipboard.h (right):
> > 
> >
https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard....
> > ui/base/clipboard/clipboard.h:74: #if !defined(OS_ANDROID)
> > Is there another #define to tie this to? Using !OS_ANDROID is a bit
unintuitive.
> 
> I actually don't remember where the client code is, I ran into it when trying
to get the browser to build (https://codereview.chromium.org/664703003/).
> !OS_ANDROID matches what is implemented because all clipboard implementation
except android implements it.
> We can use defined(TOOLKIT_VIEWS) instead, but that reflects what needs it
instead of what is implemented.

IMO, we should be using TOOLKIT_VIEWS if it's an artifact of views code using
it--!defined(OS_ANDROID) does not intuitively map to that at all. Once that's
fixed, the rest LGTM.

[Andre, 2014-10-29 17:26:18]

On 2014/10/29 05:45:34, dcheng wrote:
> On 2014/10/29 at 05:37:19, andresantoso wrote:
> > On 2014/10/29 01:31:24, dcheng wrote:
> > > Mind reminding me where this views code is? It's been awhile.
> > > 
> > >
> https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard.h
> > > File ui/base/clipboard/clipboard.h (right):
> > > 
> > >
>
https://codereview.chromium.org/685043002/diff/1/ui/base/clipboard/clipboard....
> > > ui/base/clipboard/clipboard.h:74: #if !defined(OS_ANDROID)
> > > Is there another #define to tie this to? Using !OS_ANDROID is a bit
> unintuitive.
> > 
> > I actually don't remember where the client code is, I ran into it when
trying
> to get the browser to build (https://codereview.chromium.org/664703003/).
> > !OS_ANDROID matches what is implemented because all clipboard implementation
> except android implements it.
> > We can use defined(TOOLKIT_VIEWS) instead, but that reflects what needs it
> instead of what is implemented.
> 
> IMO, we should be using TOOLKIT_VIEWS if it's an artifact of views code using
> it--!defined(OS_ANDROID) does not intuitively map to that at all. Once that's
> fixed, the rest LGTM.

Done.
There is a drawback though, I have to also guard the definition in the
implementation
file with defined(TOOLKIT_VIEWS), where it wasn't necessary before.

[Andre, 2014-10-29 18:59:46]

The CQ bit was checked by andresantoso@chromium.org

[commit-bot: I haz the power, 2014-10-29 19:00:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/685043002/20001

[commit-bot: I haz the power, 2014-10-29 19:44:22]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2014-10-29 19:45:17]

Patchset 2 (id:??) landed as
https://crrev.com/c85a8d3c87e0a5fa7a23ea1c9306bffbcf542169
Cr-Commit-Position: refs/heads/master@{#301910}

[gunsch, 2014-10-29 20:29:00]

On 2014/10/29 19:45:17, I haz the power (commit-bot) wrote:
> Patchset 2 (id:??) landed as
> https://crrev.com/c85a8d3c87e0a5fa7a23ea1c9306bffbcf542169
> Cr-Commit-Position: refs/heads/master@{#301910}

Hi,
 This broke the Aura build:

[38/2675] CXX obj/ui/base/clipboard/ui_base.clipboard_aura.o
FAILED: ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF
obj/ui/base/clipboard/ui_base.clipboard_aura.o.d -DV8_DEPRECATION_WARNINGS
-D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=218707
-DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_OZONE=1
-DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN
-DENABLE_PRE_SYNC_BACKUP -DENABLE_WEBRTC=1 -DUSE_PROPRIETARY_CODECS
-DENABLE_MPEG2TS_STREAM_PARSER -DENABLE_CONFIGURATION_POLICY
-DENABLE_NOTIFICATIONS -DLOG_DISABLED=0 -DENABLE_TASK_MANAGER=1
-DENABLE_EXTENSIONS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1
-DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2
-DCLD2_DATA_SOURCE=static -DENABLE_SPELLCHECK=1
-DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1
-DENABLE_MANAGED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1
-DENABLE_LOAD_COMPLETION_HACKS=1 -DUI_BASE_IMPLEMENTATION
-DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1
'-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"'
-DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1
-DGR_GL_IGNORE_ES3_MSAA=0 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT
-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1 -DSK_SUPPORT_LEGACY_TEXTRENDERMODE
-DSK_LEGACY_NO_DISTANCE_FIELD_PATHS -DSK_USE_POSIX_THREADS
-DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION
-DUSE_NSS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_DEBUG
-D_GLIBCXX_DEBUG=1 -Igen -I../.. -I../../skia/config
-I../../third_party/skia/src/core -I../../third_party/skia/include/core
-I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf
-I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy
-I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe
-I../../third_party/skia/include/ports -I../../third_party/skia/include/utils
-I../../skia/ext -I../../third_party/icu/source/i18n
-I../../third_party/icu/source/common -Igen/ui/resources -fstack-protector
--param=ssp-buffer-size=4 -Werror -pthread -fno-strict-aliasing -Wall
-Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe
-fPIC -Wno-reserved-user-defined-literal -Xclang -load -Xclang
/usr/local/google/code/chromium/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so
-Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics
-B/usr/local/google/code/chromium/src/third_party/binutils/Linux_x64/Release/bin
-Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration
-Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing
-Wno-deprecated-register -Wno-unused-local-typedef -m64 -march=x86-64 -O0 -g
-gdwarf-4 -funwind-tables -gsplit-dwarf -Wno-undefined-bool-conversion
-Wno-tautological-undefined-compare -fno-exceptions -fno-rtti
-fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -std=gnu++11 
-c ../../ui/base/clipboard/clipboard_aura.cc -o
obj/ui/base/clipboard/ui_base.clipboard_aura.o
../../ui/base/clipboard/clipboard_aura.cc:430:29: error: out-of-line definition
of 'operator<' does not match any declaration in 'ui::Clipboard::FormatType'
bool Clipboard::FormatType::operator<(const FormatType& other) const {
                            ^~~~~~~~
1 error generated.
[43/2675] CXX obj/ui/base/dragdrop/ui_base.os_exchange_data_provider_aura.o
FAILED: ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF
obj/ui/base/dragdrop/ui_base.os_exchange_data_provider_aura.o.d
-DV8_DEPRECATION_WARNINGS -D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD
-DCR_CLANG_REVISION=218707 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1
-DUSE_OZONE=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1
-DENABLE_ONE_CLICK_SIGNIN -DENABLE_PRE_SYNC_BACKUP -DENABLE_WEBRTC=1
-DUSE_PROPRIETARY_CODECS -DENABLE_MPEG2TS_STREAM_PARSER
-DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DLOG_DISABLED=0
-DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_SESSION_SERVICE=1
-DENABLE_THEMES=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2
-DCLD2_DATA_SOURCE=static -DENABLE_SPELLCHECK=1
-DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1
-DENABLE_MANAGED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1
-DENABLE_LOAD_COMPLETION_HACKS=1 -DUI_BASE_IMPLEMENTATION
-DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1
'-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"'
-DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1
-DGR_GL_IGNORE_ES3_MSAA=0 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT
-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1 -DSK_SUPPORT_LEGACY_TEXTRENDERMODE
-DSK_LEGACY_NO_DISTANCE_FIELD_PATHS -DSK_USE_POSIX_THREADS
-DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION
-DUSE_NSS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_DEBUG
-D_GLIBCXX_DEBUG=1 -Igen -I../.. -I../../skia/config
-I../../third_party/skia/src/core -I../../third_party/skia/include/core
-I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf
-I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy
-I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe
-I../../third_party/skia/include/ports -I../../third_party/skia/include/utils
-I../../skia/ext -I../../third_party/icu/source/i18n
-I../../third_party/icu/source/common -Igen/ui/resources -fstack-protector
--param=ssp-buffer-size=4 -Werror -pthread -fno-strict-aliasing -Wall
-Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe
-fPIC -Wno-reserved-user-defined-literal -Xclang -load -Xclang
/usr/local/google/code/chromium/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so
-Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics
-B/usr/local/google/code/chromium/src/third_party/binutils/Linux_x64/Release/bin
-Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration
-Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing
-Wno-deprecated-register -Wno-unused-local-typedef -m64 -march=x86-64 -O0 -g
-gdwarf-4 -funwind-tables -gsplit-dwarf -Wno-undefined-bool-conversion
-Wno-tautological-undefined-compare -fno-exceptions -fno-rtti
-fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -std=gnu++11 
-c ../../ui/base/dragdrop/os_exchange_data_provider_aura.cc -o
obj/ui/base/dragdrop/ui_base.os_exchange_data_provider_aura.o
In file included from
../../ui/base/dragdrop/os_exchange_data_provider_aura.cc:5:
In file included from ../../ui/base/dragdrop/os_exchange_data_provider_aura.h:8:
In file included from
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/map:60:
In file included from
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_tree.h:63:
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_function.h:235:20:
error: invalid operands to binary expression ('const ui::Clipboard::FormatType'
and 'const ui::Clipboard::FormatType')
      { return __x < __y; }
               ~~~ ^ ~~~
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_map.h:463:22:
note: in instantiation of member function
'std::less<ui::Clipboard::FormatType>::operator()' requested here
        if (__i == end() || key_comp()(__k, (*__i).first))
                            ^
../../ui/base/dragdrop/os_exchange_data_provider_aura.cc:78:15: note: in
instantiation of member function 'std::__cxx1998::map<ui::Clipboard::FormatType,
Pickle, std::less<ui::Clipboard::FormatType>, std::allocator<std::pair<const
ui::Clipboard::FormatType, Pickle> > >::operator[]' requested here
  pickle_data_[format] = data;
              ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_pair.h:220:5:
note: candidate template ignored: could not match 'pair<type-parameter-0-0,
type-parameter-0-1>' against 'const ui::Clipboard::FormatType'
    operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
    ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_iterator.h:297:5:
note: candidate template ignored: could not match
'reverse_iterator<type-parameter-0-0>' against 'const ui::Clipboard::FormatType'
    operator<(const reverse_iterator<_Iterator>& __x,
    ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_iterator.h:347:5:
note: candidate template ignored: could not match
'reverse_iterator<type-parameter-0-0>' against 'const ui::Clipboard::FormatType'
    operator<(const reverse_iterator<_IteratorL>& __x,
    ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_iterator.h:1055:5:
note: candidate template ignored: could not match
'move_iterator<type-parameter-0-0>' against 'const ui::Clipboard::FormatType'
    operator<(const move_iterator<_IteratorL>& __x,
    ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_iterator.h:1061:5:
note: candidate template ignored: could not match
'move_iterator<type-parameter-0-0>' against 'const ui::Clipboard::FormatType'
    operator<(const move_iterator<_Iterator>& __x,
    ^
1 error generated.


You can confirm this with the chromecast/ build:
GYP_GENERATOR_FLAGS="output_dir=out_cast" build/gyp_chromium -Dchromecast=1 &&
ninja -C out_cast/Debug cast_shell -k500