35380 2010-02-25 05:10:41 -0800 [Qt] Compilation fails when WTF_USE_ACCELERATED_COMPOSITING=0 2010-02-26 12:59:19 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 jarkko.sakkinen webkit-unassigned commit-queue oldest_to_newest 193683 0 jarkko.sakkinen 2010-02-25 05:10:41 -0800 WebKit trunk compilation failes when WTF_USE_ACCELERATED_COMPOSITING is set to zero. I resolved this issue by doing the following change: ########################################################################################################### diff --git a/WebCore/css/MediaQueryEvaluator.cpp b/WebCore/css/MediaQueryEvaluator.cpp index 4963ed4..6864231 100644 --- a/WebCore/css/MediaQueryEvaluator.cpp +++ b/WebCore/css/MediaQueryEvaluator.cpp @@ -47,7 +47,7 @@ #include "PlatformScreen.h" #include <wtf/HashMap.h> -#if ENABLE(3D_RENDERING) +#if ENABLE(3D_RENDERING) && USE(ACCELERATED_COMPOSITING) #include "RenderLayerCompositor.h" #endif @@ -472,10 +472,12 @@ static bool transform_3dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* f bool returnValueIfNoParameter; int have3dRendering; -#if ENABLE(3D_RENDERING) +#if ENABLE(3D_RENDERING) bool threeDEnabled = false; +#if USE(ACCELERATED_COMPOSITING) if (RenderView* view = frame->contentRenderer()) threeDEnabled = view->compositor()->hasAcceleratedCompositing(); +#endif returnValueIfNoParameter = threeDEnabled; have3dRendering = threeDEnabled ? 1 : 0; ########################################################################################################### 193684 1 49478 jarkko.sakkinen 2010-02-25 05:13:03 -0800 Created attachment 49478 Fix suggestion Quickly done fix for the issue. 193685 2 49478 kenneth 2010-02-25 05:15:06 -0800 Comment on attachment 49478 Fix suggestion Looks OK to me, but needs a ChangeLog 193692 3 49480 jarkko.sakkinen 2010-02-25 05:45:24 -0800 Created attachment 49480 Compilation fix to MediaQuerySelector.cpp when WTF_USE_ACCELERATED_COMPOSITING=0 194035 4 49574 jarkko.sakkinen 2010-02-26 01:12:43 -0800 Created attachment 49574 Same fix, added missing bug URL. 194230 5 49574 commit-queue 2010-02-26 12:59:15 -0800 Comment on attachment 49574 Same fix, added missing bug URL. Clearing flags on attachment: 49574 Committed r55303: <http://trac.webkit.org/changeset/55303> 194231 6 commit-queue 2010-02-26 12:59:19 -0800 All reviewed patches have been landed. Closing bug. 49478 2010-02-25 05:13:03 -0800 2010-02-25 05:45:24 -0800 Fix suggestion mediaquery.diff text/plain 924 jarkko.sakkinen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL01lZGlhUXVlcnlFdmFsdWF0b3IuY3BwIGIvV2ViQ29y ZS9jc3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKaW5kZXggNDk2M2VkNC4uNjg2NDIzMSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9jc3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKKysrIGIvV2ViQ29y ZS9jc3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKQEAgLTQ3LDcgKzQ3LDcgQEAKICNpbmNsdWRl ICJQbGF0Zm9ybVNjcmVlbi5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAKLSNpZiBFTkFC TEUoM0RfUkVOREVSSU5HKQorI2lmIEVOQUJMRSgzRF9SRU5ERVJJTkcpICYmIFVTRShBQ0NFTEVS QVRFRF9DT01QT1NJVElORykKICNpbmNsdWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKICNl bmRpZgogCkBAIC00NzIsMTAgKzQ3MiwxMiBAQCBzdGF0aWMgYm9vbCB0cmFuc2Zvcm1fM2RNZWRp YUZlYXR1cmVFdmFsKENTU1ZhbHVlKiB2YWx1ZSwgUmVuZGVyU3R5bGUqLCBGcmFtZSogZgogICAg IGJvb2wgcmV0dXJuVmFsdWVJZk5vUGFyYW1ldGVyOwogICAgIGludCBoYXZlM2RSZW5kZXJpbmc7 CiAKLSNpZiBFTkFCTEUoM0RfUkVOREVSSU5HKQorI2lmIEVOQUJMRSgzRF9SRU5ERVJJTkcpIAog ICAgIGJvb2wgdGhyZWVERW5hYmxlZCA9IGZhbHNlOworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKICAgICBpZiAoUmVuZGVyVmlldyogdmlldyA9IGZyYW1lLT5jb250ZW50UmVuZGVy ZXIoKSkKICAgICAgICAgdGhyZWVERW5hYmxlZCA9IHZpZXctPmNvbXBvc2l0b3IoKS0+aGFzQWNj ZWxlcmF0ZWRDb21wb3NpdGluZygpOworI2VuZGlmCiAKICAgICByZXR1cm5WYWx1ZUlmTm9QYXJh bWV0ZXIgPSB0aHJlZURFbmFibGVkOwogICAgIGhhdmUzZFJlbmRlcmluZyA9IHRocmVlREVuYWJs ZWQgPyAxIDogMDsK 49480 2010-02-25 05:45:24 -0800 2010-02-26 01:12:43 -0800 Compilation fix to MediaQuerySelector.cpp when WTF_USE_ACCELERATED_COMPOSITING=0 mediaquery-2.diff text/plain 1338 jarkko.sakkinen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjZhYjlmZi4uYzFiZDQxMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMC0wMi0yNSAgSmFya2tvIFNha2tp bmVuICA8amFya2tvLnNha2tpbmVuQHRpZXRvLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlZCBjb21waWxhdGlvbiBlcnJvciB3aGVuIFdU Rl9VU0VfQUNDRUxFUkFURURfQ09NUE9TSVRJTkc9MAorCisgICAgICAgICogY3NzL01lZGlhUXVl cnlFdmFsdWF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dHJhbnNmb3JtXzNkTWVkaWFGZWF0 dXJlRXZhbCk6CisKIDIwMTAtMDItMjQgIE5pY2hvbGFzIFlvdW5nICA8bmljaG9sYXMueW91bmdA bm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvY3NzL01lZGlhUXVlcnlFdmFsdWF0b3IuY3BwIGIvV2ViQ29yZS9jc3MvTWVk aWFRdWVyeUV2YWx1YXRvci5jcHAKaW5kZXggNDk2M2VkNC4uYWE4NjdiMyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9jc3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvTWVk aWFRdWVyeUV2YWx1YXRvci5jcHAKQEAgLTQ3LDcgKzQ3LDcgQEAKICNpbmNsdWRlICJQbGF0Zm9y bVNjcmVlbi5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAKLSNpZiBFTkFCTEUoM0RfUkVO REVSSU5HKQorI2lmIEVOQUJMRSgzRF9SRU5ERVJJTkcpICYmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKICNpbmNsdWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKICNlbmRpZgogCkBA IC00NzQsOCArNDc0LDEwIEBAIHN0YXRpYyBib29sIHRyYW5zZm9ybV8zZE1lZGlhRmVhdHVyZUV2 YWwoQ1NTVmFsdWUqIHZhbHVlLCBSZW5kZXJTdHlsZSosIEZyYW1lKiBmCiAKICNpZiBFTkFCTEUo M0RfUkVOREVSSU5HKQogICAgIGJvb2wgdGhyZWVERW5hYmxlZCA9IGZhbHNlOworI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBpZiAoUmVuZGVyVmlldyogdmlldyA9IGZyYW1l LT5jb250ZW50UmVuZGVyZXIoKSkKICAgICAgICAgdGhyZWVERW5hYmxlZCA9IHZpZXctPmNvbXBv c2l0b3IoKS0+aGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpOworI2VuZGlmCiAKICAgICByZXR1 cm5WYWx1ZUlmTm9QYXJhbWV0ZXIgPSB0aHJlZURFbmFibGVkOwogICAgIGhhdmUzZFJlbmRlcmlu ZyA9IHRocmVlREVuYWJsZWQgPyAxIDogMDsK 49574 2010-02-26 01:12:43 -0800 2010-02-26 12:59:14 -0800 Same fix, added missing bug URL. mediaquery-3.diff text/plain 1386 jarkko.sakkinen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTM3NzM2Yy4uMWM2Y2ZjZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wMi0yNiAgSmFya2tvIFNha2tp bmVuICA8amFya2tvLnNha2tpbmVuQHRpZXRvLmNvbT4KKyAKKyAgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzUzODAKKyAgICAgICAgIEZpeGVkIGNvbXBpbGF0aW9uIGVycm9yIHdoZW4g V1RGX1VTRV9BQ0NFTEVSQVRFRF9DT01QT1NJVElORz0wCisgCisgICAgICAgICAqIGNzcy9NZWRp YVF1ZXJ5RXZhbHVhdG9yLmNwcDoKKyAgICAgICAgIChXZWJDb3JlOjp0cmFuc2Zvcm1fM2RNZWRp YUZlYXR1cmVFdmFsKToKKwogMjAxMC0wMi0yNSAgTWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJyYWR5IEVpZHNvbi4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvY3NzL01lZGlhUXVlcnlFdmFsdWF0b3IuY3BwIGIvV2ViQ29yZS9jc3MvTWVkaWFRdWVyeUV2 YWx1YXRvci5jcHAKaW5kZXggNDk2M2VkNC4uYWE4NjdiMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9j c3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvTWVkaWFRdWVyeUV2 YWx1YXRvci5jcHAKQEAgLTQ3LDcgKzQ3LDcgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVNjcmVlbi5o IgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAKLSNpZiBFTkFCTEUoM0RfUkVOREVSSU5HKQor I2lmIEVOQUJMRSgzRF9SRU5ERVJJTkcpICYmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK ICNpbmNsdWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKICNlbmRpZgogCkBAIC00NzQsOCAr NDc0LDEwIEBAIHN0YXRpYyBib29sIHRyYW5zZm9ybV8zZE1lZGlhRmVhdHVyZUV2YWwoQ1NTVmFs dWUqIHZhbHVlLCBSZW5kZXJTdHlsZSosIEZyYW1lKiBmCiAKICNpZiBFTkFCTEUoM0RfUkVOREVS SU5HKQogICAgIGJvb2wgdGhyZWVERW5hYmxlZCA9IGZhbHNlOworI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKICAgICBpZiAoUmVuZGVyVmlldyogdmlldyA9IGZyYW1lLT5jb250ZW50 UmVuZGVyZXIoKSkKICAgICAgICAgdGhyZWVERW5hYmxlZCA9IHZpZXctPmNvbXBvc2l0b3IoKS0+ aGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpOworI2VuZGlmCiAKICAgICByZXR1cm5WYWx1ZUlm Tm9QYXJhbWV0ZXIgPSB0aHJlZURFbmFibGVkOwogICAgIGhhdmUzZFJlbmRlcmluZyA9IHRocmVl REVuYWJsZWQgPyAxIDogMDsK