LayerAndroid.h

      1 /*
      2  * Copyright (C) 2009 The Android Open Source Project
      3  *
      4  * Licensed under the Apache License, Version 2.0 (the "License");
      5  * you may not use this file except in compliance with the License.
      6  * You may obtain a copy of the License at
      7  *
      8  *      http://www.apache.org/licenses/LICENSE-2.0
      9  *
     10  * Unless required by applicable law or agreed to in writing, software
     11  * distributed under the License is distributed on an "AS IS" BASIS,
     12  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  * See the License for the specific language governing permissions and
     14  * limitations under the License.
     15  */
     16 
     17 #ifndef LayerAndroid_h
     18 #define LayerAndroid_h
     19 
     20 #if USE(ACCELERATED_COMPOSITING)　＜＝　無効？？？
　　　（略）
    405 #else
    406 
    407 class SkPicture;
    408 
    409 namespace WebCore {
    410 
    411 class LayerAndroid {
    412 public:
    413     LayerAndroid(SkPicture* picture) :
    414         m_recordingPicture(picture), // does not assign ownership
    415         m_uniqueId(-1)
    416     {}
    417     SkPicture* picture() const { return m_recordingPicture; }
    418     int uniqueId() const { return m_uniqueId; }
    419 private:
    420     SkPicture* m_recordingPicture;
    421     int m_uniqueId;
    422 };
    423 
    424 }
    425 
    426 #endif // USE(ACCELERATED_COMPOSITING)
    427 
    428 #endif // LayerAndroid_h
    429

=======================================================================================

ACCELERATED_COMPOSITINGは、無効かと思った。
しかし、プリプロセッサの出力をファイルへ行ってみたところ、
FloatPoint.hを読み込んでいる。
つまり、ACCELERATED_COMPOSITINGは、有効になっているように見える。

###
##LOCAL_CFLAGS += -v -E
###

# 135 "external/webkit/Source/WebCore/config.h" 2
# 5 "external/webkit/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp" 2
# 1 "external/webkit/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h" 1
# 22 "external/webkit/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h"
# 1 "external/webkit/Source/WebCore/platform/graphics/FloatPoint.h" 1
# 30 "external/webkit/Source/WebCore/platform/graphics/FloatPoint.h"
# 1 "external/webkit/Source/WebCore/platform/graphics/FloatSize.h" 1
# 31 "external/webkit/Source/WebCore/platform/graphics/FloatSize.h"
# 1 "external/webkit/Source/WebCore/platform/graphics/IntSize.h" 1
# 60 "external/webkit/Source/WebCore/platform/graphics/IntSize.h"

=======================================================================================

external/WebKit配下に対して、grepをかけた。
以下の部分にのみある。どのように影響しているのかよくわからない。

Source\WebCore\WebCore.gyp\WebCore.gyp(1055):         ['use_accelerated_compositing==1', {

=======================================================================================

ヘッダーにエラーを入れる。
ACCELERATED_COMPOSITINGが有効ならエラーになる。
エラーになったので、ACCELERATED_COMPOSITINGは有効である。

#ifndef LayerAndroid_h
#define LayerAndroid_h

#if USE(ACCELERATED_COMPOSITING)
12345:
#include "FloatPoint.h"
#include "FloatPoint3D.h"

make: ディレクトリ `/home/m_fujii/JRO03L' に入ります
target thumb C++: libwebcore <= external/webkit/Source/WebCore/platform/ScrollView.cpp
In file included from external/webkit/Source/WebCore/platform/graphics/android/layers/ScrollableLayerAndroid.h:22:0,
                 from external/webkit/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.h:28,
                 from external/webkit/Source/WebCore/platform/ScrollView.cpp:32:
external/webkit/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h:21:1: error: expected unqualified-id before numeric constant
make: *** [out/target/product/generic/obj/STATIC_LIBRARIES/libwebcore_intermediates/Source/WebCore/platform/ScrollView.o] エラー 1