Bug 155880

Summary: Removed redundant #if conditions in ANGLEWebKitBridge.h
Product: WebKit Reporter: Konstantin Tokarev <annulen>
Component: ANGLEAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: achristensen, commit-queue, dino, gyuyoung.kim, kondapallykalyan, mcatanzaro, ossy, roger_fong
Priority: P2    
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch none

Konstantin Tokarev
Reported 2016-03-25 05:06:07 PDT
GTK and Efl ports can be built only with cmake, so condition !defined(BUILDING_WITH_CMAKE) implies !PLATFORM(GTK) && !PLATFORM(EFL).
Attachments
Patch (1.41 KB, patch)
2016-03-25 05:07 PDT, Konstantin Tokarev 		no flags
DetailsFormatted DiffDiff
Patch (1.69 KB, patch)
2016-03-26 13:13 PDT, Konstantin Tokarev 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Konstantin Tokarev
Comment 1 2016-03-25 05:07:43 PDT
Created attachment 274899 [details] Patch
Csaba Osztrogonác
Comment 2 2016-03-25 06:23:39 PDT
Comment on attachment 274899 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=274899&action=review > Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:49 > -#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) > +#if !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) > #include "ANGLE/ShaderLang.h" > #elif PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) > #include "GLSLANG/ShaderLang.h" These conditions are very confusing. PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) is an always false condition, Apple Windows port and WinCairo port always use cmake. Shouldn't we include ANGLE/ShaderLang.h unconditionally?
Konstantin Tokarev
Comment 3 2016-03-25 06:33:03 PDT
(In reply to comment #2) > These conditions are very confusing. > PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) is an always false > condition, Apple Windows port and WinCairo port always use cmake. Indeed. > > Shouldn't we include ANGLE/ShaderLang.h unconditionally? Yes.
Alex Christensen
Comment 4 2016-03-25 08:39:34 PDT
Comment on attachment 274899 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=274899&action=review >> Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:49 >> #include "GLSLANG/ShaderLang.h" > > These conditions are very confusing. > PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) is an always false > condition, Apple Windows port and WinCairo port always use cmake. > > Shouldn't we include ANGLE/ShaderLang.h unconditionally? This was needed before the switch to CMake on Windows. It's not needed any more. Let's clean it up.
Konstantin Tokarev
Comment 5 2016-03-26 13:13:53 PDT
Created attachment 274988 [details] Patch
WebKit Commit Bot
Comment 6 2016-03-27 23:47:35 PDT
Comment on attachment 274988 [details] Patch Clearing flags on attachment: 274988 Committed r198729: <http://trac.webkit.org/changeset/198729>
WebKit Commit Bot
Comment 7 2016-03-27 23:47:39 PDT
All reviewed patches have been landed. Closing bug.
Note You need to log in before you can comment on or make changes to this bug.